aboutsummaryrefslogtreecommitdiffstats
path: root/loadparm.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2003-09-10 07:31:58 +0000
committerWayne Davison <wayned@samba.org>2003-09-10 07:31:58 +0000
commit6464bdbe13a5b26a39e119cf7f008d4cb10451c9 (patch)
treef8f17a13c75d90f89181a3f1c8b2c13b63a30a21 /loadparm.c
parent4f3e9a0fba90430698f6872c3e1d76f7fec6d788 (diff)
downloadandroid_external_rsync-6464bdbe13a5b26a39e119cf7f008d4cb10451c9.tar.gz
android_external_rsync-6464bdbe13a5b26a39e119cf7f008d4cb10451c9.tar.bz2
android_external_rsync-6464bdbe13a5b26a39e119cf7f008d4cb10451c9.zip
Got rid of trailing whitespace.
Diffstat (limited to 'loadparm.c')
-rw-r--r--loadparm.c67
1 files changed, 33 insertions, 34 deletions
diff --git a/loadparm.c b/loadparm.c
index 20326621..30ce9393 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -6,17 +6,17 @@
* Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
*/
-/*
+/*
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -36,7 +36,7 @@
* 3) add it to the list of available functions (eg: using FN_GLOBAL_STRING())
* 4) If it's a global then initialise it in init_globals. If a local
* (ie. service) parameter then initialise it in the sDefault structure
- *
+ *
*
* Notes:
* The configuration file is processed sequentially for speed. It is NOT
@@ -93,7 +93,7 @@ struct parm_struct
#define iSERVICE(i) (*pSERVICE(i))
#define LP_SNUM_OK(iService) (((iService) >= 0) && ((iService) < iNumServices))
-/*
+/*
* This structure describes global (ie., server-wide) parameters.
*/
typedef struct
@@ -109,8 +109,8 @@ static global Globals;
-/*
- * This structure describes a single service.
+/*
+ * This structure describes a single service.
*/
typedef struct
{
@@ -144,7 +144,7 @@ typedef struct
/* This is a default service used to prime a services structure */
-static service sDefault =
+static service sDefault =
{
NULL, /* name */
NULL, /* path */
@@ -156,7 +156,7 @@ static service sDefault =
False, /* transfer logging */
False, /* ignore errors */
"nobody",/* uid */
-
+
/* TODO: This causes problems on Debian, where it is called
* "nogroup". Debian patch this in their version of the
* package, but it would be nice to be consistent. Possibly
@@ -165,7 +165,7 @@ static service sDefault =
* What is the best behaviour? Perhaps always using (gid_t)
* -2? */
"nobody",/* gid */
-
+
NULL, /* hosts allow */
NULL, /* hosts deny */
NULL, /* auth users */
@@ -222,7 +222,7 @@ static struct enum_list enum_facilities[] = {
{ LOG_NEWS, "news" },
#endif
#ifdef LOG_AUTH
- { LOG_AUTH, "security" },
+ { LOG_AUTH, "security" },
#endif
#ifdef LOG_SYSLOG
{ LOG_SYSLOG, "syslog" },
@@ -319,8 +319,8 @@ static void init_locals(void)
/*
- In this section all the functions that are used to access the
- parameters from the rest of the program are defined
+ In this section all the functions that are used to access the
+ parameters from the rest of the program are defined
*/
#define FN_GLOBAL_STRING(fn_name,ptr) \
@@ -376,12 +376,11 @@ FN_LOCAL_INTEGER(lp_timeout, timeout)
FN_LOCAL_INTEGER(lp_max_connections, max_connections)
/* local prototypes */
-static int strwicmp( char *psz1, char *psz2 );
-static int map_parameter( char *parmname);
-static BOOL set_boolean( BOOL *pb, char *parmvalue );
+static int strwicmp(char *psz1, char *psz2);
+static int map_parameter(char *parmname);
+static BOOL set_boolean(BOOL *pb, char *parmvalue);
static int getservicebyname(char *name, service *pserviceDest);
-static void copy_service( service *pserviceDest,
- service *pserviceSource);
+static void copy_service(service *pserviceDest, service *pserviceSource);
static BOOL do_parameter(char *parmname, char *parmvalue);
static BOOL do_section(char *sectionname);
@@ -421,7 +420,7 @@ static void string_set(char **s, const char *v)
/***************************************************************************
-add a new service to the services array initialising it with the given
+add a new service to the services array initialising it with the given
service
***************************************************************************/
static int add_a_service(service *pservice, char *name)
@@ -433,7 +432,7 @@ static int add_a_service(service *pservice, char *name)
tservice = *pservice;
/* it might already exist */
- if (name)
+ if (name)
{
i = getservicebyname(name,NULL);
if (i >= 0)
@@ -455,7 +454,7 @@ static int add_a_service(service *pservice, char *name)
init_service(pSERVICE(i));
copy_service(pSERVICE(i),&tservice);
if (name)
- string_set(&iSERVICE(i).name,name);
+ string_set(&iSERVICE(i).name,name);
return(i);
}
@@ -493,7 +492,7 @@ static int strwicmp(char *psz1, char *psz2)
}
/***************************************************************************
-Map a parameter's string representation to something we can use.
+Map a parameter's string representation to something we can use.
Returns False if the parameter string is not recognised, else TRUE.
***************************************************************************/
static int map_parameter(char *parmname)
@@ -503,7 +502,7 @@ static int map_parameter(char *parmname)
if (*parmname == '-')
return(-1);
- for (iIndex = 0; parm_table[iIndex].label; iIndex++)
+ for (iIndex = 0; parm_table[iIndex].label; iIndex++)
if (strwicmp(parm_table[iIndex].label, parmname) == 0)
return(iIndex);
@@ -514,7 +513,7 @@ static int map_parameter(char *parmname)
/***************************************************************************
Set a boolean variable from the text value stored in the passed string.
-Returns True in success, False if the passed string does not correctly
+Returns True in success, False if the passed string does not correctly
represent a boolean.
***************************************************************************/
static BOOL set_boolean(BOOL *pb, char *parmvalue)
@@ -548,7 +547,7 @@ static int getservicebyname(char *name, service *pserviceDest)
int iService;
for (iService = iNumServices - 1; iService >= 0; iService--)
- if (strwicmp(iSERVICE(iService).name, name) == 0)
+ if (strwicmp(iSERVICE(iService).name, name) == 0)
{
if (pserviceDest != NULL)
copy_service(pserviceDest, pSERVICE(iService));
@@ -564,7 +563,7 @@ static int getservicebyname(char *name, service *pserviceDest)
Copy a service structure to another
***************************************************************************/
-static void copy_service(service *pserviceDest,
+static void copy_service(service *pserviceDest,
service *pserviceSource)
{
int i;
@@ -572,9 +571,9 @@ static void copy_service(service *pserviceDest,
for (i=0;parm_table[i].label;i++)
if (parm_table[i].ptr && parm_table[i].class == P_LOCAL) {
void *def_ptr = parm_table[i].ptr;
- void *src_ptr =
+ void *src_ptr =
((char *)pserviceSource) + PTR_DIFF(def_ptr,&sDefault);
- void *dest_ptr =
+ void *dest_ptr =
((char *)pserviceDest) + PTR_DIFF(def_ptr,&sDefault);
switch (parm_table[i].type)
@@ -711,7 +710,7 @@ static BOOL do_section(char *sectionname)
init_locals();
/* if we've just struck a global section, note the fact. */
- bInGlobalSection = isglobal;
+ bInGlobalSection = isglobal;
/* check for multiple global sections */
if (bInGlobalSection)
@@ -743,7 +742,7 @@ static BOOL do_section(char *sectionname)
/***************************************************************************
-Load the services array from the services file. Return True on success,
+Load the services array from the services file. Return True on success,
False on failure.
***************************************************************************/
BOOL lp_load(char *pszFname, int globals_only)
@@ -753,11 +752,11 @@ BOOL lp_load(char *pszFname, int globals_only)
extern int am_root;
pstring n2;
BOOL bRetval;
-
+
bRetval = False;
bInGlobalSection = True;
-
+
init_globals();
if (pszFname)
@@ -770,7 +769,7 @@ BOOL lp_load(char *pszFname, int globals_only)
/* We get sections first, so have to start 'behind' to make up */
iServiceIndex = -1;
bRetval = pm_process(n2, globals_only?NULL:do_section, do_parameter);
-
+
return (bRetval);
}
@@ -794,7 +793,7 @@ int lp_number(char *name)
int iService;
for (iService = iNumServices - 1; iService >= 0; iService--)
- if (strequal(lp_name(iService), name))
+ if (strequal(lp_name(iService), name))
break;
return (iService);