Merge pull request #4279 from juliantaylor/symbol-cleanup

MAINT: hide symbols that shouldn't be exported

6 files changed, 53 insertions, 46 deletions

diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 1bfbf160d..015609ed2 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -3950,7 +3950,7 @@ datetime_dtype_metadata_clone(NpyAuxData *data)
  * Initializes the c_metadata field for the _builtin_descrs DATETIME
  * and TIMEDELTA.
  */
-int
+static int
 initialize_builtin_datetime_metadata(void)
 {
     PyArray_DatetimeDTypeMetaData *data1, *data2;
diff --git a/numpy/core/src/multiarray/dtype_transfer.c b/numpy/core/src/multiarray/dtype_transfer.c
index 3bd362c24..abc114978 100644
--- a/numpy/core/src/multiarray/dtype_transfer.c
+++ b/numpy/core/src/multiarray/dtype_transfer.c
@@ -151,7 +151,7 @@ typedef struct {
 } _strided_zero_pad_data;
 
 /* zero-padded data copy function */
-NpyAuxData *_strided_zero_pad_data_clone(NpyAuxData *data)
+static NpyAuxData *_strided_zero_pad_data_clone(NpyAuxData *data)
 {
     _strided_zero_pad_data *newdata =
             (_strided_zero_pad_data *)PyArray_malloc(
@@ -258,7 +258,7 @@ typedef struct {
 } _align_wrap_data;
 
 /* transfer data free function */
-void _align_wrap_data_free(NpyAuxData *data)
+static void _align_wrap_data_free(NpyAuxData *data)
 {
     _align_wrap_data *d = (_align_wrap_data *)data;
     NPY_AUXDATA_FREE(d->wrappeddata);
@@ -268,7 +268,7 @@ void _align_wrap_data_free(NpyAuxData *data)
 }
 
 /* transfer data copy function */
-NpyAuxData *_align_wrap_data_clone(NpyAuxData *data)
+static NpyAuxData *_align_wrap_data_clone(NpyAuxData *data)
 {
     _align_wrap_data *d = (_align_wrap_data *)data;
     _align_wrap_data *newdata;
@@ -485,7 +485,7 @@ typedef struct {
 } _wrap_copy_swap_data;
 
 /* wrap copy swap data free function */
-void _wrap_copy_swap_data_free(NpyAuxData *data)
+static void _wrap_copy_swap_data_free(NpyAuxData *data)
 {
     _wrap_copy_swap_data *d = (_wrap_copy_swap_data *)data;
     Py_DECREF(d->arr);
@@ -493,7 +493,7 @@ void _wrap_copy_swap_data_free(NpyAuxData *data)
 }
 
 /* wrap copy swap data copy function */
-NpyAuxData *_wrap_copy_swap_data_clone(NpyAuxData *data)
+static NpyAuxData *_wrap_copy_swap_data_clone(NpyAuxData *data)
 {
     _wrap_copy_swap_data *newdata =
         (_wrap_copy_swap_data *)PyArray_malloc(sizeof(_wrap_copy_swap_data));
@@ -572,7 +572,7 @@ typedef struct {
 } _strided_cast_data;
 
 /* strided cast data free function */
-void _strided_cast_data_free(NpyAuxData *data)
+static void _strided_cast_data_free(NpyAuxData *data)
 {
     _strided_cast_data *d = (_strided_cast_data *)data;
     Py_DECREF(d->aip);
@@ -581,7 +581,7 @@ void _strided_cast_data_free(NpyAuxData *data)
 }
 
 /* strided cast data copy function */
-NpyAuxData *_strided_cast_data_clone(NpyAuxData *data)
+static NpyAuxData *_strided_cast_data_clone(NpyAuxData *data)
 {
     _strided_cast_data *newdata =
             (_strided_cast_data *)PyArray_malloc(sizeof(_strided_cast_data));
@@ -716,7 +716,7 @@ typedef struct {
 } _strided_datetime_cast_data;
 
 /* strided datetime cast data free function */
-void _strided_datetime_cast_data_free(NpyAuxData *data)
+static void _strided_datetime_cast_data_free(NpyAuxData *data)
 {
     _strided_datetime_cast_data *d = (_strided_datetime_cast_data *)data;
     PyArray_free(d->tmp_buffer);
@@ -724,7 +724,7 @@ void _strided_datetime_cast_data_free(NpyAuxData *data)
 }
 
 /* strided datetime cast data copy function */
-NpyAuxData *_strided_datetime_cast_data_clone(NpyAuxData *data)
+static NpyAuxData *_strided_datetime_cast_data_clone(NpyAuxData *data)
 {
     _strided_datetime_cast_data *newdata =
             (_strided_datetime_cast_data *)PyArray_malloc(
@@ -1547,7 +1547,7 @@ typedef struct {
 } _one_to_n_data;
 
 /* transfer data free function */
-void _one_to_n_data_free(NpyAuxData *data)
+static void _one_to_n_data_free(NpyAuxData *data)
 {
     _one_to_n_data *d = (_one_to_n_data *)data;
     NPY_AUXDATA_FREE(d->data);
@@ -1556,7 +1556,7 @@ void _one_to_n_data_free(NpyAuxData *data)
 }
 
 /* transfer data copy function */
-NpyAuxData *_one_to_n_data_clone(NpyAuxData *data)
+static NpyAuxData *_one_to_n_data_clone(NpyAuxData *data)
 {
     _one_to_n_data *d = (_one_to_n_data *)data;
     _one_to_n_data *newdata;
@@ -1750,7 +1750,7 @@ typedef struct {
 } _n_to_n_data;
 
 /* transfer data free function */
-void _n_to_n_data_free(NpyAuxData *data)
+static void _n_to_n_data_free(NpyAuxData *data)
 {
     _n_to_n_data *d = (_n_to_n_data *)data;
     NPY_AUXDATA_FREE(d->data);
@@ -1758,7 +1758,7 @@ void _n_to_n_data_free(NpyAuxData *data)
 }
 
 /* transfer data copy function */
-NpyAuxData *_n_to_n_data_clone(NpyAuxData *data)
+static NpyAuxData *_n_to_n_data_clone(NpyAuxData *data)
 {
     _n_to_n_data *d = (_n_to_n_data *)data;
     _n_to_n_data *newdata;
@@ -1929,7 +1929,7 @@ typedef struct {
 } _subarray_broadcast_data;
 
 /* transfer data free function */
-void _subarray_broadcast_data_free(NpyAuxData *data)
+static void _subarray_broadcast_data_free(NpyAuxData *data)
 {
     _subarray_broadcast_data *d = (_subarray_broadcast_data *)data;
     NPY_AUXDATA_FREE(d->data);
@@ -1939,7 +1939,7 @@ void _subarray_broadcast_data_free(NpyAuxData *data)
 }
 
 /* transfer data copy function */
-NpyAuxData *_subarray_broadcast_data_clone( NpyAuxData *data)
+static NpyAuxData *_subarray_broadcast_data_clone( NpyAuxData *data)
 {
     _subarray_broadcast_data *d = (_subarray_broadcast_data *)data;
     _subarray_broadcast_data *newdata;
@@ -2381,7 +2381,7 @@ typedef struct {
 } _field_transfer_data;
 
 /* transfer data free function */
-void _field_transfer_data_free(NpyAuxData *data)
+static void _field_transfer_data_free(NpyAuxData *data)
 {
     _field_transfer_data *d = (_field_transfer_data *)data;
     npy_intp i, field_count;
@@ -2397,7 +2397,7 @@ void _field_transfer_data_free(NpyAuxData *data)
 }
 
 /* transfer data copy function */
-NpyAuxData *_field_transfer_data_clone(NpyAuxData *data)
+static NpyAuxData *_field_transfer_data_clone(NpyAuxData *data)
 {
     _field_transfer_data *d = (_field_transfer_data *)data;
     _field_transfer_data *newdata;
@@ -2997,7 +2997,7 @@ typedef struct {
 } _masked_wrapper_transfer_data;
 
 /* transfer data free function */
-void _masked_wrapper_transfer_data_free(NpyAuxData *data)
+static void _masked_wrapper_transfer_data_free(NpyAuxData *data)
 {
     _masked_wrapper_transfer_data *d = (_masked_wrapper_transfer_data *)data;
     NPY_AUXDATA_FREE(d->transferdata);
@@ -3006,7 +3006,7 @@ void _masked_wrapper_transfer_data_free(NpyAuxData *data)
 }
 
 /* transfer data copy function */
-NpyAuxData *_masked_wrapper_transfer_data_clone(NpyAuxData *data)
+static NpyAuxData *_masked_wrapper_transfer_data_clone(NpyAuxData *data)
 {
     _masked_wrapper_transfer_data *d = (_masked_wrapper_transfer_data *)data;
     _masked_wrapper_transfer_data *newdata;
@@ -3040,7 +3040,7 @@ NpyAuxData *_masked_wrapper_transfer_data_clone(NpyAuxData *data)
     return (NpyAuxData *)newdata;
 }
 
-void _strided_masked_wrapper_decsrcref_transfer_function(
+static void _strided_masked_wrapper_decsrcref_transfer_function(
                                     char *dst, npy_intp dst_stride,
                                     char *src, npy_intp src_stride,
                                     npy_bool *mask, npy_intp mask_stride,
@@ -3076,7 +3076,7 @@ void _strided_masked_wrapper_decsrcref_transfer_function(
     }
 }
 
-void _strided_masked_wrapper_transfer_function(
+static void _strided_masked_wrapper_transfer_function(
                                     char *dst, npy_intp dst_stride,
                                     char *src, npy_intp src_stride,
                                     npy_bool *mask, npy_intp mask_stride,
@@ -3168,7 +3168,7 @@ typedef struct {
 } _dst_memset_zero_data;
 
 /* zero-padded data copy function */
-NpyAuxData *_dst_memset_zero_data_clone(NpyAuxData *data)
+static NpyAuxData *_dst_memset_zero_data_clone(NpyAuxData *data)
 {
     _dst_memset_zero_data *newdata =
             (_dst_memset_zero_data *)PyArray_malloc(
diff --git a/numpy/core/src/multiarray/nditer_pywrap.c b/numpy/core/src/multiarray/nditer_pywrap.c
index a58c4362b..339a713cd 100644
--- a/numpy/core/src/multiarray/nditer_pywrap.c
+++ b/numpy/core/src/multiarray/nditer_pywrap.c
@@ -37,7 +37,7 @@ struct NewNpyArrayIterObject_tag {
     char writeflags[NPY_MAXARGS];
 };
 
-void npyiter_cache_values(NewNpyArrayIterObject *self)
+static void npyiter_cache_values(NewNpyArrayIterObject *self)
 {
     NpyIter *iter = self->iter;
 
diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c
index 41c670df4..3d1543e56 100644
--- a/numpy/core/src/multiarray/shape.c
+++ b/numpy/core/src/multiarray/shape.c
@@ -783,7 +783,7 @@ PyArray_Transpose(PyArrayObject *ap, PyArray_Dims *permute)
  * Sorts items so stride is descending, because C-order
  * is the default in the face of ambiguity.
  */
-int _npy_stride_sort_item_comparator(const void *a, const void *b)
+static int _npy_stride_sort_item_comparator(const void *a, const void *b)
 {
     npy_intp astride = ((const npy_stride_sort_item *)a)->stride,
             bstride = ((const npy_stride_sort_item *)b)->stride;
diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src
index 4b007f18d..6e3426606 100644
--- a/numpy/core/src/npymath/ieee754.c.src
+++ b/numpy/core/src/npymath/ieee754.c.src
@@ -28,12 +28,12 @@ double npy_copysign(double x, double y)
 #if !defined(HAVE_DECL_SIGNBIT)
 #include "_signbit.c"
 
-int _npy_signbit_f(float x)
+static int _npy_signbit_f(float x)
 {
     return _npy_signbit_d((double) x);
 }
 
-int _npy_signbit_ld(long double x)
+static int _npy_signbit_ld(long double x)
 {
     return _npy_signbit_d((double) x);
 }
@@ -46,7 +46,7 @@ int _npy_signbit_ld(long double x)
  * p >= 0, returnx x + nulp
  * p < 0, returnx x - nulp
  */
-double _next(double x, int p)
+static double _next(double x, int p)
 {
     volatile double t;
     npy_int32 hx, hy, ix;
@@ -92,7 +92,7 @@ double _next(double x, int p)
     return x;
 }
 
-float _nextf(float x, int p)
+static float _nextf(float x, int p)
 {
     volatile float t;
     npy_int32 hx, hy, ix;
@@ -178,7 +178,7 @@ do {								\
   (d) = qw_u.value;						\
 } while (0)
 
-npy_longdouble _nextl(npy_longdouble x, int p)
+static npy_longdouble _nextl(npy_longdouble x, int p)
 {
     npy_int64 hx,ihx,ilx;
     npy_uint64 lx;
@@ -256,7 +256,7 @@ npy_longdouble _nextl(npy_longdouble x, int p)
     }
 }
 #else
-npy_longdouble _nextl(npy_longdouble x, int p)
+static npy_longdouble _nextl(npy_longdouble x, int p)
 {
     volatile npy_longdouble t;
     union IEEEl2bitsrep ux;
diff --git a/numpy/core/src/private/npy_partition.h.src b/numpy/core/src/private/npy_partition.h.src
index c03ecb0de..fd79068f7 100644
--- a/numpy/core/src/private/npy_partition.h.src
+++ b/numpy/core/src/private/npy_partition.h.src
@@ -41,28 +41,35 @@
  *         npy_cdouble, npy_clongdouble#
  */
 
-int introselect_@suff@(@type@ *v, npy_intp num,
-                       npy_intp kth,
-                       npy_intp * pivots,
-                       npy_intp * npiv,
-                       void *NOT_USED);
-int aintroselect_@suff@(@type@ *v, npy_intp* tosort, npy_intp num,
-                        npy_intp kth,
-                        npy_intp * pivots,
-                        npy_intp * npiv,
-                        void *NOT_USED);
+NPY_VISIBILITY_HIDDEN int introselect_@suff@(@type@ *v, npy_intp num,
+                                             npy_intp kth,
+                                             npy_intp * pivots,
+                                             npy_intp * npiv,
+                                             void *NOT_USED);
+NPY_VISIBILITY_HIDDEN int aintroselect_@suff@(@type@ *v, npy_intp* tosort, npy_intp num,
+                                              npy_intp kth,
+                                              npy_intp * pivots,
+                                              npy_intp * npiv,
+                                              void *NOT_USED);
 
 
 /**end repeat**/
 
-int introselect_string(npy_char *vec, npy_intp cnt, npy_intp kth, PyArrayObject *arr);
-int aintroselect_string(npy_char *vec, npy_intp *ind, npy_intp cnt, npy_intp kth, void *null);
+NPY_VISIBILITY_HIDDEN int introselect_string(npy_char *vec, npy_intp cnt,
+                                             npy_intp kth, PyArrayObject *arr);
+NPY_VISIBILITY_HIDDEN int aintroselect_string(npy_char *vec, npy_intp *ind,
+                                              npy_intp cnt, npy_intp kth,
+                                              void *null);
 
 
-int introselect_unicode(npy_ucs4 *vec, npy_intp cnt, npy_intp kth, PyArrayObject *arr);
-int aintroselect_unicode(npy_ucs4 *vec, npy_intp *ind, npy_intp cnt, npy_intp kth, void *null);
+NPY_VISIBILITY_HIDDEN int introselect_unicode(npy_ucs4 *vec, npy_intp cnt,
+                                              npy_intp kth, PyArrayObject *arr);
+NPY_VISIBILITY_HIDDEN int aintroselect_unicode(npy_ucs4 *vec, npy_intp *ind,
+                                               npy_intp cnt, npy_intp kth,
+                                               void *null);
 
-int npy_introselect(void *base, size_t num, size_t size, size_t kth, npy_comparator cmp);
+NPY_VISIBILITY_HIDDEN int npy_introselect(void *base, size_t num, size_t size,
+                                          size_t kth, npy_comparator cmp);
 
 typedef struct {
     enum NPY_TYPES typenum;