param: remove duplicate lp_int function
authorGarming Sam <garming@catalyst.net.nz>
Fri, 21 Feb 2014 02:13:58 +0000 (15:13 +1300)
committerJeremy Allison <jra@samba.org>
Wed, 7 May 2014 17:49:16 +0000 (19:49 +0200)
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <abartlet@samba.org>
lib/param/loadparm.c
source3/param/loadparm.c

index f4ee64973cb7d8ae0be16c9dc7daeeda0db8c783..39cdae7b131e0e2db0dcf0a7eadbbcc7111de660 100644 (file)
@@ -327,10 +327,10 @@ const char *lpcfg_get_parametric(struct loadparm_context *lp_ctx,
 /**
  * convenience routine to return int parameters.
  */
-static int lp_int(const char *s)
+int lp_int(const char *s)
 {
 
-       if (!s) {
+       if (!s || !*s) {
                DEBUG(0,("lp_int(%s): is called with NULL!\n",s));
                return -1;
        }
index 554106e25b7267fc2ea71426334129e9da828c26..ff3ff92216d1931dfc1061adcdb5e94962331a22 100644 (file)
@@ -1252,20 +1252,6 @@ static struct parmlist_entry *get_parametrics(int snum, const char *type,
 #define MISSING_PARAMETER(name) \
     DEBUG(0, ("%s(): value is NULL or empty!\n", #name))
 
-/*******************************************************************
-convenience routine to return int parameters.
-********************************************************************/
-static int lp_int(const char *s)
-{
-
-       if (!s || !*s) {
-               MISSING_PARAMETER(lp_int);
-               return (-1);
-       }
-
-       return (int)strtol(s, NULL, 0);
-}
-
 /*******************************************************************
 convenience routine to return unsigned long parameters.
 ********************************************************************/