Changeset 2129

Timestamp:

04/15/08 10:29:48 (1 month ago)

Author:

karpet

Message:

use our string_to_int instead of strtol() directly

Files:

• libswish3/trunk/src/libswish3/header.c (modified) (1 diff)
• libswish3/trunk/src/libswish3/parser.c (modified) (5 diffs)
• libswish3/trunk/src/libswish3/swish.c (modified) (1 diff)
• libswish3/trunk/src/swish_header.c (modified) (1 diff)
• libswish3/trunk/src/swish_isw.c (modified) (2 diffs)
• libswish3/trunk/src/swish_lint.c (modified) (1 diff)
• libswish3/trunk/src/xapian/swish_xapian.cpp (modified) (2 diffs)

libswish3/trunk/src/libswish3/header.c

@@ -373 +373 @@
-    
-    if (xmlStrEqual(attr, (xmlChar *)"ignore_case")) {
-trtol((char *)attr_val, (char **)NULL, 10
+wish_string_to_int((char *)attr_val
-    }
-    else if (xmlStrEqual(attr, (xmlChar *)"max")) {
-(int)strtol((char *)attr_val, (char **)NULL, 10
+swish_string_to_int((char *)attr_val
-    }
-    else if (xmlStrEqual(attr, (xmlChar *)"verbatim")) {
-trtol((char *)attr_val, (char **)NULL, 10
+wish_string_to_int((char *)attr_val
-    }
-    else if (xmlStrEqual(attr, (xmlChar *)"sort")) {
-trtol((char *)attr_val, (char **)NULL, 10
+wish_string_to_int((char *)attr_val
-    }
-    else if (xmlStrEqual(attr, (xmlChar *)"id")) {

libswish3/trunk/src/libswish3/parser.c

@@ -1302 +1302 @@
-                SWISH_WARN("Failed to parse Content-Length header '%s'", line);
-
-trtol((char *)val, NULL, 10
+wish_string_to_int((char *)val
-            continue;
-        }
@@ -1310 +1310 @@
-                SWISH_WARN("Failed to parse Last-Modified header '%s'", line);
-
-trtol((char *)val, NULL, 10
+wish_string_to_int((char *)val
-            continue;
-        }
@@ -1320 +1320 @@
-                SWISH_WARN("Failed to parse Last-Mtime header '%s'", line);
-
-trtol((char *)val, NULL, 10
+wish_string_to_int((char *)val
-            continue;
-        }
@@ -1464 +1464 @@
-
-    setenv("SWISH_PARSER_ERROR", "0", 0);
-(int)strtol(getenv("SWISH_PARSER_ERROR"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_PARSER_ERROR")
-
-    setenv("SWISH_PARSER_WARNING", "0", 0);
-(int)strtol(getenv("SWISH_PARSER_WARNING"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_PARSER_WARNING")
-
-    setenv("SWISH_PARSER_FATAL", "0", 0);
-(int)strtol(getenv("SWISH_PARSER_FATAL"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_PARSER_FATAL")
-
-    if (SWISH_DEBUG) {
@@ -1479 +1479 @@
-}
-
-/* 
- * TODO there's a memory leak somewhere in here. one more malloc than free 
- */
-int
-swish_parse_fh(

libswish3/trunk/src/libswish3/swish.c

@@ -96 +96 @@
-    if (!SWISH_DEBUG) {
-
-(int)strtol(getenv("SWISH_DEBUG"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_DEBUG")
-
-/* additional env vars just increase the global var value */
-
-(int)strtol(getenv("SWISH_DEBUG_MEMORY"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_DEBUG_MEMORY")
-            SWISH_DEBUG += SWISH_DEBUG_MEMORY;
-        }
-(int)strtol(getenv("SWISH_DEBUG_CONFIG"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_DEBUG_CONFIG")
-            SWISH_DEBUG += SWISH_DEBUG_CONFIG;
-        }
-(int)strtol(getenv("SWISH_DEBUG_DOCINFO"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_DEBUG_DOCINFO")
-            SWISH_DEBUG += SWISH_DEBUG_DOCINFO;
-        }
-(int)strtol(getenv("SWISH_DEBUG_WORDLIST"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_DEBUG_WORDLIST")
-            SWISH_DEBUG += SWISH_DEBUG_WORDLIST;
-        }
-(int)strtol(getenv("SWISH_DEBUG_PARSER"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_DEBUG_PARSER")
-            SWISH_DEBUG += SWISH_DEBUG_PARSER;
-        }
-(int)strtol(getenv("SWISH_DEBUG_NAMEDBUFFER"), (char **)NULL, 10
+swish_string_to_int(getenv("SWISH_DEBUG_NAMEDBUFFER")
-            SWISH_DEBUG += SWISH_DEBUG_NAMEDBUFFER;
-        }

libswish3/trunk/src/swish_header.c

@@ -86 +86 @@
-                err(1, "-d option requires a positive integer as argument\n");
-
-(int) strtol(optarg, (char **) NULL, 10
+swish_string_to_int(optarg
-            break;
-

libswish3/trunk/src/swish_isw.c

@@ -34 +34 @@
-#include <ctype.h>
-#include <locale.h>
+
+#include "libswish3.h"
-
-void report(
@@ -76 +78 @@
-            err(1, "arg %s is not a positive integer\n", argv[i]);
-
-(int)strtol(argv[i], (char **)NULL, 10
+swish_string_to_int(argv[i]
-
-        report(curlocale, n);

libswish3/trunk/src/swish_lint.c

@@ -181 +181 @@
-                err(1, "-d option requires a positive integer as argument\n");
-
-(int)strtol(optarg, (char **)NULL, 10
+swish_string_to_int(optarg
-            break;
-

libswish3/trunk/src/xapian/swish_xapian.cpp

@@ -622 +622 @@
-                err(1, "-d option requires a positive integer as argument\n");
-
-(int)strtol(optarg, (char **)NULL, 10
+swish_string_to_int(optarg
-            break;
-
@@ -634 +634 @@
-
-        case 's':
-(int)strtol(optarg, (char **)NULL, 10
+swish_string_to_int(optarg
-            break;
-