diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-03-29 09:35:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:00 -0500 |
| commit | bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478 (patch) | |
| tree | 45124e070043ee0fd3774d74b4cfdcf1c8919c27 /source3/tdb/tools | |
| parent | b9461058d59f8e4f4b69c31592bd12a179b2d8ac (diff) | |
| download | samba-bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478.tar.gz samba-bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478.tar.bz2 samba-bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478.zip | |
r22009: change TDB_DATA from char * to unsigned char *
and fix all compiler warnings in the users
metze
(This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
Diffstat (limited to 'source3/tdb/tools')
| -rw-r--r-- | source3/tdb/tools/tdbdump.c | 2 | ||||
| -rw-r--r-- | source3/tdb/tools/tdbtool.c | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/source3/tdb/tools/tdbdump.c b/source3/tdb/tools/tdbdump.c index b702fb0735..2ff2a2b019 100644 --- a/source3/tdb/tools/tdbdump.c +++ b/source3/tdb/tools/tdbdump.c @@ -73,7 +73,7 @@ static int dump_tdb(const char *fname, const char *keyname) if (!keyname) { tdb_traverse(tdb, traverse_fn, NULL); } else { - key.dptr = (char *)keyname; + key.dptr = (unsigned char *)keyname; key.dsize = strlen( keyname); value = tdb_fetch(tdb, key); if (!value.dptr) { diff --git a/source3/tdb/tools/tdbtool.c b/source3/tdb/tools/tdbtool.c index bcfb96adc0..137675a88f 100644 --- a/source3/tdb/tools/tdbtool.c +++ b/source3/tdb/tools/tdbtool.c @@ -237,9 +237,9 @@ static void insert_tdb(char *keyname, size_t keylen, char* data, size_t datalen) return; } - key.dptr = keyname; + key.dptr = (unsigned char *)keyname; key.dsize = keylen; - dbuf.dptr = data; + dbuf.dptr = (unsigned char *)data; dbuf.dsize = datalen; if (tdb_store(tdb, key, dbuf, TDB_INSERT) == -1) { @@ -261,9 +261,9 @@ static void store_tdb(char *keyname, size_t keylen, char* data, size_t datalen) return; } - key.dptr = keyname; + key.dptr = (unsigned char *)keyname; key.dsize = keylen; - dbuf.dptr = data; + dbuf.dptr = (unsigned char *)data; dbuf.dsize = datalen; printf("Storing key:\n"); @@ -283,7 +283,7 @@ static void show_tdb(char *keyname, size_t keylen) return; } - key.dptr = keyname; + key.dptr = (unsigned char *)keyname; key.dsize = keylen; dbuf = tdb_fetch(tdb, key); @@ -308,7 +308,7 @@ static void delete_tdb(char *keyname, size_t keylen) return; } - key.dptr = keyname; + key.dptr = (unsigned char *)keyname; key.dsize = keylen; if (tdb_delete(tdb, key) != 0) { @@ -331,7 +331,7 @@ static void move_rec(char *keyname, size_t keylen, char* tdbname) return; } - key.dptr = keyname; + key.dptr = (unsigned char *)keyname; key.dsize = keylen; dbuf = tdb_fetch(tdb, key); @@ -404,16 +404,16 @@ static int print_crec(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *s static int print_arec(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state) { printf("\nkey %d bytes\n", (int)key.dsize); - print_asc(key.dptr, key.dsize); + print_asc((const char *)key.dptr, key.dsize); printf("\ndata %d bytes\n", (int)dbuf.dsize); - print_data(dbuf.dptr, dbuf.dsize); + print_data((const char *)dbuf.dptr, dbuf.dsize); return 0; } static int print_key(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state) { printf("key %d bytes: ", (int)key.dsize); - print_asc(key.dptr, key.dsize); + print_asc((const char *)key.dptr, key.dsize); printf("\n"); return 0; } @@ -421,7 +421,7 @@ static int print_key(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *st static int print_hexkey(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state) { printf("key %d bytes\n", (int)key.dsize); - print_data(key.dptr, key.dsize); + print_data((const char *)key.dptr, key.dsize); printf("\n"); return 0; } |