r23: get rid of def_finfo

(This used to be commit 25b7ec390aec3e324c4c7ad8edbc90fc8896b230)

diff --git a/source4/client/client.c b/source4/client/client.c
index fef258a6b20c983d53dd15e38fbe6c3ec789c1ac..61d52b82d96b6c094dfc53ce7cb3ab5fbca34279 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -82,8 +82,6 @@ static BOOL abort_mget = True;
 
 static pstring fileselection = "";
 
-extern file_info def_finfo;
-
 /* timing globals */
 SMB_BIG_UINT get_total_size = 0;
 unsigned int get_total_time_ms = 0;

diff --git a/source4/client/clitar.c b/source4/client/clitar.c
index da91ba4bebb9b98dbe5826041e572283c8d7874c..356709b91555fc7eae2f27ccd985f7e1c83e4532 100644 (file)
--- a/source4/client/clitar.c
+++ b/source4/client/clitar.c
@@ -109,7 +109,6 @@ static char **cliplist=NULL;
 static int clipn=0;
 static BOOL must_free_cliplist = False;
 
-extern file_info def_finfo;
 extern BOOL lowercase;
 extern uint16 cnum;
 extern BOOL readbraw_supported;
@@ -624,14 +623,7 @@ static void do_atar(char *rname,char *lname,file_info *finfo1)
     finfo.name  = finfo1 -> name;
   }
   else {
-    finfo.size  = def_finfo.size;
-    finfo.mode  = def_finfo.mode;
-    finfo.uid   = def_finfo.uid;
-    finfo.gid   = def_finfo.gid;
-    finfo.mtime = def_finfo.mtime;
-    finfo.atime = def_finfo.atime;
-    finfo.ctime = def_finfo.ctime;
-    finfo.name  = def_finfo.name;
+         ZERO_STRUCT(finfo);
   }
 
   if (dry_run)

diff --git a/source4/libcli/util/cliutil.c b/source4/libcli/util/cliutil.c
index 13b3dad0bf70e9048877deb460746ac10714c7d6..56dee7381a0ccd35627c8795e9e0a35e56a1f72a 100644 (file)
--- a/source4/libcli/util/cliutil.c
+++ b/source4/libcli/util/cliutil.c
@@ -24,9 +24,6 @@
  Functions nicked from lib/util.c needed by client.
 *******************************************************************/
 
-/* a default finfo structure to ensure all fields are sensible */
-file_info def_finfo = {-1,0,0,0,0,0,0,"",""};
-
 /*******************************************************************
  A wrapper that handles case sensitivity and the special handling
  of the ".." name.