From dace013898a450b50606740704c83ba25855e332 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 27 Jul 2010 10:59:55 +0200
Subject: s3: Remove a typedef (struct file_info)

---
 source3/client/client.c       | 19 ++++++++++---------
 source3/client/client_proto.h |  2 +-
 source3/client/clitar.c       | 10 ++++++----
 3 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'source3/client')

diff --git a/source3/client/client.c b/source3/client/client.c
index cd41699da3..6afdde0ebb 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -484,7 +484,7 @@ static int cmd_cd_oneup(void)
  Decide if a file should be operated on.
 ********************************************************************/
 
-static bool do_this_one(file_info *finfo)
+static bool do_this_one(struct file_info *finfo)
 {
 	if (!finfo->name) {
 		return false;
@@ -517,7 +517,7 @@ static bool do_this_one(file_info *finfo)
  Display info about a file.
 ****************************************************************************/
 
-static void display_finfo(file_info *finfo, const char *dir)
+static void display_finfo(struct file_info *finfo, const char *dir)
 {
 	time_t t;
 	TALLOC_CTX *ctx = talloc_tos();
@@ -581,7 +581,7 @@ static void display_finfo(file_info *finfo, const char *dir)
  Accumulate size of a file.
 ****************************************************************************/
 
-static void do_du(file_info *finfo, const char *dir)
+static void do_du(struct file_info *finfo, const char *dir)
 {
 	if (do_this_one(finfo)) {
 		dir_total += finfo->size;
@@ -594,7 +594,7 @@ static char *do_list_queue = 0;
 static long do_list_queue_size = 0;
 static long do_list_queue_start = 0;
 static long do_list_queue_end = 0;
-static void (*do_list_fn)(file_info *, const char *dir);
+static void (*do_list_fn)(struct file_info *, const char *dir);
 
 /****************************************************************************
  Functions for do_list_queue.
@@ -711,7 +711,8 @@ static int do_list_queue_empty(void)
  A helper for do_list.
 ****************************************************************************/
 
-static void do_list_helper(const char *mntpoint, file_info *f, const char *mask, void *state)
+static void do_list_helper(const char *mntpoint, struct file_info *f,
+			   const char *mask, void *state)
 {
 	TALLOC_CTX *ctx = talloc_tos();
 	char *dir = NULL;
@@ -784,7 +785,7 @@ static void do_list_helper(const char *mntpoint, file_info *f, const char *mask,
 
 void do_list(const char *mask,
 			uint16 attribute,
-			void (*fn)(file_info *, const char *dir),
+			void (*fn)(struct file_info *, const char *dir),
 			bool rec,
 			bool dirs)
 {
@@ -1153,7 +1154,7 @@ static int cmd_get(void)
  Do an mget operation on one file.
 ****************************************************************************/
 
-static void do_mget(file_info *finfo, const char *dir)
+static void do_mget(struct file_info *finfo, const char *dir)
 {
 	TALLOC_CTX *ctx = talloc_tos();
 	char *rname = NULL;
@@ -2132,7 +2133,7 @@ static int cmd_queue(void)
  Delete some files.
 ****************************************************************************/
 
-static void do_del(file_info *finfo, const char *dir)
+static void do_del(struct file_info *finfo, const char *dir)
 {
 	TALLOC_CTX *ctx = talloc_tos();
 	char *mask = NULL;
@@ -4202,7 +4203,7 @@ struct completion_remote {
 };
 
 static void completion_remote_filter(const char *mnt,
-				file_info *f,
+				struct file_info *f,
 				const char *mask,
 				void *state)
 {
diff --git a/source3/client/client_proto.h b/source3/client/client_proto.h
index aa3eb0e8af..aca0a8d20d 100644
--- a/source3/client/client_proto.h
+++ b/source3/client/client_proto.h
@@ -30,7 +30,7 @@ const char *client_get_cur_dir(void);
 const char *client_set_cur_dir(const char *newdir);
 void do_list(const char *mask,
 			uint16 attribute,
-			void (*fn)(file_info *, const char *dir),
+			void (*fn)(struct file_info *, const char *dir),
 			bool rec,
 			bool dirs);
 int cmd_iosize(void);
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 0a1adb463e..030362f14d 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -114,8 +114,9 @@ static int tarhandle;
 
 static void writetarheader(int f,  const char *aname, uint64_t size, time_t mtime,
 			   const char *amode, unsigned char ftype);
-static void do_atar(const char *rname_in,char *lname,file_info *finfo1);
-static void do_tar(file_info *finfo, const char *dir);
+static void do_atar(const char *rname_in, char *lname,
+		    struct file_info *finfo1);
+static void do_tar(struct file_info *finfo, const char *dir);
 static void oct_it(uint64_t value, int ndgs, char *p);
 static void fixtarname(char *tptr, const char *fp, size_t l);
 static int dotarbuf(int f, char *b, int n);
@@ -613,7 +614,8 @@ static void do_setrattr(char *name, uint16 attr, int set)
 append one remote file to the tar file
 ***************************************************************************/
 
-static void do_atar(const char *rname_in,char *lname,file_info *finfo1)
+static void do_atar(const char *rname_in, char *lname,
+		    struct file_info *finfo1)
 {
 	uint16_t fnum = (uint16_t)-1;
 	uint64_t nread=0;
@@ -803,7 +805,7 @@ static void do_atar(const char *rname_in,char *lname,file_info *finfo1)
 Append single file to tar file (or not)
 ***************************************************************************/
 
-static void do_tar(file_info *finfo, const char *dir)
+static void do_tar(struct file_info *finfo, const char *dir)
 {
 	TALLOC_CTX *ctx = talloc_stackframe();
 
-- 
cgit