summaryrefslogtreecommitdiff
path: root/source4/libcli/util
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/libcli/util
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/libcli/util')
-rw-r--r--source4/libcli/util/smbencrypt.c2
-rw-r--r--source4/libcli/util/smberr.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/util/smbencrypt.c b/source4/libcli/util/smbencrypt.c
index b31f62c727..fa29059585 100644
--- a/source4/libcli/util/smbencrypt.c
+++ b/source4/libcli/util/smbencrypt.c
@@ -66,7 +66,7 @@ void E_md4hash(const char *passwd, uchar p16[16])
/* Password must be converted to NT unicode - null terminated. */
push_ucs2(NULL, wpwd, (const char *)passwd, 256, STR_UNICODE|STR_NOALIGN|STR_TERMINATE);
/* Calculate length in bytes */
- len = strlen_w(wpwd) * sizeof(int16);
+ len = strlen_w(wpwd) * sizeof(int16_t);
mdfour(p16, (unsigned char *)wpwd, len);
ZERO_STRUCT(wpwd);
diff --git a/source4/libcli/util/smberr.c b/source4/libcli/util/smberr.c
index d6eabcfbce..577308a7c0 100644
--- a/source4/libcli/util/smberr.c
+++ b/source4/libcli/util/smberr.c
@@ -145,7 +145,7 @@ static const struct {
/* return a dos error string given a error class and error code */
-const char *dos_errstr(uint8 class, uint16 code)
+const char *dos_errstr(uint8 class, uint16_t code)
{
static char *msg;
int i, j;