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

loadparm: Factor out lp_wi_scan_parametrics

Browse Source 
We'll scan share parametrics soon as well.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=15688
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Volker Lendecke 2024-07-29 06:27:51 -07:00 committed by Stefan Metzmacher
parent 7dc19dd94c
commit 0536ac96e9
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/param/loadparm.c
View File

@ -1204,11 +1204,13 @@ static void discard_whitespace(char *str)
* See "man regexec" for possible errors * See "man regexec" for possible errors
*/ */
int lp_wi_scan_global_parametrics( static int lp_wi_scan_parametrics(struct parmlist_entry *parmlist,
const char *regex_str, size_t max_matches, const char *regex_str,
bool (*cb)(const char *string, regmatch_t matches[], size_t max_matches,
void *private_data), bool (*cb)(const char *string,
void *private_data) regmatch_t matches[],
void *private_data),
void *private_data)
{ {
struct parmlist_entry *data; struct parmlist_entry *data;
regex_t regex; regex_t regex;
@ -1219,7 +1221,7 @@ int lp_wi_scan_global_parametrics(
return ret; return ret;
} }
for (data = Globals.param_opt; data != NULL; data = data->next) { for (data = parmlist; data != NULL; data = data->next) {
size_t keylen = strlen(data->key); size_t keylen = strlen(data->key);
char key[keylen+1]; char key[keylen+1];
regmatch_t matches[max_matches]; regmatch_t matches[max_matches];
@ -1248,6 +1250,17 @@ fail:
return ret; return ret;
} }
int lp_wi_scan_global_parametrics(const char *regex_str,
size_t max_matches,
bool (*cb)(const char *string,
regmatch_t matches[],
void *private_data),
void *private_data)
{
int ret = lp_wi_scan_parametrics(
Globals.param_opt, regex_str, max_matches, cb, private_data);
return ret;
}
#define MISSING_PARAMETER(name) \ #define MISSING_PARAMETER(name) \
DEBUG(0, ("%s(): value is NULL or empty!\n", #name)) DEBUG(0, ("%s(): value is NULL or empty!\n", #name))