declare dbf in one spot

source/client/client.c

@@ -2280,7 +2280,6 @@ static int do_message_op(void)
 	fstring base_directory;
 	char *pname = argv[0];
 	int opt;
-	extern XFILE *dbf;
 	extern char *optarg;
 	extern int optind;
 	int old_debug;

source/client/clitar.c

@@ -71,7 +71,6 @@ stack dir_stack = {NULL, 0}; /* Want an empty stack */
 #define SEPARATORS " \t\n\r"
 extern int DEBUGLEVEL;
 extern struct cli_state *cli;
-extern XFILE *dbf;
 
 /* These defines are for the do_setrattr routine, to indicate
  * setting and reseting of file attributes in the function call */

source/include/debug.h

@@ -40,6 +40,8 @@
 int  Debug1( char *, ... ) PRINTF_ATTRIBUTE(1,2);
 BOOL dbgtext( char *, ... ) PRINTF_ATTRIBUTE(1,2);
 
+extern XFILE *dbf;
+
 /* If we have these macros, we can add additional info to the header. */
 #ifdef HAVE_FILE_MACRO
 #define FILE_MACRO (__FILE__)

source/include/includes.h

@@ -626,6 +626,7 @@ extern int errno;
 #endif
 
 /* Lists, trees, caching, database... */
+#include "xfile.h"
 #include "ubi_sLinkList.h"
 #include "ubi_dLinkList.h"
 #include "dlinklist.h"
@@ -640,7 +641,6 @@ extern int errno;
 #include "messages.h"
 #include "util_list.h"
 #include "charset.h"
-#include "xfile.h"
 
 #include "util_getent.h"
 

source/include/xfile.h

@@ -19,6 +19,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef _XFILE_H_
+#define _XFILE_H_
 /*
   see xfile.c for explanations
 */
@@ -42,3 +44,5 @@ extern XFILE *x_stdin, *x_stdout, *x_stderr;
 #define X_IONBF 2
 
 #define x_getc(f) x_fgetc(f)
+
+#endif /* _XFILE_H_ */

source/lib/cmd_interp.c

@@ -917,7 +917,6 @@ static uint32 cmd_set(CLIENT_INFO *info, int argc, char *argv[])
 	BOOL interactive = True;
 	char *cmd_str = NULL;
 	int opt;
-	extern XFILE *dbf;
 	extern char *optarg;
 	static pstring servicesf = CONFIGFILE;
 	pstring term_code;

source/lib/readline.c

@@ -49,7 +49,6 @@ static char *smb_readline_replacement(char *prompt, void (*callback)(void),
                                                              int end))
 {
 	fd_set fds;
-	extern XFILE *dbf;
 	static pstring line;
 	struct timeval timeout;
 	int fd = fileno(stdin);

source/nmbd/nmbd.c

@@ -666,7 +666,6 @@ static void usage(char *pname)
  int main(int argc,char *argv[])
 {
   int opt;
-  extern XFILE *dbf;
   extern char *optarg;
   extern BOOL  append_log;
 

source/smbwrapper/smbsh.c

@@ -42,7 +42,6 @@ int main(int argc, char *argv[])
 	int opt;
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 
 	dbf = x_stdout;
 	smbw_setup_shared();

source/smbwrapper/smbw.c

@@ -47,7 +47,6 @@ void smbw_init(void)
 	extern BOOL in_client;
 	static int initialised;
 	static pstring servicesf = CONFIGFILE;
-	extern XFILE *dbf;
 	char *p;
 	int eno;
 	pstring line;

source/torture/locktest.c

@@ -545,7 +545,6 @@ static void usage(void)
 	char *share[NSERVERS];
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	int seed, server;

source/torture/locktest2.c

@@ -533,7 +533,6 @@ static void usage(void)
 	char *share1, *share2, *nfspath1, *nfspath2;
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	int seed;

source/torture/masktest.c

@@ -420,7 +420,6 @@ static void usage(void)
 	struct cli_state *cli;	
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	int seed;

source/torture/rpctorture.c

@@ -229,7 +229,6 @@ enum client_action
 {
 	char *pname = argv[0];
 	int opt;
-	extern XFILE *dbf;
 	extern char *optarg;
 	extern int optind;
 	static pstring servicesf = CONFIGFILE;

source/torture/torture.c

@@ -3077,7 +3077,6 @@ static void usage(void)
 	int gotpass = 0;
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	static pstring servicesf = CONFIGFILE;
 	BOOL correct = True;
 

source/utils/smbcacls.c

@@ -802,7 +802,6 @@ You can string acls together with spaces, commas or newlines\n\
 	pstring filename;
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	static pstring servicesf = CONFIGFILE;

source/utils/smbtree.c

@@ -325,7 +325,6 @@ static BOOL print_tree(struct user_auth_info *user_info)
 {
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *p;
 	pstring servicesf = CONFIGFILE;

source/utils/status.c

@@ -45,7 +45,6 @@ struct session_record{
 } *srecs;
 
 extern int DEBUGLEVEL;
-extern XFILE *dbf;
 
 static pstring Ucrit_username = "";                   /* added by OH */
 static pid_t	Ucrit_pid[100];  /* Ugly !!! */        /* added by OH */

source/utils/testparm.c

@@ -36,7 +36,6 @@
 #include "smb.h"
 
 /* these live in util.c */
-extern XFILE *dbf;
 extern int DEBUGLEVEL;
 
 /***********************************************

source/utils/testprns.c

@@ -35,7 +35,6 @@
 #include "smb.h"
 
 /* these live in util.c */
-extern XFILE *dbf;
 extern int DEBUGLEVEL;
 
 int main(int argc, char *argv[])

source/web/swat.c

@@ -999,7 +999,6 @@ static void printers_page(void)
 {
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *page;