EXODUS: A better way to get strdup

sandialabs · May 15, 2024 · 74f2fe4 · 74f2fe4
1 parent f8178bd
commit 74f2fe4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/packages/seacas/libraries/exodus/src/ex_field_utils.c b/packages/seacas/libraries/exodus/src/ex_field_utils.c
@@ -10,22 +10,11 @@
 #include "exodusII_int.h" // for EX_FATAL, etc
 #include <assert.h>
 #include <math.h>
+#define _GNU_SOURCE
 #include <string.h>
 
 #define SIZE(X) sizeof(X) / sizeof(X[0])
 
-char *my_strdup(const char *s)
-{
-  size_t slen   = strlen(s);
-  char  *result = malloc(slen + 1);
-  if (result == NULL) {
-    return NULL;
-  }
-
-  memcpy(result, s, slen + 1);
-  return result;
-}
-
 char *my_strsep(char **stringp, const char *delim)
 {
   char *rv = *stringp;
@@ -315,7 +304,7 @@ const char *ex_field_component_suffix(ex_field *field, int nest_level, int compo
   case EX_FIELD_TYPE_USER_DEFINED: {
     if (field->suffices[0] != '\0') {
       // `user_suffices` is a comma-separated string.  Assume component is valid.
-      char *string = my_strdup(field->suffices);
+      char *string = strdup(field->suffices);
       char *tofree = string;
       char *token  = my_strsep(&string, ",");
       for (int i = 0; i < component - 1; i++) {

diff --git a/packages/seacas/libraries/exodus/test/testrd-field-metadata.c b/packages/seacas/libraries/exodus/test/testrd-field-metadata.c
@@ -9,6 +9,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#define _GNU_SOURCE
 #include <string.h>
 
 #define STRINGIFY(x) #x