Changeset 2892:aba43608e324 in roaraudio for libroar/config.c

Timestamp:

10/10/09 02:36:54 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corredted parsing function

File:

• libroar/config.c (modified) (2 diffs)

libroar/config.c

@@ -80 +80 @@
   return -1;
 
- codec_str = txt;
-
- option_str = strtok(txt, ":");
+ codec_str = strtok(txt, ":");
+
+ if ( codec_str == NULL )
+  return -1;
+
+ option_str = strtok(NULL, ":");
 
  if ( option_str == NULL )
   return -1;
 
- *option_str = 0;
-  option_str++;
-
- value_str = strtok(option_str, ":");
+ value_str = strtok(NULL, ":");
 
  if ( value_str == NULL )
   return -1;
-
- *value_str = 0;
-  value_str++;
 
  if ( (codec = roar_str2codec(codec_str)) == -1 ) {
@@ -120 +117 @@
  } else {
   ROAR_WARN("roar_libroar_config_parse_codec(*): Unknown codec option: %s", option_str);
- }
-
- return -1;
+  return -1;
+ }
+
+ return 0;
 }