Changeset 5009:9222d9f53791 in roaraudio for roarclients

Timestamp:

05/26/11 08:52:43 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use internal copy of strtok_r()

File:

• roarclients/roarmonhttp.c (modified) (3 diffs)

roarclients/roarmonhttp.c

@@ -232 +232 @@
  int    i;
  char * c, * k, * v;
-#ifdef ROAR_HAVE_STRTOK_R
  char * sp0 = NULL, * sp1 = NULL;
-#endif
  int dir = ROAR_DIR_MONITOR;
  int gopher = 0;
@@ -280 +278 @@
   c = "";
 
-#ifdef ROAR_HAVE_STRTOK_R
- c = strtok_r(c, "&", &sp0);
-#else
- c = strtok(c, "&");
-#endif
+ c = roar_mm_strtok_r(c, "&", &sp0);
 
  while (c != NULL) {
-#ifdef ROAR_HAVE_STRTOK_R
-  k = strtok_r(c,    "=", &sp1);
-  v = strtok_r(NULL, "=", &sp1);
-#else
-  k = c;
-  if ( (v = strstr(c, "=")) != NULL ) {
-   *v = 0;
-   v++;
-  }
-#endif
+  k = roar_mm_strtok_r(c,    "=", &sp1);
+  v = roar_mm_strtok_r(NULL, "=", &sp1);
 
   if ( !strcmp(k, "codec") ) {
@@ -326 +312 @@
   }
 
-#ifdef ROAR_HAVE_STRTOK_R
-  c = strtok_r(NULL, "&", &sp0);
-#else
-  c = strtok(NULL, "&");
-#endif
+  c = roar_mm_strtok_r(NULL, "&", &sp0);
  }