Changeset 30 for trunk/samba/source/param/loadparm.c

Timestamp:

Apr 25, 2007, 11:44:55 AM (18 years ago)

Author:

Paul Smedley

Message:

Code updated to Samba 3.0.25rc2 level

File:

• trunk/samba/source/param/loadparm.c (modified) (3 diffs)

trunk/samba/source/param/loadparm.c

@@ -2238 +2238 @@
         }
 
-        return atoi(s); 
+        return (int)strtol(s, NULL, 0);
 }
 
@@ -2252 +2252 @@
         }
 
-        return strtoul(s, NULL, 10);
+        return strtoul(s, NULL, 0);
 }
 
@@ -5302 +5302 @@
 ********************************************************************/
 
-char *volume_label(int snum)
-{
-        char *ret = lp_volume(snum);
-        if (!*ret)
-                return lp_servicename(snum);
-        return (ret);
-}
-
+const char *volume_label(int snum)
+{
+        char *ret;
+        const char *label = lp_volume(snum);
+        if (!*label) {
+                label = lp_servicename(snum);
+        }
+                
+        /* This returns a 33 byte guarenteed null terminated string. */
+        ret = talloc_strndup(main_loop_talloc_get(), label, 32);
+        if (!ret) {
+                return "";
+        }               
+        return ret;
+}
 
 /*******************************************************************