diff options
| -rw-r--r-- | lib/util/asn1.c | 4 | ||||
| -rw-r--r-- | lib/util/byteorder.h | 4 | ||||
| -rw-r--r-- | lib/util/charset/iconv.c | 2 | ||||
| -rw-r--r-- | lib/util/util_str.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/util/asn1.c b/lib/util/asn1.c index 946f71359c..9e3d3eeb93 100644 --- a/lib/util/asn1.c +++ b/lib/util/asn1.c @@ -216,7 +216,7 @@ bool asn1_write_BitString(struct asn1_data *data, const void *p, size_t length, bool ber_write_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char *OID) { - uint_t v, v2; + unsigned int v, v2; const char *p = (const char *)OID; char *newp; int i; @@ -588,7 +588,7 @@ static bool _ber_read_OID_String_impl(TALLOC_CTX *mem_ctx, DATA_BLOB blob, { int i; uint8_t *b; - uint_t v; + unsigned int v; char *tmp_oid = NULL; if (blob.length < 2) return false; diff --git a/lib/util/byteorder.h b/lib/util/byteorder.h index b860dea791..f0a000a063 100644 --- a/lib/util/byteorder.h +++ b/lib/util/byteorder.h @@ -54,7 +54,7 @@ that don't have any int types that are 2 bytes long) You do this: #define CVAL(buf,pos) (((uint8_t *)(buf))[pos]) -#define PVAL(buf,pos) ((uint_t)CVAL(buf,pos)) +#define PVAL(buf,pos) ((unsigned int)CVAL(buf,pos)) #define SVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+1)<<8) then to extract a uint16_t value at offset 25 in a buffer you do this: @@ -144,7 +144,7 @@ static __inline__ void st_le32(uint32_t *addr, const uint32_t val) #define CAREFUL_ALIGNMENT 1 #endif -#define CVAL(buf,pos) ((uint_t)(((const uint8_t *)(buf))[pos])) +#define CVAL(buf,pos) ((unsigned int)(((const uint8_t *)(buf))[pos])) #define CVAL_NC(buf,pos) (((uint8_t *)(buf))[pos]) /* Non-const version of CVAL */ #define PVAL(buf,pos) (CVAL(buf,pos)) #define SCVAL(buf,pos,val) (CVAL_NC(buf,pos) = (val)) diff --git a/lib/util/charset/iconv.c b/lib/util/charset/iconv.c index 8256dc665c..2dac333d0c 100644 --- a/lib/util/charset/iconv.c +++ b/lib/util/charset/iconv.c @@ -355,7 +355,7 @@ static size_t ucs2hex_pull(void *cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) { while (*inbytesleft >= 1 && *outbytesleft >= 2) { - uint_t v; + unsigned int v; if ((*inbuf)[0] != '@') { /* seven bit ascii case */ diff --git a/lib/util/util_str.c b/lib/util/util_str.c index a2c50fd38f..0ea71a8e3c 100644 --- a/lib/util/util_str.c +++ b/lib/util/util_str.c @@ -64,7 +64,7 @@ _PUBLIC_ char *safe_strcpy(char *dest,const char *src, size_t maxlength) if (len > maxlength) { DEBUG(0,("ERROR: string overflow by %u (%u - %u) in safe_strcpy [%.50s]\n", - (uint_t)(len-maxlength), (unsigned)len, (unsigned)maxlength, src)); + (unsigned int)(len-maxlength), (unsigned)len, (unsigned)maxlength, src)); len = maxlength; } |