sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

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

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam 2014-02-20 11:07:28 +13:00 committed by Jeremy Allison
parent 61103e1a46
commit b64ac37936
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/param/loadparm.c
View File

@ -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;

7
lib/param/loadparm.h
View File

@ -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 */

8
source3/param/loadparm.c
View File

@ -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))