r890: convert samba4 to use [u]int8_t instead of [u]int8

metze
(This used to be commit 2986c5f08c8f0c26a2ea7b6ce20aae025183109f)

6 files changed, 33 insertions, 29 deletions

diff --git a/source4/include/asn_1.h b/source4/include/asn_1.h
index 7d4da0db0c..78cc340f44 100644
--- a/source4/include/asn_1.h
+++ b/source4/include/asn_1.h
@@ -28,7 +28,7 @@ struct nesting {
 };
 
 typedef struct {
-	uint8 *data;
+	uint8_t *data;
 	size_t length;
 	off_t ofs;
 	struct nesting *nesting;
diff --git a/source4/include/cli_context.h b/source4/include/cli_context.h
index b94d83ffa1..4cfdc8db91 100644
--- a/source4/include/cli_context.h
+++ b/source4/include/cli_context.h
@@ -142,7 +142,7 @@ struct cli_transport {
 		enum {ETYPE_NONE, ETYPE_DOS, ETYPE_NT, ETYPE_SOCKET, ETYPE_NBT} etype;
 		union {
 			struct {
-				uint8 eclass;
+				uint8_t eclass;
 				uint16_t ecode;
 			} dos;
 			NTSTATUS nt_status;
@@ -154,7 +154,7 @@ struct cli_transport {
 	struct {
 		/* a oplock break request handler */
 		BOOL (*handler)(struct cli_transport *transport, 
-				uint16_t tid, uint16_t fnum, uint8 level, void *private);
+				uint16_t tid, uint16_t fnum, uint8_t level, void *private);
 		/* private data passed to the oplock handler */
 		void *private;
 	} oplock;
diff --git a/source4/include/includes.h b/source4/include/includes.h
index a47ede6796..441111ed6f 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -453,8 +453,12 @@ typedef int socklen_t;
    as signed and unsigned int will work.
 */
 
-#ifndef uint8
-#define uint8 unsigned char
+#if !defined(int8)
+#define int8 int8_t
+#endif
+
+#if !defined(uint8)
+#define uint8 uint8_t
 #endif
 
 #if !defined(int16)
diff --git a/source4/include/secrets.h b/source4/include/secrets.h
index ae881c7cb9..a34e86bc6e 100644
--- a/source4/include/secrets.h
+++ b/source4/include/secrets.h
@@ -50,7 +50,7 @@
 /* structure for storing machine account password
    (ie. when samba server is member of a domain */
 struct machine_acct_pass {
-	uint8 hash[16];
+	uint8_t hash[16];
 	time_t mod_time;
 };
 
diff --git a/source4/include/smb.h b/source4/include/smb.h
index 74f71a0304..45a7bd0b2f 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -269,7 +269,7 @@ typedef struct time_info
 
 /* used to hold an arbitrary blob of data */
 typedef struct data_blob {
-	uint8 *data;
+	uint8_t *data;
 	size_t length;
 	void (*free)(struct data_blob *data_blob);
 } DATA_BLOB;
diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h
index 4e6ba6b13b..a78161cb3a 100644
--- a/source4/include/smb_interfaces.h
+++ b/source4/include/smb_interfaces.h
@@ -357,7 +357,7 @@ union smb_fileinfo {
 			uint32_t ea_size;
 			uint_t num_eas;
 			struct ea_struct {
-				uint8 flags;
+				uint8_t flags;
 				WIRE_STRING name;
 				DATA_BLOB value;
 			} *eas;		
@@ -371,13 +371,13 @@ union smb_fileinfo {
 			uint32_t nlink;
 			WIRE_STRING fname;	
 			WIRE_STRING alt_fname;	
-			uint8 delete_pending;
-			uint8 directory;
+			uint8_t delete_pending;
+			uint8_t directory;
 			uint64_t compressed_size;
 			uint16_t format;
-			uint8 unit_shift;
-			uint8 chunk_shift;
-			uint8 cluster_shift;
+			uint8_t unit_shift;
+			uint8_t chunk_shift;
+			uint8_t cluster_shift;
 			uint64_t file_id;
 			uint32_t access_flags; /* seen 0x001f01ff from w2k3 */
 			uint64_t position;
@@ -535,8 +535,8 @@ union smb_fileinfo {
 			uint64_t alloc_size;
 			uint64_t size;
 			uint32_t nlink;
-			uint8 delete_pending;
-			uint8 directory;
+			uint8_t delete_pending;
+			uint8_t directory;
 			uint32_t ea_size;
 			WIRE_STRING fname;
 		} out;
@@ -571,9 +571,9 @@ union smb_fileinfo {
 		struct {
 			uint64_t compressed_size;
 			uint16_t format;
-			uint8 unit_shift;
-			uint8 chunk_shift;
-			uint8 cluster_shift;
+			uint8_t unit_shift;
+			uint8_t chunk_shift;
+			uint8_t cluster_shift;
 		} out;
 	} compression_info;
 
@@ -831,7 +831,7 @@ union smb_setfileinfo {
 		union setfileinfo_file file;
 
 		struct {
-			uint8 overwrite;
+			uint8_t overwrite;
 			uint32_t root_fid;
 			const char *new_name;
 		} in;
@@ -1092,12 +1092,12 @@ union smb_open {
 			uint32_t open_disposition;
 			uint32_t create_options;
 			uint32_t impersonation;
-			uint8  security_flags;
+			uint8_t  security_flags;
 			const char *fname;
 		} in;
 
 		struct {
-			uint8 oplock_level;
+			uint8_t oplock_level;
 			uint16_t fnum;
 			uint32_t create_action;
 			NTTIME create_time;
@@ -1109,7 +1109,7 @@ union smb_open {
 			uint64_t size;
 			uint16_t file_type;
 			uint16_t ipc_state;
-			uint8  is_directory;
+			uint8_t  is_directory;
 		} out;
 	} ntcreatex, generic;
 
@@ -1551,7 +1551,7 @@ union smb_lpq {
 			uint16_t restart_idx;
 			struct {
 				time_t time;
-				uint8 status;
+				uint8_t status;
 				uint16_t job;
 				uint32_t size;
 				char *user;
@@ -1592,7 +1592,7 @@ union smb_ioctl {
 			uint32_t function;
 			uint16_t fnum;
 			BOOL fsctl;
-			uint8 filter;
+			uint8_t filter;
 		} in;
 		struct {
 			DATA_BLOB blob;
@@ -1628,10 +1628,10 @@ struct smb_trans2 {
 	struct {
 		uint16_t max_param;
 		uint16_t max_data;
-		uint8  max_setup;
+		uint8_t  max_setup;
 		uint16_t flags;
 		uint32_t timeout;
-		uint8  setup_count;
+		uint8_t  setup_count;
 		uint16_t *setup;
 		const char *trans_name; /* SMBtrans only */
 		DATA_BLOB params;
@@ -1639,7 +1639,7 @@ struct smb_trans2 {
 	} in;
 
 	struct {
-		uint8  setup_count;
+		uint8_t  setup_count;
 		uint16_t *setup;
 		DATA_BLOB params;
 		DATA_BLOB data;
@@ -1649,7 +1649,7 @@ struct smb_trans2 {
 /* struct for nttransact2 call */
 struct smb_nttrans {
 	struct {
-		uint8  max_setup;
+		uint8_t  max_setup;
 		uint32_t max_param;
 		uint32_t max_data;
 		uint32_t setup_count;
@@ -1660,7 +1660,7 @@ struct smb_nttrans {
 	} in;
 
 	struct {
-		uint8  setup_count;
+		uint8_t  setup_count;
 		uint16_t *setup;
 		DATA_BLOB params;
 		DATA_BLOB data;