sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r20245: merge 20244 from samba_3_0_24

Browse Source 
get rid of more nested extern declarations warnings
(This used to be commit e9df051f52)
This commit is contained in:
Herb Lewis 2006-12-18 20:37:26 +00:00 committed by Gerald (Jerry) Carter
parent 91626a4497
commit ef4c2088c5
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/nsswitch/winbindd_cm.c
View File

@ -65,13 +65,14 @@
#undef DBGC_CLASS #undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND #define DBGC_CLASS DBGC_WINBIND
extern struct winbindd_methods reconnect_methods;
struct dc_name_ip { struct dc_name_ip {
fstring name; fstring name;
struct in_addr ip; struct in_addr ip;
}; };
extern struct winbindd_methods reconnect_methods;
extern BOOL override_logfile;
static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain); static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain);
static void set_dc_type_and_flags( struct winbindd_domain *domain ); static void set_dc_type_and_flags( struct winbindd_domain *domain );
static BOOL get_dcs(TALLOC_CTX *mem_ctx, const struct winbindd_domain *domain, static BOOL get_dcs(TALLOC_CTX *mem_ctx, const struct winbindd_domain *domain,
@ -160,7 +161,6 @@ static void msg_try_to_go_online(int msg_type, struct process_id src, void *buf,
static BOOL fork_child_dc_connect(struct winbindd_domain *domain) static BOOL fork_child_dc_connect(struct winbindd_domain *domain)
{ {
extern BOOL override_logfile;
struct dc_name_ip *dcs = NULL; struct dc_name_ip *dcs = NULL;
int num_dcs = 0; int num_dcs = 0;
TALLOC_CTX *mem_ctx = NULL; TALLOC_CTX *mem_ctx = NULL;

3
source3/printing/print_cups.c
View File

@ -25,6 +25,7 @@
#include <cups/cups.h> #include <cups/cups.h>
#include <cups/language.h> #include <cups/language.h>
extern userdom_struct current_user_info;
/* /*
* 'cups_passwd_cb()' - The CUPS password callback... * 'cups_passwd_cb()' - The CUPS password callback...
@ -1006,7 +1007,6 @@ static int cups_queue_get(const char *sharename,
static int cups_queue_pause(int snum) static int cups_queue_pause(int snum)
{ {
extern userdom_struct current_user_info;
int ret = 1; /* Return value */ int ret = 1; /* Return value */
http_t *http = NULL; /* HTTP connection to server */ http_t *http = NULL; /* HTTP connection to server */
ipp_t *request = NULL, /* IPP Request */ ipp_t *request = NULL, /* IPP Request */
@ -1098,7 +1098,6 @@ static int cups_queue_pause(int snum)
static int cups_queue_resume(int snum) static int cups_queue_resume(int snum)
{ {
extern userdom_struct current_user_info;
int ret = 1; /* Return value */ int ret = 1; /* Return value */
http_t *http = NULL; /* HTTP connection to server */ http_t *http = NULL; /* HTTP connection to server */
ipp_t *request = NULL, /* IPP Request */ ipp_t *request = NULL, /* IPP Request */

5
source3/torture/locktest.c
View File

@ -36,6 +36,9 @@ static unsigned min_length = 0;
static BOOL exact_error_codes; static BOOL exact_error_codes;
static BOOL zero_zero; static BOOL zero_zero;
extern char *optarg;
extern int optind;
#define FILENAME "\\locktest.dat" #define FILENAME "\\locktest.dat"
#define READ_PCT 50 #define READ_PCT 50
@ -581,8 +584,6 @@ static void usage(void)
int main(int argc,char *argv[]) int main(int argc,char *argv[])
{ {
char *share[NSERVERS]; char *share[NSERVERS];
extern char *optarg;
extern int optind;
int opt; int opt;
char *p; char *p;
int seed, server; int seed, server;

5
source3/torture/locktest2.c
View File

@ -29,6 +29,9 @@ static BOOL analyze;
static BOOL hide_unlock_fails; static BOOL hide_unlock_fails;
static BOOL use_oplocks; static BOOL use_oplocks;
extern char *optarg;
extern int optind;
#define FILENAME "\\locktest.dat" #define FILENAME "\\locktest.dat"
#define LOCKRANGE 100 #define LOCKRANGE 100
#define LOCKBASE 0 #define LOCKBASE 0
@ -471,8 +474,6 @@ static void usage(void)
int main(int argc,char *argv[]) int main(int argc,char *argv[])
{ {
char *share1, *share2, *nfspath1, *nfspath2; char *share1, *share2, *nfspath1, *nfspath2;
extern char *optarg;
extern int optind;
int opt; int opt;
char *p; char *p;
int seed; int seed;

7
source3/torture/masktest.c
View File

@ -33,6 +33,10 @@ static int die_on_error;
static int NumLoops = 0; static int NumLoops = 0;
static int ignore_dot_errors = 0; static int ignore_dot_errors = 0;
extern char *optarg;
extern int optind;
extern BOOL AllowDebugChange;
/* a test fn for LANMAN mask support */ /* a test fn for LANMAN mask support */
int ms_fnmatch_lanman_core(const char *pattern, const char *string) int ms_fnmatch_lanman_core(const char *pattern, const char *string)
{ {
@ -426,9 +430,6 @@ static void usage(void)
{ {
char *share; char *share;
struct cli_state *cli; struct cli_state *cli;
extern char *optarg;
extern int optind;
extern BOOL AllowDebugChange;
int opt; int opt;
char *p; char *p;
int seed; int seed;