Author: herb Date: 2006-12-18 20:31:43 +0000 (Mon, 18 Dec 2006) New Revision: 20244
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20244 Log: get rid of more nested extern declaration warnings Modified: branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0_24/source/printing/print_cups.c branches/SAMBA_3_0_24/source/torture/locktest.c branches/SAMBA_3_0_24/source/torture/locktest2.c branches/SAMBA_3_0_24/source/torture/masktest.c Changeset: Modified: branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c =================================================================== --- branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c 2006-12-18 20:05:50 UTC (rev 20243) +++ branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c 2006-12-18 20:31:43 UTC (rev 20244) @@ -71,6 +71,7 @@ }; extern struct winbindd_methods reconnect_methods; +extern BOOL override_logfile; static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain); static void set_dc_type_and_flags( struct winbindd_domain *domain ); @@ -160,7 +161,6 @@ static BOOL fork_child_dc_connect(struct winbindd_domain *domain) { - extern BOOL override_logfile; struct dc_name_ip *dcs = NULL; int num_dcs = 0; TALLOC_CTX *mem_ctx = NULL; Modified: branches/SAMBA_3_0_24/source/printing/print_cups.c =================================================================== --- branches/SAMBA_3_0_24/source/printing/print_cups.c 2006-12-18 20:05:50 UTC (rev 20243) +++ branches/SAMBA_3_0_24/source/printing/print_cups.c 2006-12-18 20:31:43 UTC (rev 20244) @@ -25,6 +25,7 @@ #include <cups/cups.h> #include <cups/language.h> +extern userdom_struct current_user_info; /* * 'cups_passwd_cb()' - The CUPS password callback... @@ -1006,7 +1007,6 @@ static int cups_queue_pause(int snum) { - extern userdom_struct current_user_info; int ret = 1; /* Return value */ http_t *http = NULL; /* HTTP connection to server */ ipp_t *request = NULL, /* IPP Request */ @@ -1098,7 +1098,6 @@ static int cups_queue_resume(int snum) { - extern userdom_struct current_user_info; int ret = 1; /* Return value */ http_t *http = NULL; /* HTTP connection to server */ ipp_t *request = NULL, /* IPP Request */ Modified: branches/SAMBA_3_0_24/source/torture/locktest.c =================================================================== --- branches/SAMBA_3_0_24/source/torture/locktest.c 2006-12-18 20:05:50 UTC (rev 20243) +++ branches/SAMBA_3_0_24/source/torture/locktest.c 2006-12-18 20:31:43 UTC (rev 20244) @@ -36,6 +36,9 @@ static BOOL exact_error_codes; static BOOL zero_zero; +extern char *optarg; +extern int optind; + #define FILENAME "\\locktest.dat" #define READ_PCT 50 @@ -581,8 +584,6 @@ int main(int argc,char *argv[]) { char *share[NSERVERS]; - extern char *optarg; - extern int optind; int opt; char *p; int seed, server; Modified: branches/SAMBA_3_0_24/source/torture/locktest2.c =================================================================== --- branches/SAMBA_3_0_24/source/torture/locktest2.c 2006-12-18 20:05:50 UTC (rev 20243) +++ branches/SAMBA_3_0_24/source/torture/locktest2.c 2006-12-18 20:31:43 UTC (rev 20244) @@ -29,6 +29,9 @@ static BOOL hide_unlock_fails; static BOOL use_oplocks; +extern char *optarg; +extern int optind; + #define FILENAME "\\locktest.dat" #define LOCKRANGE 100 #define LOCKBASE 0 @@ -471,8 +474,6 @@ int main(int argc,char *argv[]) { char *share1, *share2, *nfspath1, *nfspath2; - extern char *optarg; - extern int optind; int opt; char *p; int seed; Modified: branches/SAMBA_3_0_24/source/torture/masktest.c =================================================================== --- branches/SAMBA_3_0_24/source/torture/masktest.c 2006-12-18 20:05:50 UTC (rev 20243) +++ branches/SAMBA_3_0_24/source/torture/masktest.c 2006-12-18 20:31:43 UTC (rev 20244) @@ -33,6 +33,10 @@ static int NumLoops = 0; static int ignore_dot_errors = 0; +extern char *optarg; +extern int optind; +extern BOOL AllowDebugChange; + /* a test fn for LANMAN mask support */ int ms_fnmatch_lanman_core(const char *pattern, const char *string) { @@ -426,9 +430,6 @@ { char *share; struct cli_state *cli; - extern char *optarg; - extern int optind; - extern BOOL AllowDebugChange; int opt; char *p; int seed;