diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-11 21:49:40 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-05-13 22:41:48 +0200 |
| commit | 03183e35848d4b691af58b45921938726147e956 (patch) | |
| tree | 08e1c06c1a3cabb852c15a22027da881fb22f115 /source3/lib/dbwrap | |
| parent | 05afaa8361124f7d659d36856ec6253b62fb09a8 (diff) | |
| download | samba-03183e35848d4b691af58b45921938726147e956.tar.gz samba-03183e35848d4b691af58b45921938726147e956.tar.bz2 samba-03183e35848d4b691af58b45921938726147e956.zip | |
s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_file.c
Diffstat (limited to 'source3/lib/dbwrap')
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_file.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/lib/dbwrap/dbwrap_file.c b/source3/lib/dbwrap/dbwrap_file.c index ebe768528b..e0fd4ebc73 100644 --- a/source3/lib/dbwrap/dbwrap_file.c +++ b/source3/lib/dbwrap/dbwrap_file.c @@ -33,7 +33,7 @@ struct db_file_ctx { struct db_locked_file { int fd; - uint8 hash; + uint8_t hash; const char *name; const char *path; struct db_file_ctx *parent; @@ -41,12 +41,12 @@ struct db_locked_file { /* Copy from statcache.c... */ -static uint32 fsh(const uint8 *p, int len) +static uint32_t fsh(const uint8_t *p, int len) { - uint32 n = 0; + uint32_t n = 0; int i; for (i=0; i<len; i++) { - n = ((n << 5) + n) ^ (uint32)(p[i]); + n = ((n << 5) + n) ^ (uint32_t)(p[i]); } return n; } @@ -99,7 +99,8 @@ static struct db_record *db_file_fetch_locked(struct db_context *db, result->delete_rec = db_file_delete; result->key.dsize = key.dsize; - result->key.dptr = (uint8 *)talloc_memdup(result, key.dptr, key.dsize); + result->key.dptr = (uint8_t *)talloc_memdup(result, key.dptr, + key.dsize); if (result->key.dptr == NULL) { DEBUG(0, ("talloc failed\n")); TALLOC_FREE(result); @@ -173,7 +174,7 @@ static struct db_record *db_file_fetch_locked(struct db_context *db, NTSTATUS status; result->value.dsize = statbuf.st_ex_size; - result->value.dptr = talloc_array(result, uint8, + result->value.dptr = talloc_array(result, uint8_t, statbuf.st_ex_size); if (result->value.dptr == NULL) { DEBUG(1, ("talloc failed\n")); |