Changeset 5661:efd1ca5963ee in roaraudio for libroar/plugincontainer.c

Timestamp:

09/22/12 22:30:52 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Improved kv API: added roar_keyval_copy()

File:

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

libroar/plugincontainer.c

@@ -87 +87 @@
 }
 
-static inline void _copy_str(char ** dst, const char * src) {
- for (; *src; src++, (*dst)++) **dst = *src;
- *((*dst)++) = 0;
-}
-
-static void * _copy_kv(struct roar_keyval ** copy, struct roar_keyval * src, size_t len) {
- size_t buflen = 0;
- size_t i;
- void * ret;
- char * p;
- struct roar_keyval * c;
-
- for (i = 0; i < len; i++) {
-  if ( src[i].key != NULL )
-   buflen += roar_mm_strlen(src[i].key) + 1;
-  if ( src[i].value != NULL )
-   buflen += roar_mm_strlen(src[i].value) + 1;
- }
-
- c   = roar_mm_malloc(len * sizeof(struct roar_keyval));
- if ( c == NULL )
-  return NULL;
-
- memset(c, 0, len * sizeof(struct roar_keyval));
-
- ret = roar_mm_malloc(buflen);
- if ( ret == NULL )
-  return NULL;
-
- memset(ret, 0, buflen);
-
- p = ret;
-
- for (i = 0; i < len; i++) {
-  if ( src[i].key == NULL ) {
-   c[i].key = NULL;
-  } else {
-   c[i].key = p;
-   _copy_str(&p, src[i].key);
-  }
-
-  if ( src[i].value == NULL ) {
-   c[i].value = NULL;
-  } else {
-   c[i].value = p;
-   _copy_str(&p, src[i].value);
-  }
- }
-
- *copy = c;
- return ret;
-}
-
 static struct roar_dl_librarypara * _copy_para(struct roar_dl_librarypara * para, struct roar_plugincontainer * cont) {
  struct roar_dl_librarypara * ret = NULL;
@@ -153 +100 @@
  if ( para->argc && para->argv != NULL ) {
   ret->argc       = para->argc;
-  ret->args_store = _copy_kv(&(ret->argv), para->argv, para->argc);
+  ret->args_store = roar_keyval_copy(&(ret->argv), para->argv, para->argc);
   if ( ret->args_store == NULL ) {
    err = roar_error;