summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/registry/common/reg_util.c2
-rw-r--r--source4/lib/tdb/common/tdbutil.c8
-rw-r--r--source4/lib/time.c6
-rw-r--r--source4/lib/util_sid.c2
-rw-r--r--source4/lib/util_unistr.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c
index 353963f78d..01d75f1b90 100644
--- a/source4/lib/registry/common/reg_util.c
+++ b/source4/lib/registry/common/reg_util.c
@@ -105,7 +105,7 @@ WERROR reg_key_get_subkey_val(REG_KEY *key, const char *subname, const char *val
return reg_key_get_value_by_name(k, valname, val);
}
-WERROR reg_key_set_subkey_val(REG_KEY *key, const char *subname, const char *valname, uint32_t type, uint8 *data, int real_len)
+WERROR reg_key_set_subkey_val(REG_KEY *key, const char *subname, const char *valname, uint32_t type, uint8_t *data, int real_len)
{
REG_KEY *k;
REG_VAL *v;
diff --git a/source4/lib/tdb/common/tdbutil.c b/source4/lib/tdb/common/tdbutil.c
index 3fe3ff4b11..05f4713c82 100644
--- a/source4/lib/tdb/common/tdbutil.c
+++ b/source4/lib/tdb/common/tdbutil.c
@@ -427,7 +427,7 @@ BOOL tdb_change_uint32_atomic(TDB_CONTEXT *tdb, const char *keystr, uint32_t *ol
size_t tdb_pack(TDB_CONTEXT *tdb, char *buf, int bufsize, const char *fmt, ...)
{
va_list ap;
- uint8 bt;
+ uint8_t bt;
uint16_t w;
uint32_t d;
int i;
@@ -445,7 +445,7 @@ size_t tdb_pack(TDB_CONTEXT *tdb, char *buf, int bufsize, const char *fmt, ...)
switch ((c = *fmt++)) {
case 'b': /* unsigned 8-bit integer */
len = 1;
- bt = (uint8)va_arg(ap, int);
+ bt = (uint8_t)va_arg(ap, int);
if (bufsize && bufsize >= len)
SSVAL(buf, 0, bt);
break;
@@ -521,7 +521,7 @@ size_t tdb_pack(TDB_CONTEXT *tdb, char *buf, int bufsize, const char *fmt, ...)
int tdb_unpack(TDB_CONTEXT *tdb, char *buf, int bufsize, const char *fmt, ...)
{
va_list ap;
- uint8 *bt;
+ uint8_t *bt;
uint16_t *w;
uint32_t *d;
int len;
@@ -539,7 +539,7 @@ int tdb_unpack(TDB_CONTEXT *tdb, char *buf, int bufsize, const char *fmt, ...)
switch ((c=*fmt++)) {
case 'b':
len = 1;
- bt = va_arg(ap, uint8 *);
+ bt = va_arg(ap, uint8_t *);
if (bufsize < len)
goto no_space;
*bt = SVAL(buf, 0);
diff --git a/source4/lib/time.c b/source4/lib/time.c
index 1f95ef7daf..e95d3a8d17 100644
--- a/source4/lib/time.c
+++ b/source4/lib/time.c
@@ -243,7 +243,7 @@ static void interpret_dos_date(uint32_t date,int *year,int *month,int *day,int *
create a unix date (int GMT) from a dos date (which is actually in
localtime)
********************************************************************/
-time_t pull_dos_date(const uint8 *date_ptr, int zone_offset)
+time_t pull_dos_date(const uint8_t *date_ptr, int zone_offset)
{
uint32_t dos_date=0;
struct tm t;
@@ -267,7 +267,7 @@ time_t pull_dos_date(const uint8 *date_ptr, int zone_offset)
/*******************************************************************
like make_unix_date() but the words are reversed
********************************************************************/
-time_t pull_dos_date2(const uint8 *date_ptr, int zone_offset)
+time_t pull_dos_date2(const uint8_t *date_ptr, int zone_offset)
{
uint32_t x,x2;
@@ -282,7 +282,7 @@ time_t pull_dos_date2(const uint8 *date_ptr, int zone_offset)
create a unix GMT date from a dos date in 32 bit "unix like" format
these generally arrive as localtimes, with corresponding DST
******************************************************************/
-time_t pull_dos_date3(const uint8 *date_ptr, int zone_offset)
+time_t pull_dos_date3(const uint8_t *date_ptr, int zone_offset)
{
time_t t = (time_t)IVAL(date_ptr,0);
if (!null_mtime(t)) {
diff --git a/source4/lib/util_sid.c b/source4/lib/util_sid.c
index 2a70625317..c370beed5f 100644
--- a/source4/lib/util_sid.c
+++ b/source4/lib/util_sid.c
@@ -309,7 +309,7 @@ char *sid_binstring(const struct dom_sid *sid)
/*******************************************************************
Check if ACE has OBJECT type.
********************************************************************/
-BOOL sec_ace_object(uint8 type)
+BOOL sec_ace_object(uint8_t type)
{
if (type == SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT ||
type == SEC_ACE_TYPE_ACCESS_DENIED_OBJECT ||
diff --git a/source4/lib/util_unistr.c b/source4/lib/util_unistr.c
index 76ebadc3ef..09a1c9a4df 100644
--- a/source4/lib/util_unistr.c
+++ b/source4/lib/util_unistr.c
@@ -25,7 +25,7 @@
at startup either via mmap() or read() from the lib directory */
static smb_ucs2_t *upcase_table;
static smb_ucs2_t *lowcase_table;
-static uint8 *valid_table;
+static uint8_t *valid_table;
/*******************************************************************
@@ -116,7 +116,7 @@ void init_valid_table(void)
static int mapped_file;
int i;
const char *allowed = ".!#$%&'()_-@^`~";
- uint8 *valid_file;
+ uint8_t *valid_file;
TALLOC_CTX *mem_ctx;
if (mapped_file) {