namespace static string sentinel macros

Author: ngoldbaum

stringdtype/stringdtype/src/casts.c

@@ -525,7 +525,7 @@ string_to_pylong(char *in, int hasnull)
                             "integers");
             return NULL;
         }
-        s = &EMPTY_STRING;
+        s = &NPY_EMPTY_STRING;
     }
     PyObject *val_obj =
             PyUnicode_FromStringAndSize(npy_string_buf(s), npy_string_size(s));
@@ -778,7 +778,7 @@ string_to_pyfloat(char *in, int hasnull)
                             "integers");
             return NULL;
         }
-        s = &EMPTY_STRING;
+        s = &NPY_EMPTY_STRING;
     }
     PyObject *val_obj =
             PyUnicode_FromStringAndSize(npy_string_buf(s), npy_string_size(s));

stringdtype/stringdtype/src/dtype.c

@@ -20,18 +20,18 @@ new_stringdtype_instance(PyObject *na_object, int coerce)
 
     Py_XINCREF(na_object);
     ((StringDTypeObject *)new)->na_object = na_object;
-    npy_static_string na_name = NULL_STRING;
+    npy_static_string na_name = NPY_NULL_STRING;
     int hasnull = na_object != NULL;
     int has_nan_na = 0;
     int has_string_na = 0;
-    npy_static_string default_string = EMPTY_STRING;
+    npy_static_string default_string = NPY_EMPTY_STRING;
     if (hasnull) {
         // first check for a string
         if (PyUnicode_Check(na_object)) {
             has_string_na = 1;
             Py_ssize_t size = 0;
             const char *buf = PyUnicode_AsUTF8AndSize(na_object, &size);
-            default_string = NULL_STRING;
+            default_string = NPY_NULL_STRING;
             int res = npy_string_newsize(buf, (size_t)size, &default_string);
             if (res == -1) {
                 PyErr_NoMemory();

stringdtype/stringdtype/src/static_string.c

@@ -2,11 +2,11 @@
 
 #include "static_string.h"
 
-// defined this way so EMPTY_STRING has an in-memory representation that is
-// distinct from a zero-filled struct, allowing us to use a NULL_STRING
+// defined this way so NPY_EMPTY_STRING has an in-memory representation that is
+// distinct from a zero-filled struct, allowing us to use a NPY_NULL_STRING
 // to represent a sentinel value
-const npy_static_string EMPTY_STRING = {0, "\0"};
-const npy_static_string NULL_STRING = {0, NULL};
+const npy_static_string NPY_EMPTY_STRING = {0, "\0"};
+const npy_static_string NPY_NULL_STRING = {0, NULL};
 
 int
 npy_string_newsize(const char *init, size_t size, npy_static_string *to_init)
@@ -17,7 +17,7 @@ npy_string_newsize(const char *init, size_t size, npy_static_string *to_init)
     }
 
     if (size == 0) {
-        *to_init = EMPTY_STRING;
+        *to_init = NPY_EMPTY_STRING;
         return 0;
     }
 
@@ -39,7 +39,7 @@ npy_string_newsize(const char *init, size_t size, npy_static_string *to_init)
 void
 npy_string_free(npy_static_string *str)
 {
-    if (str->buf != NULL && str->buf != EMPTY_STRING.buf) {
+    if (str->buf != NULL && str->buf != NPY_EMPTY_STRING.buf) {
         PyMem_RawFree(str->buf);
         str->buf = NULL;
     }
@@ -69,7 +69,7 @@ npy_string_newemptysize(size_t size, npy_static_string *out)
     out->size = size;
 
     if (size == 0) {
-        *out = EMPTY_STRING;
+        *out = NPY_EMPTY_STRING;
         return 0;
     }
 

stringdtype/stringdtype/src/static_string.h

@@ -11,11 +11,11 @@ typedef struct npy_static_string {
 
 // represents the empty string and can be passed safely to npy_static_string
 // API functions
-extern const npy_static_string EMPTY_STRING;
+extern const npy_static_string NPY_EMPTY_STRING;
 // represents a sentinel value, *CANNOT* be passed safely to npy_static_string
 // API functions, use npy_string_isnull to check if a value is null before
 // working with it.
-extern const npy_static_string NULL_STRING;
+extern const npy_static_string NPY_NULL_STRING;
 
 // Allocates a new buffer for *to_init*, which must be set to NULL before
 // calling this function, filling the newly allocated buffer with the copied