From 6d12bc9e918d47f39135750f9d99f901f88efc44 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Tue, 26 Apr 2022 14:25:58 +1000
Subject: Cleanup: use boolean arguments and return values

---
 source/blender/blenkernel/BKE_particle.h      | 12 ++++++------
 source/blender/blenkernel/intern/particle.c   | 12 ++++++------
 source/blender/blenkernel/intern/pointcache.c | 17 +++++++++--------
 3 files changed, 21 insertions(+), 20 deletions(-)

(limited to 'source/blender/blenkernel')

diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index b622d7ba85c..123fdbb8bac 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -391,12 +391,12 @@ void psys_cache_child_paths(struct ParticleSimulationData *sim,
                             float cfra,
                             bool editupdate,
                             bool use_render_params);
-int do_guides(struct Depsgraph *depsgraph,
-              struct ParticleSettings *part,
-              struct ListBase *effectors,
-              ParticleKey *state,
-              int index,
-              float time);
+bool do_guides(struct Depsgraph *depsgraph,
+               struct ParticleSettings *part,
+               struct ListBase *effectors,
+               ParticleKey *state,
+               int index,
+               float time);
 void precalc_guides(struct ParticleSimulationData *sim, struct ListBase *effectors);
 float psys_get_timestep(struct ParticleSimulationData *sim);
 float psys_get_child_time(struct ParticleSystem *psys,
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index cc4738b1faa..bbb08155bfc 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2390,12 +2390,12 @@ void precalc_guides(ParticleSimulationData *sim, ListBase *effectors)
   }
 }
 
-int do_guides(Depsgraph *depsgraph,
-              ParticleSettings *part,
-              ListBase *effectors,
-              ParticleKey *state,
-              int index,
-              float time)
+bool do_guides(Depsgraph *depsgraph,
+               ParticleSettings *part,
+               ListBase *effectors,
+               ParticleKey *state,
+               int index,
+               float time)
 {
   CurveMapping *clumpcurve = (part->child_flag & PART_CHILD_USE_CLUMP_CURVE) ? part->clumpcurve :
                                                                                NULL;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index d5d304343df..34720bf7d6b 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1399,7 +1399,8 @@ static size_t ptcache_filename_ext_append(PTCacheID *pid,
   return len;
 }
 
-static int ptcache_filename(PTCacheID *pid, char *filename, int cfra, short do_path, short do_ext)
+static int ptcache_filename(
+    PTCacheID *pid, char *filename, int cfra, const bool do_path, const bool do_ext)
 {
   int len = 0;
   char *idname;
@@ -1464,7 +1465,7 @@ static PTCacheFile *ptcache_file_open(PTCacheID *pid, int mode, int cfra)
     }
   }
 
-  ptcache_filename(pid, filename, cfra, 1, 1);
+  ptcache_filename(pid, filename, cfra, true, true);
 
   if (mode == PTCACHE_FILE_READ) {
     fp = BLI_fopen(filename, "rb");
@@ -2630,7 +2631,7 @@ void BKE_ptcache_id_clear(PTCacheID *pid, int mode, unsigned int cfra)
           return;
         }
 
-        len = ptcache_filename(pid, filename, cfra, 0, 0); /* no path */
+        len = ptcache_filename(pid, filename, cfra, false, false); /* no path */
         /* append underscore terminator to ensure we don't match similar names
          * from objects whose names start with the same prefix
          */
@@ -2712,7 +2713,7 @@ void BKE_ptcache_id_clear(PTCacheID *pid, int mode, unsigned int cfra)
     case PTCACHE_CLEAR_FRAME:
       if (pid->cache->flag & PTCACHE_DISK_CACHE) {
         if (BKE_ptcache_id_exist(pid, cfra)) {
-          ptcache_filename(pid, filename, cfra, 1, 1); /* no path */
+          ptcache_filename(pid, filename, cfra, true, true); /* no path */
           BLI_delete(filename, false, false);
         }
       }
@@ -2753,7 +2754,7 @@ bool BKE_ptcache_id_exist(PTCacheID *pid, int cfra)
   if (pid->cache->flag & PTCACHE_DISK_CACHE) {
     char filename[MAX_PTCACHE_FILE];
 
-    ptcache_filename(pid, filename, cfra, 1, 1);
+    ptcache_filename(pid, filename, cfra, true, true);
 
     return BLI_exists(filename);
   }
@@ -3500,7 +3501,7 @@ void BKE_ptcache_disk_cache_rename(PTCacheID *pid, const char *name_src, const c
   /* get "from" filename */
   BLI_strncpy(pid->cache->name, name_src, sizeof(pid->cache->name));
 
-  len = ptcache_filename(pid, old_filename, 0, 0, 0); /* no path */
+  len = ptcache_filename(pid, old_filename, 0, false, false); /* no path */
 
   ptcache_path(pid, path);
   dir = opendir(path);
@@ -3522,7 +3523,7 @@ void BKE_ptcache_disk_cache_rename(PTCacheID *pid, const char *name_src, const c
 
         if (frame != -1) {
           BLI_join_dirfile(old_path_full, sizeof(old_path_full), path, de->d_name);
-          ptcache_filename(pid, new_path_full, frame, 1, 1);
+          ptcache_filename(pid, new_path_full, frame, true, true);
           BLI_rename(old_path_full, new_path_full);
         }
       }
@@ -3555,7 +3556,7 @@ void BKE_ptcache_load_external(PTCacheID *pid)
 
   ptcache_path(pid, path);
 
-  len = ptcache_filename(pid, filename, 1, 0, 0); /* no path */
+  len = ptcache_filename(pid, filename, 1, false, false); /* no path */
 
   dir = opendir(path);
   if (dir == NULL) {
-- 
cgit v1.2.3