summaryrefslogtreecommitdiff
path: root/source4/lib/tdb/common
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-05-25 17:24:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:16 -0500
commitf88bf54c7f6d1c2ef833047eb8327953c304b5ff (patch)
tree07da4ab8641b2200eaca5b5ea9adba26b0712277 /source4/lib/tdb/common
parentf2ad98a165cdec6d344a96aeb21a38518a10720a (diff)
downloadsamba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.gz
samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.bz2
samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.zip
r889: convert samba4 to use [u]int16_t instead of [u]int16
metze (This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3)
Diffstat (limited to 'source4/lib/tdb/common')
-rw-r--r--source4/lib/tdb/common/tdbutil.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/tdb/common/tdbutil.c b/source4/lib/tdb/common/tdbutil.c
index bdb8621d16..3fe3ff4b11 100644
--- a/source4/lib/tdb/common/tdbutil.c
+++ b/source4/lib/tdb/common/tdbutil.c
@@ -428,7 +428,7 @@ size_t tdb_pack(TDB_CONTEXT *tdb, char *buf, int bufsize, const char *fmt, ...)
{
va_list ap;
uint8 bt;
- uint16 w;
+ uint16_t w;
uint32_t d;
int i;
void *p;
@@ -451,7 +451,7 @@ size_t tdb_pack(TDB_CONTEXT *tdb, char *buf, int bufsize, const char *fmt, ...)
break;
case 'w': /* unsigned 16-bit integer */
len = 2;
- w = (uint16)va_arg(ap, int);
+ w = (uint16_t)va_arg(ap, int);
if (bufsize && bufsize >= len)
SSVAL(buf, 0, w);
break;
@@ -522,7 +522,7 @@ int tdb_unpack(TDB_CONTEXT *tdb, char *buf, int bufsize, const char *fmt, ...)
{
va_list ap;
uint8 *bt;
- uint16 *w;
+ uint16_t *w;
uint32_t *d;
int len;
int *i;
@@ -546,7 +546,7 @@ int tdb_unpack(TDB_CONTEXT *tdb, char *buf, int bufsize, const char *fmt, ...)
break;
case 'w':
len = 2;
- w = va_arg(ap, uint16 *);
+ w = va_arg(ap, uint16_t *);
if (bufsize < len)
goto no_space;
*w = SVAL(buf, 0);