Changeset 2884:ef7b43db1134 in roaraudio

Timestamp:

10/10/09 01:34:11 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved parsing of config to a seperate function

File:

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

libroar/config.c

@@ -53 +53 @@
  struct roar_libroar_config * config = roar_libroar_get_config_ptr();
  static int inited = 0;
- char * k, * v, * next;
+ char * next;
 
  if ( !inited ) {
   next = getenv("ROAR_OPTIONS");
 
-  while (next != NULL) {
-   k = next;
-   next = strstr(next, " ");
-   if ( next != NULL ) {
-    *next = 0;
-     next++;
-   }
-
-   if ( (v = strstr(k, ":")) != NULL ) {
-    *v = 0;
-     v++;
-   }
-
-   if ( !strcmp(k, "workaround") ) {
-    if ( !strcmp(v, "use-execed") ) {
-     config->workaround.workarounds |= ROAR_LIBROAR_CONFIG_WAS_USE_EXECED;
-    } else {
-     ROAR_WARN("roar_libroar_get_config(void): Unknown workaround option: %s", v);
-    }
-   } else if ( !strcmp(k, "warning") || !strcmp(k, "warn") ) {
-    if ( !strcmp(v, "sysio") ) {
-     config->warnings.sysio = ROAR_WARNING_ALWAYS;
-    } else {
-     ROAR_WARN("roar_libroar_get_config(void): Unknown warning option: %s", v);
-    }
-   } else {
-    ROAR_WARN("roar_libroar_get_config(void): Unknown option: %s", k);
-   }
+  if ( next != NULL ) {
+   roar_libroar_config_parse(next, " ");
   }
 
@@ -92 +66 @@
 
  return config;
+}
+
+int    roar_libroar_config_parse(char * txt, char * delm) {
+ struct roar_libroar_config * config = roar_libroar_get_config_ptr();
+ char * k, * v, * next = txt;
+
+ while (next != NULL) {
+  k = next;
+  next = strstr(next, delm);
+  if ( next != NULL ) {
+   *next = 0;
+    next++;
+  }
+
+  if ( (v = strstr(k, ":")) != NULL ) {
+   *v = 0;
+    v++;
+  }
+
+  if ( !strcmp(k, "workaround") ) {
+   if ( !strcmp(v, "use-execed") ) {
+    config->workaround.workarounds |= ROAR_LIBROAR_CONFIG_WAS_USE_EXECED;
+   } else {
+    ROAR_WARN("roar_libroar_get_config(void): Unknown workaround option: %s", v);
+   }
+  } else if ( !strcmp(k, "warning") || !strcmp(k, "warn") ) {
+   if ( !strcmp(v, "sysio") ) {
+    config->warnings.sysio = ROAR_WARNING_ALWAYS;
+   } else {
+    ROAR_WARN("roar_libroar_get_config(void): Unknown warning option: %s", v);
+   }
+  } else {
+   ROAR_WARN("roar_libroar_get_config(void): Unknown option: %s", k);
+  }
+ }
+
+ return 0;
 }