LineageOS/android_external_rsync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made copy_section() and string_set() simpler, getting rid of a

Browse Source 
"FIXME" comment that we don't need to fix.
This commit is contained in:
Wayne Davison
2009-02-06 07:27:18 -08:00
parent 789213909d
commit 43eb865f9a
1 changed files with 22 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
loadparm.c
View File

@@ -89,9 +89,7 @@ struct parm_struct {
#define LP_SNUM_OK(i) ((i) >= 0 && (i) < (int)section_list.count) #define LP_SNUM_OK(i) ((i) >= 0 && (i) < (int)section_list.count)
#define SECTION_PTR(s, p) (((char*)(s)) + (ptrdiff_t)(((char*)(p))-(char*)&Vars.l)) #define SECTION_PTR(s, p) (((char*)(s)) + (ptrdiff_t)(((char*)(p))-(char*)&Vars.l))
/* /* This structure describes global (ie., server-wide) parameters. */
* This structure describes global (ie., server-wide) parameters.
*/
typedef struct { typedef struct {
char *bind_address; char *bind_address;
char *motd_file; char *motd_file;
@@ -101,11 +99,10 @@ typedef struct {
int rsync_port; int rsync_port;
} global_vars; } global_vars;
/* /* This structure describes a single section. Their order must match the
* This structure describes a single section. Their order must match the
* initializers below, which you can accomplish by keeping each sub-section * initializers below, which you can accomplish by keeping each sub-section
* sorted. (e.g. in vim, just visually select each subsection and use !sort.) * sorted. (e.g. in vim, just visually select each subsection and use !sort.)
*/ * NOTE: the char* variables MUST all remain at the start of the stuct! */
typedef struct { typedef struct {
char *auth_users; char *auth_users;
char *charset; char *charset;
@@ -132,6 +129,8 @@ typedef struct {
char *secrets_file; char *secrets_file;
char *temp_dir; char *temp_dir;
char *uid; char *uid;
/* NOTE: update this macro if the last char* variable changes! */
#define LOCAL_STRING_COUNT() (offsetof(local_vars, uid) / sizeof (char*) + 1)
int max_connections; int max_connections;
int max_verbosity; int max_verbosity;
@@ -438,62 +437,31 @@ FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
FN_LOCAL_BOOL(lp_use_chroot, use_chroot) FN_LOCAL_BOOL(lp_use_chroot, use_chroot)
FN_LOCAL_BOOL(lp_write_only, write_only) FN_LOCAL_BOOL(lp_write_only, write_only)
/* Assign a copy of v to *s. Handles NULL strings. *v must /* Assign a copy of v to *s. Handles NULL strings. We don't worry
* be initialized when this is called, either to NULL or a malloc'd * about overwriting a malloc'd string because the long-running
* string. * (port-listening) daemon only loads the config file once, and the
* * per-job (forked or xinitd-ran) daemon only re-reads the file at
* FIXME There is a small leak here in that sometimes the existing * the start, so any lost memory is inconsequential. */
* value will be dynamically allocated, and the old copy is lost. static inline void string_set(char **s, const char *v)
* However, we can't always deallocate the old value, because the
* initial values in Defaults.l are static strings. It would be nice
* to have either all-strdup'd values, or to never need to free
* memory. */
static void string_set(char **s, const char *v)
{ {
if (!v) { if (!v)
*s = NULL; *s = NULL;
return; else if (!(*s = strdup(v)))
}
if (!(*s = strdup(v)))
out_of_memory("string_set"); out_of_memory("string_set");
} }
/* Copy the local_vars, duplicating any strings in the source. */ /* Copy the local_vars, strdup'ing any strings. NOTE: this depends on
* the structure starting with a contiguous list of the char* variables,
* and having an accurate count in the LOCAL_STRING_COUNT() macro. */
static void copy_section(local_vars *psectionDest, local_vars *psectionSource) static void copy_section(local_vars *psectionDest, local_vars *psectionSource)
{ {
int i; int count = LOCAL_STRING_COUNT();
char **strings = (char**)psectionDest;
for (i = 0; parm_table[i].label; i++) { memcpy(psectionDest, psectionSource, sizeof psectionDest[0]);
if (parm_table[i].ptr && parm_table[i].class == P_LOCAL) { while (count--) {
void *def_ptr = parm_table[i].ptr; if (strings[count] && !(strings[count] = strdup(strings[count])))
void *src_ptr = SECTION_PTR(psectionSource, def_ptr); out_of_memory("copy_section");
void *dest_ptr = SECTION_PTR(psectionDest, def_ptr);
switch (parm_table[i].type) {
case P_BOOL:
case P_BOOLREV:
*(BOOL *)dest_ptr = *(BOOL *)src_ptr;
break;
case P_INTEGER:
case P_ENUM:
case P_OCTAL:
*(int *)dest_ptr = *(int *)src_ptr;
break;
case P_CHAR:
*(char *)dest_ptr = *(char *)src_ptr;
break;
case P_PATH:
case P_STRING:
string_set(dest_ptr, *(char **)src_ptr);
break;
default:
break;
}
}
} }
} }