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/common | |
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/common')
-rw-r--r-- | source3/tdb/common/freelistcheck.c | 2 | ||||
-rw-r--r-- | source3/tdb/common/io.c | 8 | ||||
-rw-r--r-- | source3/tdb/common/tdb.c | 6 | ||||
-rw-r--r-- | source3/tdb/common/tdb_private.h | 2 | ||||
-rw-r--r-- | source3/tdb/common/traverse.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/source3/tdb/common/freelistcheck.c b/source3/tdb/common/freelistcheck.c index 3f79a016b8..63d2dbadc2 100644 --- a/source3/tdb/common/freelistcheck.c +++ b/source3/tdb/common/freelistcheck.c @@ -39,7 +39,7 @@ static int seen_insert(struct tdb_context *mem_tdb, tdb_off_t rec_ptr) TDB_DATA key, data; memset(&data, '\0', sizeof(data)); - key.dptr = (char *)&rec_ptr; + key.dptr = (unsigned char *)&rec_ptr; key.dsize = sizeof(rec_ptr); return tdb_store(mem_tdb, key, data, TDB_INSERT); } diff --git a/source3/tdb/common/io.c b/source3/tdb/common/io.c index 9a8e270dcc..cd06dbb1e3 100644 --- a/source3/tdb/common/io.c +++ b/source3/tdb/common/io.c @@ -332,16 +332,16 @@ int tdb_ofs_write(struct tdb_context *tdb, tdb_off_t offset, tdb_off_t *d) /* read a lump of data, allocating the space for it */ -char *tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t len) +unsigned char *tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t len) { - char *buf; + unsigned char *buf; /* some systems don't like zero length malloc */ if (len == 0) { len = 1; } - if (!(buf = (char *)malloc(len))) { + if (!(buf = (unsigned char *)malloc(len))) { /* Ensure ecode is set for log fn. */ tdb->ecode = TDB_ERR_OOM; TDB_LOG((tdb, TDB_DEBUG_ERROR,"tdb_alloc_read malloc failed len=%d (%s)\n", @@ -376,7 +376,7 @@ int tdb_parse_data(struct tdb_context *tdb, TDB_DATA key, if (tdb->methods->tdb_oob(tdb, offset+len, 0) != 0) { return -1; } - data.dptr = offset + (char *)tdb->map_ptr; + data.dptr = offset + (unsigned char *)tdb->map_ptr; return parser(key, data, private_data); } diff --git a/source3/tdb/common/tdb.c b/source3/tdb/common/tdb.c index bf43701d2e..25103d826e 100644 --- a/source3/tdb/common/tdb.c +++ b/source3/tdb/common/tdb.c @@ -564,10 +564,10 @@ int tdb_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf) dbuf = tdb_fetch(tdb, key); if (dbuf.dptr == NULL) { - dbuf.dptr = (char *)malloc(new_dbuf.dsize); + dbuf.dptr = (unsigned char *)malloc(new_dbuf.dsize); } else { - dbuf.dptr = (char *)realloc(dbuf.dptr, - dbuf.dsize + new_dbuf.dsize); + dbuf.dptr = (unsigned char *)realloc(dbuf.dptr, + dbuf.dsize + new_dbuf.dsize); } if (dbuf.dptr == NULL) { diff --git a/source3/tdb/common/tdb_private.h b/source3/tdb/common/tdb_private.h index 10bc6dacdc..9d39de0200 100644 --- a/source3/tdb/common/tdb_private.h +++ b/source3/tdb/common/tdb_private.h @@ -196,7 +196,7 @@ int tdb_unlock_record(struct tdb_context *tdb, tdb_off_t off); int tdb_rec_read(struct tdb_context *tdb, tdb_off_t offset, struct list_struct *rec); int tdb_rec_write(struct tdb_context *tdb, tdb_off_t offset, struct list_struct *rec); int tdb_do_delete(struct tdb_context *tdb, tdb_off_t rec_ptr, struct list_struct *rec); -char *tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t len); +unsigned char *tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t len); int tdb_parse_data(struct tdb_context *tdb, TDB_DATA key, tdb_off_t offset, tdb_len_t len, int (*parser)(TDB_DATA key, TDB_DATA data, diff --git a/source3/tdb/common/traverse.c b/source3/tdb/common/traverse.c index 6d3b111479..fb2371d403 100644 --- a/source3/tdb/common/traverse.c +++ b/source3/tdb/common/traverse.c @@ -279,7 +279,7 @@ TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA oldkey) u32 oldhash; TDB_DATA key = tdb_null; struct list_struct rec; - char *k = NULL; + unsigned char *k = NULL; /* Is locked key the old key? If so, traverse will be reliable. */ if (tdb->travlocks.off) { |