Changeset 5532 for pjproject/branches/projects/uwp/pjlib/src/pj/os_info.c

Timestamp:

Jan 18, 2017 10:55:35 AM (7 years ago)

Author:

nanang

Message:

Re #1900: Merged changes from trunk.

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjlib/src/pj/os_info.c (modified) (2 diffs)

pjproject/branches/projects/uwp/pjlib/src/pj/os_info.c

@@ -99 +99 @@
 
 static pj_uint32_t parse_version(char *str)
-{
-    char *tok;
-    int i, maxtok;
+{    
+    int i, maxtok, found_idx;
     pj_uint32_t version = 0;
+    pj_str_t in_str = pj_str(str);
+    pj_str_t token, delim;
     
     while (*str && !pj_isdigit(*str))
@@ -108 +109 @@
 
     maxtok = 4;
-    for (tok = strtok(str, ".-"), i=0; tok && i<maxtok;
-         ++i, tok=strtok(NULL, ".-"))
+    delim = pj_str(".-");
+    for (found_idx = pj_strtok(&in_str, &delim, &token, 0), i=0; 
+         found_idx != in_str.slen && i < maxtok;
+         ++i, found_idx = pj_strtok(&in_str, &delim, &token, 
+                                    found_idx + token.slen))
     {
         int n;
 
-        if (!pj_isdigit(*tok))
-            break;
-        
-        n = atoi(tok);
+        if (!pj_isdigit(*token.ptr))
+            break;
+        
+        n = atoi(token.ptr);
         version |= (n << ((3-i)*8));
     }