r12713: Remove use of uint8_t -> uint8.

Jeremy.

diff --git a/source/libsmb/smbencrypt.c b/source/libsmb/smbencrypt.c
index f99e48a0b9c6ee61951317df2a95bb82825e4e78..99f99f23f8c7627e9e3ee149d5f0eada84f7c988 100644 (file)
--- a/source/libsmb/smbencrypt.c
+++ b/source/libsmb/smbencrypt.c
@@ -542,7 +542,7 @@ void sess_crypt_blob(DATA_BLOB *out, const DATA_BLOB *in, const DATA_BLOB *sessi
        for (i=0,k=0;
             i<in->length;
             i += 8, k += 7) {
-               uint8_t bin[8], bout[8], key[7];
+               uint8 bin[8], bout[8], key[7];
 
                memset(bin, 0, 8);
                memcpy(bin,  &in->data[i], MIN(8, in->length-i));

diff --git a/source/nsswitch/winbindd_ldap.c b/source/nsswitch/winbindd_ldap.c
index 4eedf0ce9f3ce053e9d568fbd9ff142f87806c07..736d852a74e2a0950b243e7a9cb6628a0febe60d 100644 (file)
--- a/source/nsswitch/winbindd_ldap.c
+++ b/source/nsswitch/winbindd_ldap.c
@@ -34,7 +34,7 @@ struct ldap_message_queue {
 };
 
 struct rw_buffer {
-       uint8_t *data;
+       uint8 *data;
        size_t ofs, length;
 };
 
@@ -67,7 +67,7 @@ struct pending_ldap_message {
 
 struct pending_ldap_message *pending_messages;
 
-static BOOL append_to_buf(struct rw_buffer *buf, uint8_t *data, size_t length)
+static BOOL append_to_buf(struct rw_buffer *buf, uint8 *data, size_t length)
 {
        buf->data = SMB_REALLOC(buf->data, buf->length+length);
 
@@ -92,7 +92,7 @@ static BOOL read_into_buf(int fd, struct rw_buffer *buf)
        return append_to_buf(buf, tmp_buf, len);
 }
 
-static void peek_into_buf(struct rw_buffer *buf, uint8_t **out,
+static void peek_into_buf(struct rw_buffer *buf, uint8 **out,
                          size_t *out_length)
 {
        *out = buf->data;
@@ -101,7 +101,7 @@ static void peek_into_buf(struct rw_buffer *buf, uint8_t **out,
 
 static void consumed_from_buf(struct rw_buffer *buf, size_t length)
 {
-       uint8_t *new = memdup(buf->data+length, buf->length-length);
+       uint8 *new = memdup(buf->data+length, buf->length-length);
        free(buf->data);
        buf->data = new;
        buf->length -= length;
@@ -109,7 +109,7 @@ static void consumed_from_buf(struct rw_buffer *buf, size_t length)
 
 static BOOL write_out_of_buf(int fd, struct rw_buffer *buf)
 {
-       uint8_t *tmp;
+       uint8 *tmp;
        size_t tmp_length, written;
 
        peek_into_buf(buf, &tmp, &tmp_length);
@@ -176,7 +176,7 @@ static void new_ldap_client(int listen_sock)
 static struct ldap_message *get_msg_from_buf(struct rw_buffer *buffer,
                                             BOOL *error)
 {
-       uint8_t *buf;
+       uint8 *buf;
        int buf_length, msg_length;
        DATA_BLOB blob;
        ASN1_DATA data;

diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c
index 54e7da11afe9ae25ecdf9538165bac32b50a0150..f788fc9e2e0b717f015460d3473d370c346f6816 100644 (file)
--- a/source/smbd/oplock.c
+++ b/source/smbd/oplock.c
@@ -252,7 +252,7 @@ int setup_oplock_select_set( fd_set *fds)
 ****************************************************************************/
 
 static char *new_break_smb_message(TALLOC_CTX *mem_ctx,
-                                  files_struct *fsp, uint8_t cmd)
+                                  files_struct *fsp, uint8 cmd)
 {
        char *result = TALLOC_ARRAY(mem_ctx, char, smb_size + 8*2 + 0);
 

diff --git a/source/tdb/tdbutil.c b/source/tdb/tdbutil.c
index ac9280cf8bdef806851b59518e282aec03f55852..5301100632764d5d5df26fe06914b3c4528df8af 100644 (file)
--- a/source/tdb/tdbutil.c
+++ b/source/tdb/tdbutil.c
@@ -485,7 +485,7 @@ size_t tdb_pack(char *buf, int bufsize, const char *fmt, ...)
        return result;
 }
 
-BOOL tdb_pack_append(TALLOC_CTX *mem_ctx, uint8_t **buf, size_t *len,
+BOOL tdb_pack_append(TALLOC_CTX *mem_ctx, uint8 **buf, size_t *len,
                     const char *fmt, ...)
 {
        va_list ap;
@@ -496,10 +496,10 @@ BOOL tdb_pack_append(TALLOC_CTX *mem_ctx, uint8_t **buf, size_t *len,
        va_end(ap);
 
        if (mem_ctx != NULL)
-               *buf = TALLOC_REALLOC_ARRAY(mem_ctx, *buf, uint8_t,
+               *buf = TALLOC_REALLOC_ARRAY(mem_ctx, *buf, uint8,
                                            (*len) + len1);
        else
-               *buf = SMB_REALLOC_ARRAY(*buf, uint8_t, (*len) + len1);
+               *buf = SMB_REALLOC_ARRAY(*buf, uint8, (*len) + len1);
 
        if (*buf == NULL)
                return False;