Added tdb_get/set_int_byblob, which takes a size_t len and then implemented

the tdb_get/set_int string functions in terms of them. Will be useful in storing
POSIX pending close records (which are ints but indexed by dev/inode pairs).
Jeremy.
(This used to be commit d69e4c6a48746459f973144393529b1f40680d2f)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index f9479532fa2cb94cbe0638550d0e943fa871c00d..1d952da4ee4cf2769960f2da656e8bb31000151a 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3469,7 +3469,9 @@ int tdb_writelock(TDB_CONTEXT *tdb);
 int tdb_writeunlock(TDB_CONTEXT *tdb);
 int tdb_lockchain(TDB_CONTEXT *tdb, TDB_DATA key);
 int tdb_unlockchain(TDB_CONTEXT *tdb, TDB_DATA key);
+int tdb_get_int_byblob(TDB_CONTEXT *tdb, char *keyval, size_t len);
 int tdb_get_int(TDB_CONTEXT *tdb, char *keystr);
+int tdb_store_int_byblob(TDB_CONTEXT *tdb, char *keystr, size_t len, int v);
 int tdb_store_int(TDB_CONTEXT *tdb, char *keystr, int v);
 
 /*The following definitions come from  utils/nbio.c  */

diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c
index 3b85b712170f78b8ffe46838b4d5e151646a1252..e884bb34b94012e663bcc4daf225f5e290b9a84a 100644 (file)
--- a/source3/tdb/tdb.c
+++ b/source3/tdb/tdb.c
@@ -1313,14 +1313,15 @@ int tdb_unlockchain(TDB_CONTEXT *tdb, TDB_DATA key)
    simple string/value pairs in a tdb. They also serve as examples
  */
 
-/* fetch a value by string key, return -1 if not found */
-int tdb_get_int(TDB_CONTEXT *tdb, char *keystr)
+/* fetch a value by a arbitrary blob key, return -1 if not found */
+
+int tdb_get_int_byblob(TDB_CONTEXT *tdb, char *keyval, size_t len)
 {
        TDB_DATA key, data;
        int ret;
 
-       key.dptr = keystr;
-       key.dsize = strlen(keystr);
+       key.dptr = keyval;
+       key.dsize = len;
        data = tdb_fetch(tdb, key);
        if (!data.dptr || data.dsize != sizeof(int)) return -1;
        
@@ -1328,16 +1329,27 @@ int tdb_get_int(TDB_CONTEXT *tdb, char *keystr)
        free(data.dptr);
        return ret;
 }
+/* fetch a value by string key, return -1 if not found */
+int tdb_get_int(TDB_CONTEXT *tdb, char *keystr)
+{
+       return tdb_get_int_byblob(tdb, keystr, strlen(keystr));
+}
 
-/* store a value by string key, return 0 on success, -1 on failure */
-int tdb_store_int(TDB_CONTEXT *tdb, char *keystr, int v)
+/* store a value by an arbitary blob key, return 0 on success, -1 on failure */
+int tdb_store_int_byblob(TDB_CONTEXT *tdb, char *keystr, size_t len, int v)
 {
        TDB_DATA key, data;
 
        key.dptr = keystr;
-       key.dsize = strlen(keystr);
+       key.dsize = len;
        data.dptr = (void *)&v;
        data.dsize = sizeof(int);
 
        return tdb_store(tdb, key, data, TDB_REPLACE);
 }
+
+/* store a value by string key, return 0 on success, -1 on failure */
+int tdb_store_int(TDB_CONTEXT *tdb, char *keystr, int v)
+{
+       return tdb_store_int_byblob(tdb, keystr, strlen(keystr), v);
+}