r4063: - change char * -> uint8_t in struct request_buffer

- change smbcli_read/write to take void * for the buffers to match read(2)/write(2)

all this fixes a lot of gcc-4 warnings

metze
(This used to be commit b94f92bc6637f748d6f7049f4f9a30b0b8d18a7a)

2 files changed, 14 insertions, 14 deletions

diff --git a/source4/include/request.h b/source4/include/request.h
index fc5fa8442a..587adeef21 100644
--- a/source4/include/request.h
+++ b/source4/include/request.h
@@ -29,7 +29,7 @@
 
 struct request_buffer {
 	/* the raw SMB buffer, including the 4 byte length header */
-	char *buffer;
+	uint8_t *buffer;
 	
 	/* the size of the raw buffer, including 4 byte header */
 	uint_t size;
@@ -40,15 +40,15 @@ struct request_buffer {
 	uint_t allocated;
 	
 	/* the start of the SMB header - this is always buffer+4 */
-	char *hdr;
+	uint8_t *hdr;
 	
 	/* the command words and command word count. vwv points
 	   into the raw buffer */
-	char *vwv;
+	uint8_t *vwv;
 	uint_t wct;
 	
 	/* the data buffer and size. data points into the raw buffer */
-	char *data;
+	uint8_t *data;
 	uint_t data_size;
 	
 	/* ptr is used as a moving pointer into the data area
@@ -56,7 +56,7 @@ struct request_buffer {
 	 * variable in each function is that when a realloc of
 	 * a send packet is done we need to move this
 	 * pointer */
-	char *ptr;
+	uint8_t *ptr;
 };
 
 #endif
diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h
index bc5c43f59a..4b767c8d70 100644
--- a/source4/include/smb_interfaces.h
+++ b/source4/include/smb_interfaces.h
@@ -1275,7 +1275,7 @@ union smb_read {
 			uint16_t remaining;
 		} in;
 		struct {
-			char *data;
+			uint8_t *data;
 			uint16_t remaining;
 			uint16_t compaction_mode;
 			uint16_t nread;
@@ -1294,7 +1294,7 @@ union smb_read {
 			uint32_t  timeout;
 		} in;
 		struct {
-			char *data;
+			uint8_t *data;
 			uint32_t nread;
 		} out;
 	} readbraw;
@@ -1311,7 +1311,7 @@ union smb_read {
 			uint16_t remaining;
 		} in;
 		struct {
-			char *data;
+			uint8_t *data;
 			uint16_t nread;
 		} out;
 	} lockread;
@@ -1327,7 +1327,7 @@ union smb_read {
 			uint16_t remaining;
 		} in;
 		struct {
-			char *data;
+			uint8_t *data;
 			uint16_t nread;
 		} out;
 	} read;
@@ -1353,7 +1353,7 @@ union smb_write {
 			uint16_t wmode;
 			uint16_t remaining;
 			uint32_t count;
-			const char *data;
+			const uint8_t *data;
 		} in;
 		struct {
 			uint32_t nwritten;
@@ -1370,7 +1370,7 @@ union smb_write {
 			uint16_t count;
 			uint32_t offset;
 			uint16_t remaining;
-			const char *data;
+			const uint8_t *data;
 		} in;
 		struct {
 			uint32_t nwritten;
@@ -1386,7 +1386,7 @@ union smb_write {
 			uint16_t count;
 			uint32_t offset;
 			uint16_t remaining;
-			const char *data;
+			const uint8_t *data;
 		} in;
 		struct {
 			uint16_t nwritten;
@@ -1402,7 +1402,7 @@ union smb_write {
 			uint16_t count;
 			uint32_t offset;
 			time_t mtime;
-			const char *data;
+			const uint8_t *data;
 		} in;
 		struct {
 			uint16_t nwritten;
@@ -1416,7 +1416,7 @@ union smb_write {
 		struct {
 			uint16_t fnum;
 			uint16_t count;
-			const char *data;
+			const uint8_t *data;
 		} in;
 	} splwrite;
 };