Changeset 5266

Timestamp:

May 2, 2008, 11:30:37 AM (17 years ago)

Author:

jack

Message:

added xstrdup

Location:

anuga_work/development/anugavis/src

Files:

• xmalloc.c (modified) (1 diff)
• xmalloc.h (modified) (1 diff)

anuga_work/development/anugavis/src/xmalloc.c

@@ -6 +6 @@
 #  include <stdlib.h>
 #endif
+#ifdef HAVE_STRING_H
+#  include <string.h>
+#endif
 #include "error.h"
 #include "xmalloc.h"
 
-void *xmalloc(size_t size, const char *func){
+void *xmalloc(size_t size, const char *message){
   void *mem;
   if((mem = malloc(size)) == NULL)
-    AnugaVis_SetError("Failed to malloc %d bytes in %s", size, func);
+    AnugaVis_SetError("%s: Failed to malloc %d bytes", message, size);
   return mem;
 }
+
+#ifndef HAVE_STRDUP
+char *strdup(const char *s){
+  char *str;
+  if((str = malloc(strlen(s) + 1)) != NULL)
+    strcpy(str, s);
+  return str;
+}
+#endif
+
+char *xstrdup(const char *s, const char *message){
+  char *str;
+  if((str = strdup(s)) == NULL)
+    AnugaVis_SetError("%s: Failed to strdup \"%s\"", message, s);
+  return str;
+}

anuga_work/development/anugavis/src/xmalloc.h

@@ -2 +2 @@
 #define XMALLOC_H
 
-/* Attempt a malloc. If it fails, set an error message and return NULL.
+/* For a given func, xfunc behaves like func but sets an error message
+ * using AnugaVis_SetError().
  */
-extern void *xmalloc(size_t size, const char *func);
+extern void *xmalloc(size_t size, const char *message);
+extern char *xstrdup(const char *s, const char *message);
 
 #endif