Cleanup: use 'uint' for BLI_array

2 files changed, 40 insertions, 46 deletions

diff --git a/source/blender/blenlib/BLI_array_utils.h b/source/blender/blenlib/BLI_array_utils.h
index dc85d619e91..52d41173a0e 100644
--- a/source/blender/blenlib/BLI_array_utils.h
+++ b/source/blender/blenlib/BLI_array_utils.h
@@ -28,56 +28,53 @@
 extern "C" {
 #endif
 
-void _bli_array_reverse(void *arr, unsigned int arr_len, size_t arr_stride);
+void _bli_array_reverse(void *arr, uint arr_len, size_t arr_stride);
 #define BLI_array_reverse(arr, arr_len) _bli_array_reverse(arr, arr_len, sizeof(*(arr)))
 
-void _bli_array_wrap(void *arr, unsigned int arr_len, size_t arr_stride, int dir);
+void _bli_array_wrap(void *arr, uint arr_len, size_t arr_stride, int dir);
 #define BLI_array_wrap(arr, arr_len, dir) _bli_array_wrap(arr, arr_len, sizeof(*(arr)), dir)
 
-void _bli_array_permute(void *arr,
-                        const unsigned int arr_len,
-                        const size_t arr_stride,
-                        const unsigned int *order,
-                        void *arr_temp);
+void _bli_array_permute(
+    void *arr, const uint arr_len, const size_t arr_stride, const uint *order, void *arr_temp);
 #define BLI_array_permute(arr, arr_len, order) \
   _bli_array_permute(arr, arr_len, sizeof(*(arr)), order, NULL)
 #define BLI_array_permute_ex(arr, arr_len, order, arr_temp) \
   _bli_array_permute(arr, arr_len, sizeof(*(arr)), order, arr_temp)
 
-unsigned int _bli_array_deduplicate_ordered(void *arr, unsigned int arr_len, size_t arr_stride);
+uint _bli_array_deduplicate_ordered(void *arr, uint arr_len, size_t arr_stride);
 #define BLI_array_deduplicate_ordered(arr, arr_len) \
   _bli_array_deduplicate_ordered(arr, arr_len, sizeof(*(arr)))
 
-int _bli_array_findindex(const void *arr, unsigned int arr_len, size_t arr_stride, const void *p);
+int _bli_array_findindex(const void *arr, uint arr_len, size_t arr_stride, const void *p);
 #define BLI_array_findindex(arr, arr_len, p) _bli_array_findindex(arr, arr_len, sizeof(*(arr)), p)
 
-int _bli_array_rfindindex(const void *arr, unsigned int arr_len, size_t arr_stride, const void *p);
+int _bli_array_rfindindex(const void *arr, uint arr_len, size_t arr_stride, const void *p);
 #define BLI_array_rfindindex(arr, arr_len, p) \
   _bli_array_rfindindex(arr, arr_len, sizeof(*(arr)), p)
 
 void _bli_array_binary_and(
-    void *arr, const void *arr_a, const void *arr_b, unsigned int arr_len, size_t arr_stride);
+    void *arr, const void *arr_a, const void *arr_b, uint arr_len, size_t arr_stride);
 #define BLI_array_binary_and(arr, arr_a, arr_b, arr_len) \
   (CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_a)), \
    CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_b)), \
    _bli_array_binary_and(arr, arr_a, arr_b, arr_len, sizeof(*(arr))))
 
 void _bli_array_binary_or(
-    void *arr, const void *arr_a, const void *arr_b, unsigned int arr_len, size_t arr_stride);
+    void *arr, const void *arr_a, const void *arr_b, uint arr_len, size_t arr_stride);
 #define BLI_array_binary_or(arr, arr_a, arr_b, arr_len) \
   (CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_a)), \
    CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_b)), \
    _bli_array_binary_or(arr, arr_a, arr_b, arr_len, sizeof(*(arr))))
 
 bool _bli_array_iter_span(const void *arr,
-                          unsigned int arr_len,
+                          uint arr_len,
                           size_t arr_stride,
                           bool use_wrap,
                           bool use_delimit_bounds,
                           bool (*test_fn)(const void *arr_item, void *user_data),
                           void *user_data,
-                          unsigned int span_step[2],
-                          unsigned int *r_span_len);
+                          uint span_step[2],
+                          uint *r_span_len);
 #define BLI_array_iter_span( \
     arr, arr_len, use_wrap, use_delimit_bounds, test_fn, user_data, span_step, r_span_len) \
   _bli_array_iter_span(arr, \
@@ -90,7 +87,7 @@ bool _bli_array_iter_span(const void *arr,
                        span_step, \
                        r_span_len)
 
-bool _bli_array_is_zeroed(const void *arr, unsigned int arr_len, size_t arr_stride);
+bool _bli_array_is_zeroed(const void *arr, uint arr_len, size_t arr_stride);
 #define BLI_array_is_zeroed(arr, arr_len) _bli_array_is_zeroed(arr, arr_len, sizeof(*(arr)))
 
 bool _bli_array_iter_spiral_square(const void *arr_v,
diff --git a/source/blender/blenlib/intern/array_utils.c b/source/blender/blenlib/intern/array_utils.c
index 085f51ac451..9a12a7442b7 100644
--- a/source/blender/blenlib/intern/array_utils.c
+++ b/source/blender/blenlib/intern/array_utils.c
@@ -40,11 +40,11 @@
  *
  * Access via #BLI_array_reverse
  */
-void _bli_array_reverse(void *arr_v, unsigned int arr_len, size_t arr_stride)
+void _bli_array_reverse(void *arr_v, uint arr_len, size_t arr_stride)
 {
-  const unsigned int arr_stride_uint = (unsigned int)arr_stride;
-  const unsigned int arr_half_stride = (arr_len / 2) * arr_stride_uint;
-  unsigned int i, i_end;
+  const uint arr_stride_uint = (uint)arr_stride;
+  const uint arr_half_stride = (arr_len / 2) * arr_stride_uint;
+  uint i, i_end;
   char *arr = arr_v;
   char *buf = BLI_array_alloca(buf, arr_stride);
 
@@ -62,7 +62,7 @@ void _bli_array_reverse(void *arr_v, unsigned int arr_len, size_t arr_stride)
  *
  * Access via #BLI_array_wrap
  */
-void _bli_array_wrap(void *arr_v, unsigned int arr_len, size_t arr_stride, int dir)
+void _bli_array_wrap(void *arr_v, uint arr_len, size_t arr_stride, int dir)
 {
   char *arr = arr_v;
   char *buf = BLI_array_alloca(buf, arr_stride);
@@ -88,16 +88,13 @@ void _bli_array_wrap(void *arr_v, unsigned int arr_len, size_t arr_stride, int d
  *
  * Access via #BLI_array_wrap
  */
-void _bli_array_permute(void *arr,
-                        const unsigned int arr_len,
-                        const size_t arr_stride,
-                        const unsigned int *order,
-                        void *arr_temp)
+void _bli_array_permute(
+    void *arr, const uint arr_len, const size_t arr_stride, const uint *order, void *arr_temp)
 {
   const size_t len = arr_len * arr_stride;
-  const unsigned int arr_stride_uint = (unsigned int)arr_stride;
+  const uint arr_stride_uint = (uint)arr_stride;
   void *arr_orig;
-  unsigned int i;
+  uint i;
 
   if (arr_temp == NULL) {
     arr_orig = MEM_mallocN(len, __func__);
@@ -127,13 +124,13 @@ void _bli_array_permute(void *arr,
  *
  * Access via #BLI_array_deduplicate_ordered
  */
-unsigned int _bli_array_deduplicate_ordered(void *arr, unsigned int arr_len, size_t arr_stride)
+uint _bli_array_deduplicate_ordered(void *arr, uint arr_len, size_t arr_stride)
 {
   if (UNLIKELY(arr_len <= 1)) {
     return arr_len;
   }
 
-  const unsigned int arr_stride_uint = (unsigned int)arr_stride;
+  const uint arr_stride_uint = (uint)arr_stride;
   uint j = 0;
   for (uint i = 0; i < arr_len; i++) {
     if ((i == j) || (memcmp(POINTER_OFFSET(arr, arr_stride_uint * i),
@@ -156,10 +153,10 @@ unsigned int _bli_array_deduplicate_ordered(void *arr, unsigned int arr_len, siz
  *
  * \note Not efficient, use for error checks/asserts.
  */
-int _bli_array_findindex(const void *arr, unsigned int arr_len, size_t arr_stride, const void *p)
+int _bli_array_findindex(const void *arr, uint arr_len, size_t arr_stride, const void *p)
 {
   const char *arr_step = (const char *)arr;
-  for (unsigned int i = 0; i < arr_len; i++, arr_step += arr_stride) {
+  for (uint i = 0; i < arr_len; i++, arr_step += arr_stride) {
     if (memcmp(arr_step, p, arr_stride) == 0) {
       return (int)i;
     }
@@ -170,10 +167,10 @@ int _bli_array_findindex(const void *arr, unsigned int arr_len, size_t arr_strid
 /**
  * A version of #BLI_array_findindex that searches from the end of the list.
  */
-int _bli_array_rfindindex(const void *arr, unsigned int arr_len, size_t arr_stride, const void *p)
+int _bli_array_rfindindex(const void *arr, uint arr_len, size_t arr_stride, const void *p)
 {
   const char *arr_step = (const char *)arr + (arr_stride * arr_len);
-  for (unsigned int i = arr_len; i-- != 0;) {
+  for (uint i = arr_len; i-- != 0;) {
     arr_step -= arr_stride;
     if (memcmp(arr_step, p, arr_stride) == 0) {
       return (int)i;
@@ -183,7 +180,7 @@ int _bli_array_rfindindex(const void *arr, unsigned int arr_len, size_t arr_stri
 }
 
 void _bli_array_binary_and(
-    void *arr, const void *arr_a, const void *arr_b, unsigned int arr_len, size_t arr_stride)
+    void *arr, const void *arr_a, const void *arr_b, uint arr_len, size_t arr_stride)
 {
   char *dst = arr;
   const char *src_a = arr_a;
@@ -196,7 +193,7 @@ void _bli_array_binary_and(
 }
 
 void _bli_array_binary_or(
-    void *arr, const void *arr_a, const void *arr_b, unsigned int arr_len, size_t arr_stride)
+    void *arr, const void *arr_a, const void *arr_b, uint arr_len, size_t arr_stride)
 {
   char *dst = arr;
   const char *src_a = arr_a;
@@ -225,14 +222,14 @@ void _bli_array_binary_or(
  * where calculating the length isn't a simple subtraction.
  */
 bool _bli_array_iter_span(const void *arr,
-                          unsigned int arr_len,
+                          uint arr_len,
                           size_t arr_stride,
                           bool use_wrap,
                           bool use_delimit_bounds,
                           bool (*test_fn)(const void *arr_item, void *user_data),
                           void *user_data,
-                          unsigned int span_step[2],
-                          unsigned int *r_span_len)
+                          uint span_step[2],
+                          uint *r_span_len)
 {
   if (arr_len == 0) {
     return false;
@@ -241,11 +238,11 @@ bool _bli_array_iter_span(const void *arr,
     return false;
   }
 
-  const unsigned int arr_stride_uint = (unsigned int)arr_stride;
+  const uint arr_stride_uint = (uint)arr_stride;
   const void *item_prev;
   bool test_prev;
 
-  unsigned int i_curr;
+  uint i_curr;
 
   if ((span_step[0] == arr_len) && (span_step[1] == arr_len)) {
     if (use_wrap) {
@@ -278,11 +275,11 @@ bool _bli_array_iter_span(const void *arr,
   while (i_curr < arr_len) {
     bool test_curr = test_fn(item_curr, user_data);
     if ((test_prev == false) && (test_curr == true)) {
-      unsigned int span_len;
-      unsigned int i_step_prev = i_curr;
+      uint span_len;
+      uint i_step_prev = i_curr;
 
       if (use_wrap) {
-        unsigned int i_step = i_curr + 1;
+        uint i_step = i_curr + 1;
         if (UNLIKELY(i_step == arr_len)) {
           i_step = 0;
         }
@@ -302,7 +299,7 @@ bool _bli_array_iter_span(const void *arr,
         }
       }
       else {
-        unsigned int i_step = i_curr + 1;
+        uint i_step = i_curr + 1;
         while ((i_step != arr_len) &&
                test_fn(POINTER_OFFSET(arr, i_step * arr_stride_uint), user_data)) {
           i_step_prev = i_step;
@@ -336,7 +333,7 @@ bool _bli_array_iter_span(const void *arr,
 /**
  * Simple utility to check memory is zeroed.
  */
-bool _bli_array_is_zeroed(const void *arr_v, unsigned int arr_len, size_t arr_stride)
+bool _bli_array_is_zeroed(const void *arr_v, uint arr_len, size_t arr_stride)
 {
   const char *arr_step = (const char *)arr_v;
   size_t i = arr_stride * arr_len;