Cleanup: use count or num instead of nbr

Follow conventions from T85728.

4 files changed, 31 insertions, 28 deletions

diff --git a/source/blender/blenlib/intern/BLI_filelist.c b/source/blender/blenlib/intern/BLI_filelist.c
index 9f1f8fe0448..76fc5b6342a 100644
--- a/source/blender/blenlib/intern/BLI_filelist.c
+++ b/source/blender/blenlib/intern/BLI_filelist.c
@@ -97,8 +97,8 @@ static int bli_compare(struct direntry *entry1, struct direntry *entry2)
 }
 
 struct BuildDirCtx {
-  struct direntry *files; /* array[nrfiles] */
-  int nrfiles;
+  struct direntry *files; /* array[files_num] */
+  int files_num;
 };
 
 /**
@@ -154,7 +154,7 @@ static void bli_builddir(struct BuildDirCtx *dir_ctx, const char *dirname)
     if (newnum) {
       if (dir_ctx->files) {
         void *const tmp = MEM_reallocN(dir_ctx->files,
-                                       (dir_ctx->nrfiles + newnum) * sizeof(struct direntry));
+                                       (dir_ctx->files_num + newnum) * sizeof(struct direntry));
         if (tmp) {
           dir_ctx->files = (struct direntry *)tmp;
         }
@@ -171,7 +171,7 @@ static void bli_builddir(struct BuildDirCtx *dir_ctx, const char *dirname)
 
       if (dir_ctx->files) {
         struct dirlink *dlink = (struct dirlink *)dirbase.first;
-        struct direntry *file = &dir_ctx->files[dir_ctx->nrfiles];
+        struct direntry *file = &dir_ctx->files[dir_ctx->files_num];
         while (dlink) {
           char fullname[PATH_MAX];
           memset(file, 0, sizeof(struct direntry));
@@ -186,7 +186,7 @@ static void bli_builddir(struct BuildDirCtx *dir_ctx, const char *dirname)
              * does not support stat on '\\SERVER\foo\..', sigh... */
             file->type |= S_IFDIR;
           }
-          dir_ctx->nrfiles++;
+          dir_ctx->files_num++;
           file++;
           dlink = dlink->next;
         }
@@ -199,7 +199,7 @@ static void bli_builddir(struct BuildDirCtx *dir_ctx, const char *dirname)
       BLI_freelist(&dirbase);
       if (dir_ctx->files) {
         qsort(dir_ctx->files,
-              dir_ctx->nrfiles,
+              dir_ctx->files_num,
               sizeof(struct direntry),
               (int (*)(const void *, const void *))bli_compare);
       }
@@ -219,7 +219,7 @@ unsigned int BLI_filelist_dir_contents(const char *dirname, struct direntry **r_
 {
   struct BuildDirCtx dir_ctx;
 
-  dir_ctx.nrfiles = 0;
+  dir_ctx.files_num = 0;
   dir_ctx.files = NULL;
 
   bli_builddir(&dir_ctx, dirname);
@@ -233,7 +233,7 @@ unsigned int BLI_filelist_dir_contents(const char *dirname, struct direntry **r_
     *r_filelist = MEM_mallocN(sizeof(**r_filelist), __func__);
   }
 
-  return dir_ctx.nrfiles;
+  return dir_ctx.files_num;
 }
 
 void BLI_filelist_entry_size_to_string(const struct stat *st,
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 27f8f1d4bc8..26a0479f445 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -382,9 +382,9 @@ static bool delete_recursive(const char *dir)
 {
   struct direntry *filelist, *fl;
   bool err = false;
-  uint nbr, i;
+  uint filelist_num, i;
 
-  i = nbr = BLI_filelist_dir_contents(dir, &filelist);
+  i = filelist_num = BLI_filelist_dir_contents(dir, &filelist);
   fl = filelist;
   while (i--) {
     const char *file = BLI_path_basename(fl->path);
@@ -415,7 +415,7 @@ static bool delete_recursive(const char *dir)
     err = true;
   }
 
-  BLI_filelist_free(filelist, nbr);
+  BLI_filelist_free(filelist, filelist_num);
 
   return err;
 }
diff --git a/source/blender/blenlib/intern/math_statistics.c b/source/blender/blenlib/intern/math_statistics.c
index 14baca891c0..53fbc16f3fc 100644
--- a/source/blender/blenlib/intern/math_statistics.c
+++ b/source/blender/blenlib/intern/math_statistics.c
@@ -21,7 +21,7 @@ typedef struct CovarianceData {
   float *r_covmat;
   float covfac;
   int n;
-  int nbr_cos_vn;
+  int cos_vn_num;
 } CovarianceData;
 
 static void covariance_m_vn_ex_task_cb(void *__restrict userdata,
@@ -33,7 +33,7 @@ static void covariance_m_vn_ex_task_cb(void *__restrict userdata,
   const float *center = data->center;
   float *r_covmat = data->r_covmat;
   const int n = data->n;
-  const int nbr_cos_vn = data->nbr_cos_vn;
+  const int cos_vn_num = data->cos_vn_num;
 
   int k;
 
@@ -55,12 +55,12 @@ static void covariance_m_vn_ex_task_cb(void *__restrict userdata,
   }
 
   if (center) {
-    for (k = 0; k < nbr_cos_vn; k++) {
+    for (k = 0; k < cos_vn_num; k++) {
       r_covmat[a] += (cos_vn[k * n + i] - center[i]) * (cos_vn[k * n + j] - center[j]);
     }
   }
   else {
-    for (k = 0; k < nbr_cos_vn; k++) {
+    for (k = 0; k < cos_vn_num; k++) {
       r_covmat[a] += cos_vn[k * n + i] * cos_vn[k * n + j];
     }
   }
@@ -73,7 +73,7 @@ static void covariance_m_vn_ex_task_cb(void *__restrict userdata,
 
 void BLI_covariance_m_vn_ex(const int n,
                             const float *cos_vn,
-                            const int nbr_cos_vn,
+                            const int cos_vn_num,
                             const float *center,
                             const bool use_sample_correction,
                             float *r_covmat)
@@ -81,7 +81,7 @@ void BLI_covariance_m_vn_ex(const int n,
   /* Note about that division: see https://en.wikipedia.org/wiki/Bessel%27s_correction.
    * In a nutshell, it must be 1 / (n - 1) for 'sample data', and 1 / n for 'population data'...
    */
-  const float covfac = 1.0f / (float)(use_sample_correction ? nbr_cos_vn - 1 : nbr_cos_vn);
+  const float covfac = 1.0f / (float)(use_sample_correction ? cos_vn_num - 1 : cos_vn_num);
 
   memset(r_covmat, 0, sizeof(*r_covmat) * (size_t)(n * n));
 
@@ -91,27 +91,27 @@ void BLI_covariance_m_vn_ex(const int n,
       .r_covmat = r_covmat,
       .covfac = covfac,
       .n = n,
-      .nbr_cos_vn = nbr_cos_vn,
+      .cos_vn_num = cos_vn_num,
   };
 
   TaskParallelSettings settings;
   BLI_parallel_range_settings_defaults(&settings);
-  settings.use_threading = ((nbr_cos_vn * n * n) >= 10000);
+  settings.use_threading = ((cos_vn_num * n * n) >= 10000);
   BLI_task_parallel_range(0, n * n, &data, covariance_m_vn_ex_task_cb, &settings);
 }
 
 void BLI_covariance_m3_v3n(const float (*cos_v3)[3],
-                           const int nbr_cos_v3,
+                           const int cos_v3_num,
                            const bool use_sample_correction,
                            float r_covmat[3][3],
                            float r_center[3])
 {
   float center[3];
-  const float mean_fac = 1.0f / (float)nbr_cos_v3;
+  const float mean_fac = 1.0f / (float)cos_v3_num;
   int i;
 
   zero_v3(center);
-  for (i = 0; i < nbr_cos_v3; i++) {
+  for (i = 0; i < cos_v3_num; i++) {
     /* Applying mean_fac here rather than once at the end reduce compute errors... */
     madd_v3_v3fl(center, cos_v3[i], mean_fac);
   }
@@ -121,5 +121,5 @@ void BLI_covariance_m3_v3n(const float (*cos_v3)[3],
   }
 
   BLI_covariance_m_vn_ex(
-      3, (const float *)cos_v3, nbr_cos_v3, center, use_sample_correction, (float *)r_covmat);
+      3, (const float *)cos_v3, cos_v3_num, center, use_sample_correction, (float *)r_covmat);
 }
diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c
index da6a6dff16f..5dcdabaf760 100644
--- a/source/blender/blenlib/intern/math_vector.c
+++ b/source/blender/blenlib/intern/math_vector.c
@@ -268,12 +268,12 @@ void mid_v3_v3v3v3v3(
   v[2] = (v1[2] + v2[2] + v3[2] + v4[2]) / 4.0f;
 }
 
-void mid_v3_v3_array(float r[3], const float (*vec_arr)[3], const uint nbr)
+void mid_v3_v3_array(float r[3], const float (*vec_arr)[3], const uint vec_arr_num)
 {
-  const float factor = 1.0f / (float)nbr;
+  const float factor = 1.0f / (float)vec_arr_num;
   zero_v3(r);
 
-  for (uint i = 0; i < nbr; i++) {
+  for (uint i = 0; i < vec_arr_num; i++) {
     madd_v3_v3fl(r, vec_arr[i], factor);
   }
 }
@@ -904,9 +904,12 @@ void minmax_v2v2_v2(float min[2], float max[2], const float vec[2])
   }
 }
 
-void minmax_v3v3_v3_array(float r_min[3], float r_max[3], const float (*vec_arr)[3], int nbr)
+void minmax_v3v3_v3_array(float r_min[3],
+                          float r_max[3],
+                          const float (*vec_arr)[3],
+                          int var_arr_num)
 {
-  while (nbr--) {
+  while (var_arr_num--) {
     minmax_v3v3_v3(r_min, r_max, *vec_arr++);
   }
 }