Changeset 5755:d61e5f9b4111 in roaraudio

Timestamp:

11/16/12 16:54:46 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_mm_strdup2()

Files:

• include/libroar/memmgr.h (modified) (1 diff)
• include/libroar/roarfeatures.h (modified) (1 diff)
• libroar/memmgr.c (modified) (1 diff)

include/libroar/memmgr.h

@@ -130 +130 @@
 #endif
 
+char * roar_mm_strdup2(const char *s, const char *def);
+
 #if defined(ROAR_USE_MEMMGR) || !defined(ROAR_HAVE_STRNDUP)
 char *roar_mm_strndup(const char *s, size_t n);

include/libroar/roarfeatures.h

@@ -53 +53 @@
 #define ROAR_FT_FUNC_CTL_C2M2
 #define ROAR_FT_FUNC_CTL_M2C2
+#define ROAR_FT_FUNC_MM_STRDUP2
 #define ROAR_FT_FEATURE_VS
 #define ROAR_FT_FEATURE_VS_FILE

libroar/memmgr.c

@@ -271 +271 @@
 #endif
 
+char * roar_mm_strdup2(const char *s, const char *def) {
+ if ( s == NULL )
+  s = def;
+ if ( s == NULL ) {
+  roar_err_clear();
+  return NULL;
+ }
+
+ return roar_mm_strdup(s);
+}
+
 #ifndef ROAR_HAVE_STRLEN
 ssize_t roar_mm_strlen(const char *s) {