Refactor determiniation of the index of the canonical form of a

parameter given in string representation into a function of its
own (map_parameter_canonical).

Michael

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_2@24526 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index c867c5f508297a314f1d368467e1f6a75658ef18..ea1bb0a23f44fdaf69a7ec514289c052a7f5afae 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -2190,6 +2190,7 @@ FN_GLOBAL_INTEGER(lp_client_ldap_sasl_wrapping, &Globals.client_ldap_sasl_wrappi
 /* local prototypes */
 
 static int map_parameter(const char *pszParmName);
+static int map_parameter_canonical(const char *pszParmName, BOOL *inverse);
 static BOOL set_boolean(BOOL *pb, const char *pszParmValue);
 static const char *get_boolean(BOOL bool_value);
 static int getservicebyname(const char *pszServiceName,
@@ -2825,31 +2826,23 @@ BOOL lp_parameter_is_global(const char *pszParmName)
 BOOL lp_canonicalize_parameter(const char *parm_name, const char **canon_parm,
                               BOOL *inverse)
 {
-       int num, canon_num;
+       int num;
 
        if (!lp_parameter_is_valid(parm_name)) {
                *canon_parm = NULL;
                return False;
        }
 
-       *inverse = False;
-       num = map_parameter(parm_name);
-       if ((num < 0) || !(parm_table[num].flags & FLAG_HIDE)) {
-               /* it is already canonical (parametric are canonical anyways) */
+       num = map_parameter_canonical(parm_name, inverse);
+       if (num < 0) {
+               /* parametric option */
                *canon_parm = parm_name;
-               return True;
-       }
-
-       for (canon_num = 0; parm_table[canon_num].label; canon_num++) {
-               if (is_synonym_of(num, canon_num, inverse)) {
-                       *canon_parm = parm_table[canon_num].label;
-                       return True;
-               }
+       } else {
+               *canon_parm = parm_table[num].label;
        }
 
-       /* 'include', 'copy', 'config file' and friends left */
-       *canon_parm = parm_name;
        return True;
+
 }
 
 /***************************************************************************
@@ -2877,6 +2870,33 @@ static int map_parameter(const char *pszParmName)
        return (-1);
 }
 
+/***************************************************************************
+ Map a parameter's string representation to the index of the canonical
+ form of the parameter (it might be a synonym).
+ Returns -1 if the parameter string is not recognised.
+***************************************************************************/
+
+static int map_parameter_canonical(const char *pszParmName, BOOL *inverse)
+{
+       int parm_num, canon_num;
+
+       *inverse = False;
+
+       parm_num = map_parameter(pszParmName);
+       if ((parm_num < 0) || !(parm_table[parm_num].flags & FLAG_HIDE)) {
+               /* invalid, parametric or no canidate for synonyms ... */
+               return parm_num;
+       }
+
+       for (canon_num = 0; parm_table[canon_num].label; canon_num++) {
+               if (is_synonym_of(parm_num, canon_num, inverse)) {
+                       return canon_num;
+               }
+       }
+
+       return parm_num;
+}
+
 /***************************************************************************
  return true if parameter number parm1 is a synonym of parameter
  number parm2 (parm2 being the principal name).