From f88bf54c7f6d1c2ef833047eb8327953c304b5ff Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 25 May 2004 17:24:24 +0000
Subject: r889: convert samba4 to use [u]int16_t instead of [u]int16

metze
(This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3)
---
 source4/client/client.c   | 18 +++++++++---------
 source4/client/clitar.c   | 12 ++++++------
 source4/client/smbmount.c |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'source4/client')

diff --git a/source4/client/client.c b/source4/client/client.c
index 6599e143dd..1f813a3d18 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -347,13 +347,13 @@ static BOOL do_this_one(file_info *finfo)
 /*******************************************************************
  Return a string representing an attribute for a file.
 ********************************************************************/
-static const char *attrib_string(uint16 mode)
+static const char *attrib_string(uint16_t mode)
 {
 	static fstring attrstr;
 	int i, len;
 	const struct {
 		char c;
-		uint16 attr;
+		uint16_t attr;
 	} attr_strs[] = {
 		{'V', FILE_ATTRIBUTE_VOLUME},
 		{'D', FILE_ATTRIBUTE_DIRECTORY},
@@ -566,7 +566,7 @@ static void do_list_helper(file_info *f, const char *mask, void *state)
 /****************************************************************************
 a wrapper around cli_list that adds recursion
   ****************************************************************************/
-void do_list(const char *mask,uint16 attribute,void (*fn)(file_info *),BOOL rec, BOOL dirs)
+void do_list(const char *mask,uint16_t attribute,void (*fn)(file_info *),BOOL rec, BOOL dirs)
 {
 	static int in_do_list = 0;
 
@@ -637,7 +637,7 @@ void do_list(const char *mask,uint16 attribute,void (*fn)(file_info *),BOOL rec,
   ****************************************************************************/
 static int cmd_dir(void)
 {
-	uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
+	uint16_t attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
 	pstring mask;
 	fstring buf;
 	char *p=buf;
@@ -674,7 +674,7 @@ static int cmd_dir(void)
   ****************************************************************************/
 static int cmd_du(void)
 {
-	uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
+	uint16_t attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
 	pstring mask;
 	fstring buf;
 	char *p=buf;
@@ -715,7 +715,7 @@ static int do_get(char *rname, const char *lname, BOOL reget)
 	char *data;
 	struct timeval tp_start;
 	int read_size = io_bufsize;
-	uint16 attr;
+	uint16_t attr;
 	size_t size;
 	off_t start = 0;
 	off_t nread = 0;
@@ -807,7 +807,7 @@ static int do_get(char *rname, const char *lname, BOOL reget)
 	}
 
 	if (archive_level >= 2 && (attr & FILE_ATTRIBUTE_ARCHIVE)) {
-		cli_setatr(cli->tree, rname, attr & ~(uint16)FILE_ATTRIBUTE_ARCHIVE, 0);
+		cli_setatr(cli->tree, rname, attr & ~(uint16_t)FILE_ATTRIBUTE_ARCHIVE, 0);
 	}
 
 	{
@@ -970,7 +970,7 @@ do a mget command
 ****************************************************************************/
 static int cmd_mget(void)
 {
-	uint16 attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
+	uint16_t attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
 	pstring mget_mask;
 	fstring buf;
 	char *p=buf;
@@ -1582,7 +1582,7 @@ static int cmd_del(void)
 {
 	pstring mask;
 	fstring buf;
-	uint16 attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
+	uint16_t attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
 
 	if (recurse)
 		attribute |= FILE_ATTRIBUTE_DIRECTORY;
diff --git a/source4/client/clitar.c b/source4/client/clitar.c
index 09f10edee7..dce914e9a6 100644
--- a/source4/client/clitar.c
+++ b/source4/client/clitar.c
@@ -46,7 +46,7 @@ typedef struct file_info_struct file_info2;
 struct file_info_struct
 {
   uint64_t size;
-  uint16 mode;
+  uint16_t mode;
   uid_t uid;
   gid_t gid;
   /* These times are normally kept in GMT */
@@ -74,7 +74,7 @@ extern struct cli_state *cli;
 #define ATTRSET 1
 #define ATTRRESET 0
 
-static uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
+static uint16_t attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
 
 #ifndef CLIENT_TIMEOUT
 #define CLIENT_TIMEOUT (30*1000)
@@ -110,7 +110,7 @@ static int clipn=0;
 static BOOL must_free_cliplist = False;
 
 extern BOOL lowercase;
-extern uint16 cnum;
+extern uint16_t cnum;
 extern BOOL readbraw_supported;
 extern int max_xmit;
 extern pstring cur_dir;
@@ -573,9 +573,9 @@ static int padit(char *buf, int bufsize, int padsize)
 }
 
 
-static void do_setrattr(char *name, uint16 attr, int set)
+static void do_setrattr(char *name, uint16_t attr, int set)
 {
-	uint16 oldattr;
+	uint16_t oldattr;
 
 	if (NT_STATUS_IS_ERR(cli_getatr(cli->tree, name, &oldattr, NULL, NULL)))
 		return;
@@ -1345,7 +1345,7 @@ int cmd_setmode(void)
   char *q;
   fstring buf;
   pstring fname;
-  uint16 attra[2];
+  uint16_t attra[2];
   int direct=1;
 
   attra[0] = attra[1] = 0;
diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c
index ac1a742ab7..6373e556b5 100644
--- a/source4/client/smbmount.c
+++ b/source4/client/smbmount.c
@@ -600,7 +600,7 @@ static void read_credentials_file(char *filename)
 {
 	FILE *auth;
 	fstring buf;
-	uint16 len = 0;
+	uint16_t len = 0;
 	char *ptr, *val, *param;
 
 	if ((auth=sys_fopen(filename, "r")) == NULL)
-- 
cgit