string2* functions take a const pointer

diff --git a/src/util.c b/src/util.c
index f5a23af2aeacd50a31c906223b0355edb7379ef9..f7437e1c260601486713d473bf4f88502fe4a435 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -209,8 +209,8 @@ int ll2string(char *s, size_t len, long long value) {
 /* Convert a string into a long long. Returns 1 if the string could be parsed
  * into a (non-overflowing) long long, 0 otherwise. The value will be set to
  * the parsed value when appropriate. */
 /* Convert a string into a long long. Returns 1 if the string could be parsed
  * into a (non-overflowing) long long, 0 otherwise. The value will be set to
  * the parsed value when appropriate. */

-int string2ll(char *s, size_t slen, long long *value) {
-    char *p = s;
+int string2ll(const char *s, size_t slen, long long *value) {
+    const char *p = s;

     size_t plen = 0;
     int negative = 0;
     unsigned long long v;
     size_t plen = 0;
     int negative = 0;
     unsigned long long v;


@@ -275,7 +275,7 @@ int string2ll(char *s, size_t slen, long long *value) {
 /* Convert a string into a long. Returns 1 if the string could be parsed into a
  * (non-overflowing) long, 0 otherwise. The value will be set to the parsed
  * value when appropriate. */
 /* Convert a string into a long. Returns 1 if the string could be parsed into a
  * (non-overflowing) long, 0 otherwise. The value will be set to the parsed
  * value when appropriate. */

-int string2l(char *s, size_t slen, long *lval) {
+int string2l(const char *s, size_t slen, long *lval) {

     long long llval;
 
     if (!string2ll(s,slen,&llval))
     long long llval;
 
     if (!string2ll(s,slen,&llval))

diff --git a/src/util.h b/src/util.h
index b897a89e7ef4b8e88f01562e0a78879038401e64..59dd10ac7baaa3cc55250a3c29211cd0c75a6136 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -5,8 +5,8 @@ int stringmatchlen(const char *p, int plen, const char *s, int slen, int nocase)
 int stringmatch(const char *p, const char *s, int nocase);
 long long memtoll(const char *p, int *err);
 int ll2string(char *s, size_t len, long long value);
 int stringmatch(const char *p, const char *s, int nocase);
 long long memtoll(const char *p, int *err);
 int ll2string(char *s, size_t len, long long value);

-int string2ll(char *s, size_t slen, long long *value);
-int string2l(char *s, size_t slen, long *value);
+int string2ll(const char *s, size_t slen, long long *value);
+int string2l(const char *s, size_t slen, long *value);

 int d2string(char *buf, size_t len, double value);
 
 #endif
 int d2string(char *buf, size_t len, double value);
 
 #endif