param: move the declaration of the file_lists structure to a shared header

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index d5b8d2c10bdb01df5b6a60ce547ee86cd5753e3e..356c5c4ac87bbd33cd7db09596a28044db643066 100644 (file)
--- 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 64f0d8723830e2f740e13e32441ae8ec519b3379..2b890db5c4d5c89204c54728a7f149c2a659cc9a 100644 (file)
--- 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 9f67a9ebf388b292e8332c627e6e48ff04b7888a..479a41eaae45c203cd4003edcd53a31ab97da954 100644 (file)
--- 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))