Changeset 3210 for pjproject

Timestamp:

Jun 18, 2010 3:37:28 PM (14 years ago)

Author:

ming

Message:

Implemented ticket #1099: Conversion of pj_str_t to signed long

Location:

pjproject/branches/projects/cli/pjlib

Files:

• include/pj/string.h (modified) (1 diff)
• src/pj/string.c (modified) (2 diffs)

pjproject/branches/projects/cli/pjlib/include/pj/string.h

@@ -537 +537 @@
 
 /**
+ * Convert string to signed integer. The conversion will stop as
+ * soon as non-digit character is found or all the characters have
+ * been processed.
+ *
+ * @param str   the string.
+ *
+ * @return the integer.
+ */
+PJ_DECL(long) pj_strtol(const pj_str_t *str);
+
+/**
  * Convert string to unsigned integer. The conversion will stop as
  * soon as non-digit character is found or all the characters have

pjproject/branches/projects/cli/pjlib/src/pj/string.c

@@ -70 +70 @@
 PJ_DEF(pj_str_t*) pj_strltrim( pj_str_t *str )
 {
-    char *end = str->ptr + str->slen;
     register char *p = str->ptr;
-    while (p < end && pj_isspace(*p))
+    while (pj_isspace(*p))
         ++p;
     str->slen -= (p - str->ptr);
@@ -110 +109 @@
 }
 
+PJ_DEF(long) pj_strtol(const pj_str_t *str)
+{
+    PJ_CHECK_STACK();
+
+    if (str->slen > 0 && (str->ptr[0] == '+' || str->ptr[0] == '-')) {
+        pj_str_t s;
+        
+        s.ptr = str->ptr + 1;
+        s.slen = str->slen - 1;
+        return (str->ptr[0] == '-'? -(long)pj_strtoul(&s) : pj_strtoul(&s));
+    } else
+        return pj_strtoul(str);
+}
 
 PJ_DEF(unsigned long) pj_strtoul(const pj_str_t *str)