Changeset 77 for trunk/samba/source/iniparser/src/iniparser.c

Timestamp:

Sep 30, 2007, 3:42:50 AM (18 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0pre1

File:

• trunk/samba/source/iniparser/src/iniparser.c (modified) (4 diffs)

trunk/samba/source/iniparser/src/iniparser.c

@@ -5 +5 @@
    @author  N. Devillard
    @date    Mar 2000
-   @version $Revision: 2.14 $
+   @version $Revision: 2.17 $
    @brief   Parser for ini files.
 */
@@ -11 +11 @@
 
 /*
-    $Id: iniparser.c,v 2.14 2002/12/12 10:49:01 ndevilla Exp $
+    $Id: iniparser.c,v 2.17 2007-05-27 13:03:43 ndevilla Exp $
     $Author: ndevilla $
-    $Date: 2002/12/12 10:49:01 $
-    $Revision: 2.14 $
+    $Date: 2007-05-27 13:03:43 $
+    $Revision: 2.17 $
 */
 
@@ -281 +281 @@
   ini file is given as "section:key". If the key cannot be found,
   the notfound value is returned.
+
+  Supported values for integers include the usual C notation
+  so decimal, octal (starting with 0) and hexadecimal (starting with 0x)
+  are supported. Examples:
+
+  "42"      ->  42
+  "042"     ->  34 (octal -> decimal)
+  "0x42"    ->  66 (hexa  -> decimal)
+
+  Warning: the conversion may overflow in various ways. Conversion is
+  totally outsourced to strtol(), see the associated man page for overflow
+  handling.
+
+  Credits: Thanks to A. Becker for suggesting strtol()
  */
 /*--------------------------------------------------------------------------*/
@@ -289 +303 @@
     str = iniparser_getstring(d, key, INI_INVALID_KEY);
     if (str==INI_INVALID_KEY) return notfound ;
-    return atoi(str);
+    return (int)strtol(str, NULL, 0);
 }