param: remove NUMPARAMETERS macro in s3
authorGarming Sam <garming@catalyst.net.nz>
Thu, 13 Mar 2014 22:15:17 +0000 (11:15 +1300)
committerJeremy Allison <jra@samba.org>
Wed, 7 May 2014 17:49:17 +0000 (19:49 +0200)
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/param/loadparm.c

index a0912ac95ffddb06fa060313e961b424cf3191a9..cbaabcc7db37b2a5e2b30d821ed522731a2f738a 100644 (file)
@@ -258,8 +258,6 @@ static bool bInGlobalSection = true;
 static bool bGlobalOnly = false;
 static struct file_lists *file_lists = NULL;
 
-#define NUMPARAMETERS (num_parameters())
-
 static void set_allowed_client_auth(void);
 
 static bool lp_set_cmdline_helper(const char *pszParmName, const char *pszParmValue, bool store_values);
@@ -2799,7 +2797,7 @@ static bool lp_set_cmdline_helper(const char *pszParmName, const char *pszParmVa
                     i--) {
                        parm_table[i].flags |= FLAG_CMDLINE;
                }
-               for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].offset == parm_table[parmnum].offset
+               for (i=parmnum+1;i<num_parameters() && parm_table[i].offset == parm_table[parmnum].offset
                             && parm_table[i].p_class == parm_table[parmnum].p_class;i++) {
                        parm_table[i].flags |= FLAG_CMDLINE;
                }