From b64ac379361b01402703a56dd5c89f3fcef8cadd Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Thu, 20 Feb 2014 11:07:28 +1300 Subject: param: move the declaration of the file_lists structure to a shared header Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/loadparm.c | 7 +------ lib/param/loadparm.h | 7 +++++++ source3/param/loadparm.c | 8 +------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index d5b8d2c10b..356c5c4ac8 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -111,12 +111,7 @@ struct loadparm_context { int iNumServices; struct loadparm_service *currentService; bool bInGlobalSection; - struct file_lists { - struct file_lists *next; - char *name; - char *subfname; - time_t modtime; - } *file_lists; + struct file_lists *file_lists; unsigned int flags[NUMPARAMETERS]; bool loaded; bool refuse_free; diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 64f0d87238..2b890db5c4 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -68,6 +68,13 @@ struct parm_struct { } def; }; +struct file_lists { + struct file_lists *next; + char *name; + char *subfname; + time_t modtime; +}; + /* The following flags are used in SWAT */ #define FLAG_BASIC 0x0001 /* Display only in BASIC view */ #define FLAG_SHARE 0x0002 /* file sharing options */ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9f67a9ebf3..479a41eaae 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -249,13 +249,6 @@ static struct loadparm_service sDefault = .dummy = "" }; -static struct file_lists { - struct file_lists *next; - char *name; - char *subfname; - time_t modtime; -} *file_lists = NULL; - /* local variables */ static struct loadparm_service **ServicePtrs = NULL; static int iNumServices = 0; @@ -263,6 +256,7 @@ static int iServiceIndex = 0; static struct db_context *ServiceHash; static bool bInGlobalSection = true; static bool bGlobalOnly = false; +static struct file_lists *file_lists = NULL; #define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct)) -- cgit