loadparm: Factor out lp_wi_scan_parametrics

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>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 663edb2c653ab95d66536bfda289d0d2724fe162..246e0378d652943563fc8ce33db859fc26e7abc3 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1204,11 +1204,13 @@ static void discard_whitespace(char *str)
  *                      See "man regexec" for possible errors
  */
 
-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)
+static int lp_wi_scan_parametrics(struct parmlist_entry *parmlist,
+                                 const char *regex_str,
+                                 size_t max_matches,
+                                 bool (*cb)(const char *string,
+                                            regmatch_t matches[],
+                                            void *private_data),
+                                 void *private_data)
 {
        struct parmlist_entry *data;
        regex_t regex;
@@ -1219,7 +1221,7 @@ int lp_wi_scan_global_parametrics(
                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);
                char key[keylen+1];
                regmatch_t matches[max_matches];
@@ -1248,6 +1250,17 @@ fail:
        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) \
     DEBUG(0, ("%s(): value is NULL or empty!\n", #name))