From 8f4fccaa3313c30a49f550c825b742e5571a73de Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Wed, 2 Aug 2023 15:34:45 +0200
Subject: [PATCH] Creator: move to C++

Also see #103343.

Co-authored-by: Hans Goudey <h.goudey@me.com>
Pull Request: https://projects.blender.org/blender/blender/pulls/110539
---
 source/creator/CMakeLists.txt                 |  11 +-
 source/creator/{creator.c => creator.cc}      |  83 ++-
 .../{creator_args.c => creator_args.cc}       | 498 ++++++++----------
 .../{creator_signals.c => creator_signals.cc} |  20 +-
 4 files changed, 287 insertions(+), 325 deletions(-)
 rename source/creator/{creator.c => creator.cc} (88%)
 rename source/creator/{creator_args.c => creator_args.cc} (82%)
 rename source/creator/{creator_signals.c => creator_signals.cc} (94%)

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 7f332fd509a..1d4e1ebf595 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -81,6 +81,11 @@ if(WITH_TBB)
   endif()
 endif()
 
+if(WIN32)
+  # Windows.h will define min/max macros that will collide with the stl versions.
+  add_definitions(-DNOMINMAX)
+endif()
+
 if(WITH_USD)
   # USD links libMaterialX, when using pre-compiled libraries
   # ensures `usd_ms` can find `MaterialXRender` and friends.
@@ -140,9 +145,9 @@ endif()
 
 # Setup the EXE sources and `buildinfo`.
 set(SRC
-  creator.c
-  creator_args.c
-  creator_signals.c
+  creator.cc
+  creator_args.cc
+  creator_signals.cc
 
   creator_intern.h
 )
diff --git a/source/creator/creator.c b/source/creator/creator.cc
similarity index 88%
rename from source/creator/creator.c
rename to source/creator/creator.cc
index 574aeef30e3..3d10057b357 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.cc
@@ -120,17 +120,13 @@
  * \{ */
 
 /* written to by 'creator_args.c' */
-struct ApplicationState app_state = {
-    .signal =
-        {
-            .use_crash_handler = true,
-            .use_abort_handler = true,
-        },
-    .exit_code_on_error =
-        {
-            .python = 0,
-        },
-};
+ApplicationState app_state = []() {
+  ApplicationState app_state{};
+  app_state.signal.use_crash_handler = true;
+  app_state.signal.use_abort_handler = true;
+  app_state.exit_code_on_error.python = 0;
+  return app_state;
+}();
 
 /** \} */
 
@@ -159,7 +155,7 @@ struct CreatorAtExitData {
 #endif
 
 #ifdef USE_WIN32_UNICODE_ARGS
-  const char **argv;
+  char **argv;
   int argv_num;
 #endif
 
@@ -170,12 +166,12 @@ struct CreatorAtExitData {
 
 static void callback_main_atexit(void *user_data)
 {
-  struct CreatorAtExitData *app_init_data = user_data;
+  struct CreatorAtExitData *app_init_data = static_cast<CreatorAtExitData *>(user_data);
 
 #ifndef WITH_PYTHON_MODULE
   if (app_init_data->ba) {
     BLI_args_destroy(app_init_data->ba);
-    app_init_data->ba = NULL;
+    app_init_data->ba = nullptr;
   }
 #else
   UNUSED_VARS(app_init_data); /* May be unused. */
@@ -187,7 +183,7 @@ static void callback_main_atexit(void *user_data)
       free((void *)app_init_data->argv[--app_init_data->argv_num]);
     }
     free((void *)app_init_data->argv);
-    app_init_data->argv = NULL;
+    app_init_data->argv = nullptr;
   }
 #else
   UNUSED_VARS(app_init_data); /* May be unused. */
@@ -196,7 +192,7 @@ static void callback_main_atexit(void *user_data)
 
 static void callback_clg_fatal(void *fp)
 {
-  BLI_system_backtrace(fp);
+  BLI_system_backtrace(static_cast<FILE *>(fp));
 }
 
 /** \} */
@@ -216,12 +212,12 @@ void main_python_exit(void);
 
 /* Rename the 'main' function, allowing Python initialization to call it. */
 #  define main main_python_enter
-static void *evil_C = NULL;
+static void *evil_C = nullptr;
 
 #  ifdef __APPLE__
 /* Environment is not available in macOS shared libraries. */
 #    include <crt_externs.h>
-char **environ = NULL;
+char **environ = nullptr;
 #  endif /* __APPLE__ */
 
 #endif /* WITH_PYTHON_MODULE */
@@ -241,12 +237,12 @@ void *gmp_alloc(size_t size)
 {
   return scalable_malloc(size);
 }
-void *gmp_realloc(void *ptr, size_t UNUSED(old_size), size_t new_size)
+void *gmp_realloc(void *ptr, size_t /*old_size*/, size_t new_size)
 {
   return scalable_realloc(ptr, new_size);
 }
 
-void gmp_free(void *ptr, size_t UNUSED(size))
+void gmp_free(void *ptr, size_t /*size*/)
 {
   scalable_free(ptr);
 }
@@ -268,6 +264,10 @@ void gmp_blender_init_allocator()
 /** \name Main Function
  * \{ */
 
+#if defined(__APPLE__)
+extern "C" int GHOST_HACK_getFirstFile(char buf[]);
+#endif
+
 /**
  * Blender's main function responsibilities are:
  * - setup subsystems.
@@ -277,7 +277,7 @@ void gmp_blender_init_allocator()
  */
 int main(int argc,
 #ifdef USE_WIN32_UNICODE_ARGS
-         const char **UNUSED(argv_c)
+         const char ** /*argv_c*/
 #else
          const char **argv
 #endif
@@ -297,20 +297,20 @@ int main(int argc,
   /* --- end declarations --- */
 
   /* Ensure we free data on early-exit. */
-  struct CreatorAtExitData app_init_data = {NULL};
+  struct CreatorAtExitData app_init_data = {nullptr};
   BKE_blender_atexit_register(callback_main_atexit, &app_init_data);
 
-  /* Un-buffered `stdout` makes `stdout` and `stderr` better synchronized, and helps
-   * when stepping through code in a debugger (prints are immediately
-   * visible). However disabling buffering causes lock contention on windows
-   * see #76767 for details, since this is a debugging aid, we do not enable
-   * the un-buffered behavior for release builds. */
+/* Un-buffered `stdout` makes `stdout` and `stderr` better synchronized, and helps
+ * when stepping through code in a debugger (prints are immediately
+ * visible). However disabling buffering causes lock contention on windows
+ * see #76767 for details, since this is a debugging aid, we do not enable
+ * the un-buffered behavior for release builds. */
 #ifndef NDEBUG
-  setvbuf(stdout, NULL, _IONBF, 0);
+  setvbuf(stdout, nullptr, _IONBF, 0);
 #endif
 
 #ifdef WIN32
-  /* We delay loading of OPENMP so we can set the policy here. */
+/* We delay loading of OPENMP so we can set the policy here. */
 #  if defined(_MSC_VER)
   _putenv_s("OMP_WAIT_POLICY", "PASSIVE");
 #  endif
@@ -321,7 +321,7 @@ int main(int argc,
     /* NOTE: Can't use `guardedalloc` allocation here, as it's not yet initialized
      * (it depends on the arguments passed in, which is what we're getting here!) */
     wchar_t **argv_16 = CommandLineToArgvW(GetCommandLineW(), &argc);
-    argv = malloc(argc * sizeof(char *));
+    argv = static_cast<char **>(malloc(argc * sizeof(char *)));
     for (argv_num = 0; argv_num < argc; argv_num++) {
       argv[argv_num] = alloc_utf_8_from_16(argv_16[argv_num], 0);
     }
@@ -402,7 +402,7 @@ int main(int argc,
 #endif
 
 #ifdef WITH_BINRELOC
-  br_init(NULL);
+  br_init(nullptr);
 #endif
 
 #ifdef WITH_LIBMV
@@ -420,7 +420,6 @@ int main(int argc,
 #if defined(__APPLE__) && !defined(WITH_PYTHON_MODULE) && !defined(WITH_HEADLESS)
   /* Patch to ignore argument finder gives us (PID?) */
   if (argc == 2 && STRPREFIX(argv[1], "-psn_")) {
-    extern int GHOST_HACK_getFirstFile(char buf[]);
     static char firstfilebuf[512];
 
     argc = 1;
@@ -459,7 +458,7 @@ int main(int argc,
 
   BKE_callback_global_init();
 
-  /* First test for background-mode (#Global.background) */
+/* First test for background-mode (#Global.background) */
 #ifndef WITH_PYTHON_MODULE
   ba = BLI_args_create(argc, (const char **)argv); /* skip binary path */
 
@@ -473,7 +472,7 @@ int main(int argc,
   MEM_use_memleak_detection(false);
 
   /* Parse environment handling arguments. */
-  BLI_args_parse(ba, ARG_PASS_ENVIRONMENT, NULL, NULL);
+  BLI_args_parse(ba, ARG_PASS_ENVIRONMENT, nullptr, nullptr);
 
 #else
   /* Using preferences or user startup makes no sense for #WITH_PYTHON_MODULE. */
@@ -492,7 +491,7 @@ int main(int argc,
 
 #ifndef WITH_PYTHON_MODULE
   /* First test for background-mode (#Global.background) */
-  BLI_args_parse(ba, ARG_PASS_SETTINGS, NULL, NULL);
+  BLI_args_parse(ba, ARG_PASS_SETTINGS, nullptr, nullptr);
 
   main_signal_setup();
 #endif
@@ -530,9 +529,9 @@ int main(int argc,
 
 #ifndef WITH_PYTHON_MODULE
   if (G.background == 0) {
-    BLI_args_parse(ba, ARG_PASS_SETTINGS_GUI, NULL, NULL);
+    BLI_args_parse(ba, ARG_PASS_SETTINGS_GUI, nullptr, nullptr);
   }
-  BLI_args_parse(ba, ARG_PASS_SETTINGS_FORCE, NULL, NULL);
+  BLI_args_parse(ba, ARG_PASS_SETTINGS_FORCE, nullptr, nullptr);
 #endif
 
   WM_init(C, argc, (const char **)argv);
@@ -555,7 +554,7 @@ int main(int argc,
   FRS_set_context(C);
 #endif
 
-  /* OK we are ready for it */
+/* OK we are ready for it */
 #ifndef WITH_PYTHON_MODULE
   /* Handles #ARG_PASS_FINAL. */
   BLI_args_parse(ba, ARG_PASS_FINAL, main_args_handle_load_file, C);
@@ -571,14 +570,14 @@ int main(int argc,
   /* End argument parsing, allow memory leaks to be printed. */
   MEM_use_memleak_detection(true);
 
-  /* Paranoid, avoid accidental re-use. */
+/* Paranoid, avoid accidental re-use. */
 #ifndef WITH_PYTHON_MODULE
-  ba = NULL;
+  ba = nullptr;
   (void)ba;
 #endif
 
 #ifdef USE_WIN32_UNICODE_ARGS
-  argv = NULL;
+  argv = nullptr;
   (void)argv;
 #endif
 
@@ -606,7 +605,7 @@ int main(int argc,
 void main_python_exit(void)
 {
   WM_exit_ex((bContext *)evil_C, true, false);
-  evil_C = NULL;
+  evil_C = nullptr;
 }
 #endif
 
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.cc
similarity index 82%
rename from source/creator/creator_args.c
rename to source/creator/creator_args.cc
index aa3478196d2..470e689af81 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.cc
@@ -153,7 +153,7 @@ static bool parse_int_relative(const char *str,
                                int *r_value,
                                const char **r_err_msg)
 {
-  char *str_end = NULL;
+  char *str_end = nullptr;
   long value;
 
   errno = 0;
@@ -186,17 +186,17 @@ static bool parse_int_relative(const char *str,
 
 static const char *parse_int_range_sep_search(const char *str, const char *str_end_test)
 {
-  const char *str_end_range = NULL;
+  const char *str_end_range = nullptr;
   if (str_end_test) {
-    str_end_range = memchr(str, '.', (str_end_test - str) - 1);
+    str_end_range = static_cast<const char *>(memchr(str, '.', (str_end_test - str) - 1));
     if (str_end_range && (str_end_range[1] != '.')) {
-      str_end_range = NULL;
+      str_end_range = nullptr;
     }
   }
   else {
     str_end_range = strstr(str, "..");
     if (str_end_range && (str_end_range[2] == '\0')) {
-      str_end_range = NULL;
+      str_end_range = nullptr;
     }
   }
   return str_end_range;
@@ -268,7 +268,7 @@ static bool parse_int_strict_range(const char *str,
                                    int *r_value,
                                    const char **r_err_msg)
 {
-  char *str_end = NULL;
+  char *str_end = nullptr;
   long value;
 
   errno = 0;
@@ -355,7 +355,7 @@ static int *parse_int_relative_clamp_n(
 
 fail:
   MEM_freeN(values);
-  return NULL;
+  return nullptr;
 }
 
 #  endif
@@ -382,7 +382,7 @@ static int (*parse_int_range_relative_clamp_n(const char *str,
     }
   }
 
-  int(*values)[2] = MEM_mallocN(sizeof(*values) * len, __func__);
+  int(*values)[2] = static_cast<int(*)[2]>(MEM_mallocN(sizeof(*values) * len, __func__));
   int i = 0;
   while (true) {
     const char *str_end_range;
@@ -398,7 +398,7 @@ static int (*parse_int_range_relative_clamp_n(const char *str,
                  parse_int_relative_clamp(
                      str, str_end, pos, neg, min, max, &values[i][0], r_err_msg))
     {
-      if (str_end_range == NULL) {
+      if (str_end_range == nullptr) {
         values[i][1] = values[i][0];
       }
       i++;
@@ -420,7 +420,7 @@ static int (*parse_int_range_relative_clamp_n(const char *str,
 
 fail:
   MEM_freeN(values);
-  return NULL;
+  return nullptr;
 }
 
 /** \} */
@@ -447,10 +447,10 @@ static void arg_py_context_backup(bContext *C,
   c_py->has_win = !BLI_listbase_is_empty(&c_py->wm->windows);
   if (c_py->has_win) {
     c_py->win = CTX_wm_window(C);
-    CTX_wm_window_set(C, c_py->wm->windows.first);
+    CTX_wm_window_set(C, static_cast<wmWindow *>(c_py->wm->windows.first));
   }
   else {
-    c_py->win = NULL;
+    c_py->win = nullptr;
     fprintf(stderr,
             "Python script \"%s\" "
             "running with missing context data.\n",
@@ -462,14 +462,14 @@ static void arg_py_context_restore(bContext *C, struct BlendePyContextStore *c_p
 {
   /* script may load a file, check old data is valid before using */
   if (c_py->has_win) {
-    if ((c_py->win == NULL) || ((BLI_findindex(&G_MAIN->wm, c_py->wm) != -1) &&
-                                (BLI_findindex(&c_py->wm->windows, c_py->win) != -1)))
+    if ((c_py->win == nullptr) || ((BLI_findindex(&G_MAIN->wm, c_py->wm) != -1) &&
+                                   (BLI_findindex(&c_py->wm->windows, c_py->win) != -1)))
     {
       CTX_wm_window_set(C, c_py->win);
     }
   }
 
-  if ((c_py->scene == NULL) || BLI_findindex(&G_MAIN->scenes, c_py->scene) != -1) {
+  if ((c_py->scene == nullptr) || BLI_findindex(&G_MAIN->scenes, c_py->scene) != -1) {
     CTX_data_scene_set(C, c_py->scene);
   }
 }
@@ -540,9 +540,7 @@ static void print_version_short(void)
 static const char arg_handle_print_version_doc[] =
     "\n\t"
     "Print Blender version and exit.";
-static int arg_handle_print_version(int UNUSED(argc),
-                                    const char **UNUSED(argv),
-                                    void *UNUSED(data))
+static int arg_handle_print_version(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   print_version_full();
   exit(EXIT_SUCCESS);
@@ -787,7 +785,7 @@ static void print_help(bArgs *ba, bool all)
 ATTR_PRINTF_FORMAT(2, 0)
 static void help_print_ds_fn(void *ds_v, const char *format, va_list args)
 {
-  DynStr *ds = ds_v;
+  DynStr *ds = static_cast<DynStr *>(ds_v);
   BLI_dynstr_vappendf(ds, format, args);
 }
 
@@ -795,8 +793,8 @@ static char *main_args_help_as_string(bool all)
 {
   DynStr *ds = BLI_dynstr_new();
   {
-    bArgs *ba = BLI_args_create(0, NULL);
-    main_args_setup(NULL, ba, all);
+    bArgs *ba = BLI_args_create(0, nullptr);
+    main_args_setup(nullptr, ba, all);
     BLI_args_print_fn_set(ba, help_print_ds_fn, ds);
     print_help(ba, all);
     BLI_args_destroy(ba);
@@ -812,7 +810,7 @@ static const char arg_handle_print_help_doc[] =
 static const char arg_handle_print_help_doc_win32[] =
     "\n\t"
     "Print this help text and exit (Windows only).";
-static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), void *data)
+static int arg_handle_print_help(int /*argc*/, const char ** /*argv*/, void *data)
 {
   bArgs *ba = (bArgs *)data;
 
@@ -828,9 +826,7 @@ static const char arg_handle_arguments_end_doc[] =
     "\n\t"
     "End option processing, following arguments passed unchanged. Access via Python's "
     "'sys.argv'.";
-static int arg_handle_arguments_end(int UNUSED(argc),
-                                    const char **UNUSED(argv),
-                                    void *UNUSED(data))
+static int arg_handle_arguments_end(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   return -1;
 }
@@ -853,7 +849,7 @@ static const char arg_handle_python_set_doc_disable[] =
 #  undef PY_ENABLE_AUTO
 #  undef PY_DISABLE_AUTO
 
-static int arg_handle_python_set(int UNUSED(argc), const char **UNUSED(argv), void *data)
+static int arg_handle_python_set(int /*argc*/, const char ** /*argv*/, void *data)
 {
   if ((bool)data) {
     G.f |= G_FLAG_SCRIPT_AUTOEXEC;
@@ -868,9 +864,7 @@ static int arg_handle_python_set(int UNUSED(argc), const char **UNUSED(argv), vo
 static const char arg_handle_crash_handler_disable_doc[] =
     "\n\t"
     "Disable the crash handler.";
-static int arg_handle_crash_handler_disable(int UNUSED(argc),
-                                            const char **UNUSED(argv),
-                                            void *UNUSED(data))
+static int arg_handle_crash_handler_disable(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   app_state.signal.use_crash_handler = false;
   return 0;
@@ -879,9 +873,7 @@ static int arg_handle_crash_handler_disable(int UNUSED(argc),
 static const char arg_handle_abort_handler_disable_doc[] =
     "\n\t"
     "Disable the abort handler.";
-static int arg_handle_abort_handler_disable(int UNUSED(argc),
-                                            const char **UNUSED(argv),
-                                            void *UNUSED(data))
+static int arg_handle_abort_handler_disable(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   app_state.signal.use_abort_handler = false;
   return 0;
@@ -889,17 +881,15 @@ static int arg_handle_abort_handler_disable(int UNUSED(argc),
 
 static void clog_abort_on_error_callback(void *fp)
 {
-  BLI_system_backtrace(fp);
-  fflush(fp);
+  BLI_system_backtrace(static_cast<FILE *>(fp));
+  fflush(static_cast<FILE *>(fp));
   abort();
 }
 
 static const char arg_handle_debug_exit_on_error_doc[] =
     "\n\t"
     "Immediately exit when internal errors are detected.";
-static int arg_handle_debug_exit_on_error(int UNUSED(argc),
-                                          const char **UNUSED(argv),
-                                          void *UNUSED(data))
+static int arg_handle_debug_exit_on_error(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   MEM_enable_fail_on_memleak();
   CLG_error_fn_set(clog_abort_on_error_callback);
@@ -909,9 +899,7 @@ static int arg_handle_debug_exit_on_error(int UNUSED(argc),
 static const char arg_handle_background_mode_set_doc[] =
     "\n\t"
     "Run in background (often used for UI-less rendering).";
-static int arg_handle_background_mode_set(int UNUSED(argc),
-                                          const char **UNUSED(argv),
-                                          void *UNUSED(data))
+static int arg_handle_background_mode_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   print_version_short();
   G.background = 1;
@@ -922,12 +910,12 @@ static const char arg_handle_log_level_set_doc[] =
     "<level>\n"
     "\tSet the logging verbosity level (higher for more details) defaults to 1,\n"
     "\tuse -1 to log all levels.";
-static int arg_handle_log_level_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_log_level_set(int argc, const char **argv, void * /*data*/)
 {
   const char *arg_id = "--log-level";
   if (argc > 1) {
-    const char *err_msg = NULL;
-    if (!parse_int_clamp(argv[1], NULL, -1, INT_MAX, &G.log.level, &err_msg)) {
+    const char *err_msg = nullptr;
+    if (!parse_int_clamp(argv[1], nullptr, -1, INT_MAX, &G.log.level, &err_msg)) {
       fprintf(stderr, "\nError: %s '%s %s'.\n", err_msg, arg_id, argv[1]);
     }
     else {
@@ -945,9 +933,7 @@ static int arg_handle_log_level_set(int argc, const char **argv, void *UNUSED(da
 static const char arg_handle_log_show_basename_set_doc[] =
     "\n\t"
     "Only show file name in output (not the leading path).";
-static int arg_handle_log_show_basename_set(int UNUSED(argc),
-                                            const char **UNUSED(argv),
-                                            void *UNUSED(data))
+static int arg_handle_log_show_basename_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   CLG_output_use_basename_set(true);
   return 0;
@@ -956,9 +942,7 @@ static int arg_handle_log_show_basename_set(int UNUSED(argc),
 static const char arg_handle_log_show_backtrace_set_doc[] =
     "\n\t"
     "Show a back trace for each log message (debug builds only).";
-static int arg_handle_log_show_backtrace_set(int UNUSED(argc),
-                                             const char **UNUSED(argv),
-                                             void *UNUSED(data))
+static int arg_handle_log_show_backtrace_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   /* Ensure types don't become incompatible. */
   void (*fn)(FILE * fp) = BLI_system_backtrace;
@@ -969,9 +953,7 @@ static int arg_handle_log_show_backtrace_set(int UNUSED(argc),
 static const char arg_handle_log_show_timestamp_set_doc[] =
     "\n\t"
     "Show a timestamp for each log message in seconds since start.";
-static int arg_handle_log_show_timestamp_set(int UNUSED(argc),
-                                             const char **UNUSED(argv),
-                                             void *UNUSED(data))
+static int arg_handle_log_show_timestamp_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   CLG_output_use_timestamp_set(true);
   return 0;
@@ -980,19 +962,19 @@ static int arg_handle_log_show_timestamp_set(int UNUSED(argc),
 static const char arg_handle_log_file_set_doc[] =
     "<filepath>\n"
     "\tSet a file to output the log to.";
-static int arg_handle_log_file_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_log_file_set(int argc, const char **argv, void * /*data*/)
 {
   const char *arg_id = "--log-file";
   if (argc > 1) {
     errno = 0;
     FILE *fp = BLI_fopen(argv[1], "w");
-    if (fp == NULL) {
+    if (fp == nullptr) {
       const char *err_msg = errno ? strerror(errno) : "unknown";
       fprintf(stderr, "\nError: %s '%s %s'.\n", err_msg, arg_id, argv[1]);
     }
     else {
-      if (UNLIKELY(G.log.file != NULL)) {
-        fclose(G.log.file);
+      if (UNLIKELY(G.log.file != nullptr)) {
+        fclose(static_cast<FILE *>(G.log.file));
       }
       G.log.file = fp;
       CLG_output_set(G.log.file);
@@ -1013,7 +995,7 @@ static const char arg_handle_log_set_doc[] =
     "\tUse \"^\" prefix to ignore, so '--log \"*,^wm.operator.*\"' logs all except for "
     "'wm.operators.*'\n"
     "\tUse \"*\" to log everything.";
-static int arg_handle_log_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_log_set(int argc, const char **argv, void * /*data*/)
 {
   const char *arg_id = "--log";
   if (argc > 1) {
@@ -1053,7 +1035,7 @@ static const char arg_handle_debug_mode_set_doc[] =
     "\t* Enables memory error detection\n"
     "\t* Disables mouse grab (to interact with a debugger in some cases)\n"
     "\t* Keeps Python's 'sys.stdin' rather than setting it to None";
-static int arg_handle_debug_mode_set(int UNUSED(argc), const char **UNUSED(argv), void *data)
+static int arg_handle_debug_mode_set(int /*argc*/, const char ** /*argv*/, void *data)
 {
   G.debug |= G_DEBUG; /* std output printf's */
   printf("Blender %s\n", BKE_blender_version_string());
@@ -1066,7 +1048,7 @@ static int arg_handle_debug_mode_set(int UNUSED(argc), const char **UNUSED(argv)
   printf("Build: %s %s %s %s\n", build_date, build_time, build_platform, build_type);
 #  endif
 
-  BLI_args_print(data);
+  BLI_args_print(static_cast<bArgs *>(data));
   return 0;
 }
 
@@ -1137,9 +1119,7 @@ static const char arg_handle_debug_mode_generic_set_doc_gpu_disable_ssbo[] =
     "\n\t"
     "Disable usage of shader storage buffer objects.";
 
-static int arg_handle_debug_mode_generic_set(int UNUSED(argc),
-                                             const char **UNUSED(argv),
-                                             void *data)
+static int arg_handle_debug_mode_generic_set(int /*argc*/, const char ** /*argv*/, void *data)
 {
   G.debug |= POINTER_AS_INT(data);
   return 0;
@@ -1148,9 +1128,7 @@ static int arg_handle_debug_mode_generic_set(int UNUSED(argc),
 static const char arg_handle_debug_mode_io_doc[] =
     "\n\t"
     "Enable debug messages for I/O (Collada, ...).";
-static int arg_handle_debug_mode_io(int UNUSED(argc),
-                                    const char **UNUSED(argv),
-                                    void *UNUSED(data))
+static int arg_handle_debug_mode_io(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   G.debug |= G_DEBUG_IO;
   return 0;
@@ -1159,9 +1137,7 @@ static int arg_handle_debug_mode_io(int UNUSED(argc),
 static const char arg_handle_debug_mode_all_doc[] =
     "\n\t"
     "Enable all debug messages.";
-static int arg_handle_debug_mode_all(int UNUSED(argc),
-                                     const char **UNUSED(argv),
-                                     void *UNUSED(data))
+static int arg_handle_debug_mode_all(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   G.debug |= G_DEBUG_ALL;
 #  ifdef WITH_LIBMV
@@ -1176,9 +1152,7 @@ static int arg_handle_debug_mode_all(int UNUSED(argc),
 static const char arg_handle_debug_mode_libmv_doc[] =
     "\n\t"
     "Enable debug messages from libmv library.";
-static int arg_handle_debug_mode_libmv(int UNUSED(argc),
-                                       const char **UNUSED(argv),
-                                       void *UNUSED(data))
+static int arg_handle_debug_mode_libmv(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
 #  ifdef WITH_LIBMV
   libmv_startDebugLogging();
@@ -1189,9 +1163,7 @@ static int arg_handle_debug_mode_libmv(int UNUSED(argc),
 static const char arg_handle_debug_mode_cycles_doc[] =
     "\n\t"
     "Enable debug messages from Cycles.";
-static int arg_handle_debug_mode_cycles(int UNUSED(argc),
-                                        const char **UNUSED(argv),
-                                        void *UNUSED(data))
+static int arg_handle_debug_mode_cycles(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
 #  ifdef WITH_CYCLES_LOGGING
   CCL_start_debug_logging();
@@ -1202,9 +1174,7 @@ static int arg_handle_debug_mode_cycles(int UNUSED(argc),
 static const char arg_handle_debug_mode_memory_set_doc[] =
     "\n\t"
     "Enable fully guarded memory allocation and debugging.";
-static int arg_handle_debug_mode_memory_set(int UNUSED(argc),
-                                            const char **UNUSED(argv),
-                                            void *UNUSED(data))
+static int arg_handle_debug_mode_memory_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   MEM_set_memory_debug();
   return 0;
@@ -1213,13 +1183,13 @@ static int arg_handle_debug_mode_memory_set(int UNUSED(argc),
 static const char arg_handle_debug_value_set_doc[] =
     "<value>\n"
     "\tSet debug value of <value> on startup.";
-static int arg_handle_debug_value_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_debug_value_set(int argc, const char **argv, void * /*data*/)
 {
   const char *arg_id = "--debug-value";
   if (argc > 1) {
-    const char *err_msg = NULL;
+    const char *err_msg = nullptr;
     int value;
-    if (!parse_int(argv[1], NULL, &value, &err_msg)) {
+    if (!parse_int(argv[1], nullptr, &value, &err_msg)) {
       fprintf(stderr, "\nError: %s '%s %s'.\n", err_msg, arg_id, argv[1]);
       return 1;
     }
@@ -1235,9 +1205,7 @@ static int arg_handle_debug_value_set(int argc, const char **argv, void *UNUSED(
 static const char arg_handle_debug_gpu_set_doc[] =
     "\n"
     "\tEnable GPU debug context and information for OpenGL 4.3+.";
-static int arg_handle_debug_gpu_set(int UNUSED(argc),
-                                    const char **UNUSED(argv),
-                                    void *UNUSED(data))
+static int arg_handle_debug_gpu_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   /* Also enable logging because that how gl errors are reported. */
   const char *gpu_filter = "gpu.*";
@@ -1249,9 +1217,9 @@ static int arg_handle_debug_gpu_set(int UNUSED(argc),
 static const char arg_handle_debug_gpu_renderdoc_set_doc[] =
     "\n"
     "\tEnable Renderdoc integration for GPU frame grabbing and debugging.";
-static int arg_handle_debug_gpu_renderdoc_set(int UNUSED(argc),
-                                              const char **UNUSED(argv),
-                                              void *UNUSED(data))
+static int arg_handle_debug_gpu_renderdoc_set(int /*argc*/,
+                                              const char ** /*argv*/,
+                                              void * /*data*/)
 {
 #  ifdef WITH_RENDERDOC
   G.debug |= G_DEBUG_GPU_RENDERDOC | G_DEBUG_GPU;
@@ -1284,13 +1252,13 @@ static const char arg_handle_gpu_backend_set_doc[] =
     "'opengl'"
 #  endif
     ".";
-static int arg_handle_gpu_backend_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_gpu_backend_set(int argc, const char **argv, void * /*data*/)
 {
   if (argc == 0) {
     fprintf(stderr, "\nError: GPU backend must follow '--gpu-backend'.\n");
     return 0;
   }
-  const char *backends_supported[3] = {NULL};
+  const char *backends_supported[3] = {nullptr};
   int backends_supported_num = 0;
 
   eGPUBackendType gpu_backend = GPU_BACKEND_NONE;
@@ -1332,9 +1300,7 @@ static int arg_handle_gpu_backend_set(int argc, const char **argv, void *UNUSED(
 static const char arg_handle_debug_fpe_set_doc[] =
     "\n\t"
     "Enable floating-point exceptions.";
-static int arg_handle_debug_fpe_set(int UNUSED(argc),
-                                    const char **UNUSED(argv),
-                                    void *UNUSED(data))
+static int arg_handle_debug_fpe_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   main_signal_setup_fpe();
   return 0;
@@ -1343,7 +1309,7 @@ static int arg_handle_debug_fpe_set(int UNUSED(argc),
 static const char arg_handle_app_template_doc[] =
     "<template>\n"
     "\tSet the application template (matching the directory name), use 'default' for none.";
-static int arg_handle_app_template(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_app_template(int argc, const char **argv, void * /*data*/)
 {
   if (argc > 1) {
     const char *app_template = STREQ(argv[1], "default") ? "" : argv[1];
@@ -1357,9 +1323,7 @@ static int arg_handle_app_template(int argc, const char **argv, void *UNUSED(dat
 static const char arg_handle_factory_startup_set_doc[] =
     "\n\t"
     "Skip reading the '" BLENDER_STARTUP_FILE "' in the users home directory.";
-static int arg_handle_factory_startup_set(int UNUSED(argc),
-                                          const char **UNUSED(argv),
-                                          void *UNUSED(data))
+static int arg_handle_factory_startup_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   G.factory_startup = 1;
   G.f |= G_FLAG_USERPREF_NO_SAVE_ON_EXIT;
@@ -1369,9 +1333,7 @@ static int arg_handle_factory_startup_set(int UNUSED(argc),
 static const char arg_handle_enable_event_simulate_doc[] =
     "\n\t"
     "Enable event simulation testing feature 'bpy.types.Window.event_simulate'.";
-static int arg_handle_enable_event_simulate(int UNUSED(argc),
-                                            const char **UNUSED(argv),
-                                            void *UNUSED(data))
+static int arg_handle_enable_event_simulate(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   G.f |= G_FLAG_EVENT_SIMULATE;
   return 0;
@@ -1387,7 +1349,7 @@ static const char arg_handle_env_system_set_doc_python[] =
     "\n\t"
     "Set the " STRINGIFY_ARG(BLENDER_SYSTEM_PYTHON) " environment variable.";
 
-static int arg_handle_env_system_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_env_system_set(int argc, const char **argv, void * /*data*/)
 {
   /* `--env-system-scripts` -> `BLENDER_SYSTEM_SCRIPTS` */
 
@@ -1432,7 +1394,7 @@ static const char arg_handle_playback_mode_doc[] =
     "\t-c <cache_memory>\n"
     "\t\tAmount of memory in megabytes to allow for caching images during playback.\n"
     "\t\tZero disables (clamping to a fixed number of frames instead).";
-static int arg_handle_playback_mode(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_playback_mode(int argc, const char **argv, void * /*data*/)
 {
   /* Ignore the animation player if `-b` was given first. */
   if (G.background == 0) {
@@ -1453,7 +1415,7 @@ static int arg_handle_playback_mode(int argc, const char **argv, void *UNUSED(da
 static const char arg_handle_window_geometry_doc[] =
     "<sx> <sy> <w> <h>\n"
     "\tOpen with lower left corner at <sx>, <sy> and width and height as <w>, <h>.";
-static int arg_handle_window_geometry(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_window_geometry(int argc, const char **argv, void * /*data*/)
 {
   const char *arg_id = "-p / --window-geometry";
   int params[4], i;
@@ -1464,8 +1426,8 @@ static int arg_handle_window_geometry(int argc, const char **argv, void *UNUSED(
   }
 
   for (i = 0; i < 4; i++) {
-    const char *err_msg = NULL;
-    if (!parse_int(argv[i + 1], NULL, &params[i], &err_msg)) {
+    const char *err_msg = nullptr;
+    if (!parse_int(argv[i + 1], nullptr, &params[i], &err_msg)) {
       fprintf(stderr, "\nError: %s '%s %s'.\n", err_msg, arg_id, argv[1]);
       exit(1);
     }
@@ -1479,9 +1441,7 @@ static int arg_handle_window_geometry(int argc, const char **argv, void *UNUSED(
 static const char arg_handle_native_pixels_set_doc[] =
     "\n\t"
     "Do not use native pixel size, for high resolution displays (MacBook 'Retina').";
-static int arg_handle_native_pixels_set(int UNUSED(argc),
-                                        const char **UNUSED(argv),
-                                        void *UNUSED(data))
+static int arg_handle_native_pixels_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   WM_init_native_pixels(false);
   return 0;
@@ -1490,7 +1450,7 @@ static int arg_handle_native_pixels_set(int UNUSED(argc),
 static const char arg_handle_with_borders_doc[] =
     "\n\t"
     "Force opening with borders.";
-static int arg_handle_with_borders(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
+static int arg_handle_with_borders(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   WM_init_state_normal_set();
   return 0;
@@ -1499,9 +1459,7 @@ static int arg_handle_with_borders(int UNUSED(argc), const char **UNUSED(argv),
 static const char arg_handle_without_borders_doc[] =
     "\n\t"
     "Force opening in fullscreen mode.";
-static int arg_handle_without_borders(int UNUSED(argc),
-                                      const char **UNUSED(argv),
-                                      void *UNUSED(data))
+static int arg_handle_without_borders(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   WM_init_state_fullscreen_set();
   return 0;
@@ -1510,9 +1468,7 @@ static int arg_handle_without_borders(int UNUSED(argc),
 static const char arg_handle_window_maximized_doc[] =
     "\n\t"
     "Force opening maximized.";
-static int arg_handle_window_maximized(int UNUSED(argc),
-                                       const char **UNUSED(argv),
-                                       void *UNUSED(data))
+static int arg_handle_window_maximized(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   WM_init_state_maximized_set();
   return 0;
@@ -1521,9 +1477,7 @@ static int arg_handle_window_maximized(int UNUSED(argc),
 static const char arg_handle_no_window_focus_doc[] =
     "\n\t"
     "Open behind other windows and without taking focus.";
-static int arg_handle_no_window_focus(int UNUSED(argc),
-                                      const char **UNUSED(argv),
-                                      void *UNUSED(data))
+static int arg_handle_no_window_focus(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   WM_init_window_focus_set(false);
   return 0;
@@ -1532,9 +1486,7 @@ static int arg_handle_no_window_focus(int UNUSED(argc),
 static const char arg_handle_start_with_console_doc[] =
     "\n\t"
     "Start with the console window open (ignored if '-b' is set), (Windows only).";
-static int arg_handle_start_with_console(int UNUSED(argc),
-                                         const char **UNUSED(argv),
-                                         void *UNUSED(data))
+static int arg_handle_start_with_console(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   WM_init_state_start_with_console_set(true);
   return 0;
@@ -1543,9 +1495,7 @@ static int arg_handle_start_with_console(int UNUSED(argc),
 static const char arg_handle_register_extension_doc[] =
     "\n\t"
     "Register blend-file extension for current user, then exit (Windows only).";
-static int arg_handle_register_extension(int UNUSED(argc),
-                                         const char **UNUSED(argv),
-                                         void *UNUSED(data))
+static int arg_handle_register_extension(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
 #  ifdef WIN32
   G.background = 1;
@@ -1558,9 +1508,7 @@ static int arg_handle_register_extension(int UNUSED(argc),
 static const char arg_handle_register_extension_all_doc[] =
     "\n\t"
     "Register blend-file extension for all users, then exit (Windows only).";
-static int arg_handle_register_extension_all(int UNUSED(argc),
-                                             const char **UNUSED(argv),
-                                             void *UNUSED(data))
+static int arg_handle_register_extension_all(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
 #  ifdef WIN32
   G.background = 1;
@@ -1573,9 +1521,7 @@ static int arg_handle_register_extension_all(int UNUSED(argc),
 static const char arg_handle_unregister_extension_doc[] =
     "\n\t"
     "Unregister blend-file extension for current user, then exit (Windows only).";
-static int arg_handle_unregister_extension(int UNUSED(argc),
-                                           const char **UNUSED(argv),
-                                           void *UNUSED(data))
+static int arg_handle_unregister_extension(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
 #  ifdef WIN32
   G.background = 1;
@@ -1588,9 +1534,9 @@ static int arg_handle_unregister_extension(int UNUSED(argc),
 static const char arg_handle_unregister_extension_all_doc[] =
     "\n\t"
     "Unregister blend-file extension for all users, then exit (Windows only).";
-static int arg_handle_unregister_extension_all(int UNUSED(argc),
-                                               const char **UNUSED(argv),
-                                               void *UNUSED(data))
+static int arg_handle_unregister_extension_all(int /*argc*/,
+                                               const char ** /*argv*/,
+                                               void * /*data*/)
 {
 #  ifdef WIN32
   G.background = 1;
@@ -1603,9 +1549,7 @@ static int arg_handle_unregister_extension_all(int UNUSED(argc),
 static const char arg_handle_audio_disable_doc[] =
     "\n\t"
     "Force sound system to None.";
-static int arg_handle_audio_disable(int UNUSED(argc),
-                                    const char **UNUSED(argv),
-                                    void *UNUSED(data))
+static int arg_handle_audio_disable(int /*argc*/, const char ** /*argv*/, void * /*data*/)
 {
   BKE_sound_force_device("None");
   return 0;
@@ -1616,7 +1560,7 @@ static const char arg_handle_audio_set_doc[] =
     "Force sound system to a specific device."
     "\n\t"
     "'None' 'SDL' 'OpenAL' 'CoreAudio' 'JACK' 'PulseAudio' 'WASAPI'.";
-static int arg_handle_audio_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_audio_set(int argc, const char **argv, void * /*data*/)
 {
   if (argc < 1) {
     fprintf(stderr, "-setaudio require one argument\n");
@@ -1644,7 +1588,7 @@ static const char arg_handle_output_set_doc[] =
     "\t'//render_' becomes '//render_####', writing frames as '//render_0001.png'";
 static int arg_handle_output_set(int argc, const char **argv, void *data)
 {
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   if (argc > 1) {
     Scene *scene = CTX_data_scene(C);
     if (scene) {
@@ -1666,12 +1610,12 @@ static const char arg_handle_engine_set_doc[] =
     "\tUse '-E help' to list available engines.";
 static int arg_handle_engine_set(int argc, const char **argv, void *data)
 {
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   if (argc >= 2) {
     if (STREQ(argv[1], "help")) {
-      RenderEngineType *type = NULL;
+      RenderEngineType *type = nullptr;
       printf("Blender Engine Listing:\n");
-      for (type = R_engines.first; type; type = type->next) {
+      for (type = static_cast<RenderEngineType *>(R_engines.first); type; type = type->next) {
         printf("\t%s\n", type->idname);
       }
       exit(0);
@@ -1711,7 +1655,7 @@ static const char arg_handle_image_type_set_doc[] =
     "\t'HDR' 'TIFF' 'OPEN_EXR' 'OPEN_EXR_MULTILAYER' 'MPEG' 'CINEON' 'DPX' 'DDS' 'JP2' 'WEBP'.";
 static int arg_handle_image_type_set(int argc, const char **argv, void *data)
 {
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   if (argc > 1) {
     const char *imtype = argv[1];
     Scene *scene = CTX_data_scene(C);
@@ -1743,14 +1687,14 @@ static const char arg_handle_threads_set_doc[] =
     "<threads>\n"
     "\tUse amount of <threads> for rendering and other operations\n"
     "\t[1-" STRINGIFY(BLENDER_MAX_THREADS) "], 0 for systems processor count.";
-static int arg_handle_threads_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_threads_set(int argc, const char **argv, void * /*data*/)
 {
   const char *arg_id = "-t / --threads";
   const int min = 0, max = BLENDER_MAX_THREADS;
   if (argc > 1) {
-    const char *err_msg = NULL;
+    const char *err_msg = nullptr;
     int threads;
-    if (!parse_int_strict_range(argv[1], NULL, min, max, &threads, &err_msg)) {
+    if (!parse_int_strict_range(argv[1], nullptr, min, max, &threads, &err_msg)) {
       fprintf(stderr,
               "\nError: %s '%s %s', expected number in [%d..%d].\n",
               err_msg,
@@ -1775,13 +1719,13 @@ static int arg_handle_threads_set(int argc, const char **argv, void *UNUSED(data
 static const char arg_handle_verbosity_set_doc[] =
     "<verbose>\n"
     "\tSet the logging verbosity level for debug messages that support it.";
-static int arg_handle_verbosity_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_verbosity_set(int argc, const char **argv, void * /*data*/)
 {
   const char *arg_id = "--verbose";
   if (argc > 1) {
-    const char *err_msg = NULL;
+    const char *err_msg = nullptr;
     int level;
-    if (!parse_int(argv[1], NULL, &level, &err_msg)) {
+    if (!parse_int(argv[1], nullptr, &level, &err_msg)) {
       fprintf(stderr, "\nError: %s '%s %s'.\n", err_msg, arg_id, argv[1]);
     }
 
@@ -1804,7 +1748,7 @@ static const char arg_handle_extension_set_doc[] =
     "\tSet option to add the file extension to the end of the file.";
 static int arg_handle_extension_set(int argc, const char **argv, void *data)
 {
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   if (argc > 1) {
     Scene *scene = CTX_data_scene(C);
     if (scene) {
@@ -1843,13 +1787,13 @@ static const char arg_handle_render_frame_doc[] =
 static int arg_handle_render_frame(int argc, const char **argv, void *data)
 {
   const char *arg_id = "-f / --render-frame";
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   Scene *scene = CTX_data_scene(C);
   if (scene) {
     Main *bmain = CTX_data_main(C);
 
     if (argc > 1) {
-      const char *err_msg = NULL;
+      const char *err_msg = nullptr;
       Render *re;
       ReportList reports;
 
@@ -1860,7 +1804,7 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data)
                                                               MINAFRAME,
                                                               MAXFRAME,
                                                               &frames_range_len,
-                                                              &err_msg)) == NULL)
+                                                              &err_msg)) == nullptr)
       {
         fprintf(stderr, "\nError: %s '%s %s'.\n", err_msg, arg_id, argv[1]);
         return 1;
@@ -1877,10 +1821,10 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data)
         }
 
         for (int frame = frame_range_arr[i][0]; frame <= frame_range_arr[i][1]; frame++) {
-          RE_RenderAnim(re, bmain, scene, NULL, NULL, frame, frame, scene->r.frame_step);
+          RE_RenderAnim(re, bmain, scene, nullptr, nullptr, frame, frame, scene->r.frame_step);
         }
       }
-      RE_SetReports(re, NULL);
+      RE_SetReports(re, nullptr);
       BKE_reports_clear(&reports);
       MEM_freeN(frame_range_arr);
       return 1;
@@ -1895,9 +1839,9 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data)
 static const char arg_handle_render_animation_doc[] =
     "\n\t"
     "Render frames from start to end (inclusive).";
-static int arg_handle_render_animation(int UNUSED(argc), const char **UNUSED(argv), void *data)
+static int arg_handle_render_animation(int /*argc*/, const char ** /*argv*/, void *data)
 {
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   Scene *scene = CTX_data_scene(C);
   if (scene) {
     Main *bmain = CTX_data_main(C);
@@ -1905,8 +1849,9 @@ static int arg_handle_render_animation(int UNUSED(argc), const char **UNUSED(arg
     ReportList reports;
     BKE_reports_init(&reports, RPT_STORE);
     RE_SetReports(re, &reports);
-    RE_RenderAnim(re, bmain, scene, NULL, NULL, scene->r.sfra, scene->r.efra, scene->r.frame_step);
-    RE_SetReports(re, NULL);
+    RE_RenderAnim(
+        re, bmain, scene, nullptr, nullptr, scene->r.sfra, scene->r.efra, scene->r.frame_step);
+    RE_SetReports(re, nullptr);
     BKE_reports_clear(&reports);
   }
   else {
@@ -1921,7 +1866,7 @@ static const char arg_handle_scene_set_doc[] =
 static int arg_handle_scene_set(int argc, const char **argv, void *data)
 {
   if (argc > 1) {
-    bContext *C = data;
+    bContext *C = static_cast<bContext *>(data);
     Scene *scene = BKE_scene_set_name(CTX_data_main(C), argv[1]);
     if (scene) {
       CTX_data_scene_set(C, scene);
@@ -1929,10 +1874,10 @@ static int arg_handle_scene_set(int argc, const char **argv, void *data)
       /* Set the scene of the first window, see: #55991,
        * otherwise scripts that run later won't get this scene back from the context. */
       wmWindow *win = CTX_wm_window(C);
-      if (win == NULL) {
-        win = CTX_wm_manager(C)->windows.first;
+      if (win == nullptr) {
+        win = static_cast<wmWindow *>(CTX_wm_manager(C)->windows.first);
       }
-      if (win != NULL) {
+      if (win != nullptr) {
         WM_window_set_active_scene(CTX_data_main(C), C, win, scene);
       }
     }
@@ -1948,13 +1893,13 @@ static const char arg_handle_frame_start_set_doc[] =
 static int arg_handle_frame_start_set(int argc, const char **argv, void *data)
 {
   const char *arg_id = "-s / --frame-start";
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   Scene *scene = CTX_data_scene(C);
   if (scene) {
     if (argc > 1) {
-      const char *err_msg = NULL;
+      const char *err_msg = nullptr;
       if (!parse_int_relative_clamp(argv[1],
-                                    NULL,
+                                    nullptr,
                                     scene->r.sfra,
                                     scene->r.sfra - 1,
                                     MINAFRAME,
@@ -1982,13 +1927,13 @@ static const char arg_handle_frame_end_set_doc[] =
 static int arg_handle_frame_end_set(int argc, const char **argv, void *data)
 {
   const char *arg_id = "-e / --frame-end";
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   Scene *scene = CTX_data_scene(C);
   if (scene) {
     if (argc > 1) {
-      const char *err_msg = NULL;
+      const char *err_msg = nullptr;
       if (!parse_int_relative_clamp(argv[1],
-                                    NULL,
+                                    nullptr,
                                     scene->r.efra,
                                     scene->r.efra - 1,
                                     MINAFRAME,
@@ -2016,12 +1961,12 @@ static const char arg_handle_frame_skip_set_doc[] =
 static int arg_handle_frame_skip_set(int argc, const char **argv, void *data)
 {
   const char *arg_id = "-j / --frame-jump";
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   Scene *scene = CTX_data_scene(C);
   if (scene) {
     if (argc > 1) {
-      const char *err_msg = NULL;
-      if (!parse_int_clamp(argv[1], NULL, 1, MAXFRAME, &scene->r.frame_step, &err_msg)) {
+      const char *err_msg = nullptr;
+      if (!parse_int_clamp(argv[1], nullptr, 1, MAXFRAME, &scene->r.frame_step, &err_msg)) {
         fprintf(stderr, "\nError: %s '%s %s'.\n", err_msg, arg_id, argv[1]);
       }
       else {
@@ -2042,7 +1987,7 @@ static const char arg_handle_python_file_run_doc[] =
 static int arg_handle_python_file_run(int argc, const char **argv, void *data)
 {
 #  ifdef WITH_PYTHON
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
 
   /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */
   if (argc > 1) {
@@ -2052,7 +1997,7 @@ static int arg_handle_python_file_run(int argc, const char **argv, void *data)
     BLI_path_canonicalize_native(filepath, sizeof(filepath));
 
     bool ok;
-    BPY_CTX_SETUP(ok = BPY_run_filepath(C, filepath, NULL));
+    BPY_CTX_SETUP(ok = BPY_run_filepath(C, filepath, nullptr));
     if (!ok && app_state.exit_code_on_error.python) {
       fprintf(stderr, "\nError: script failed, file: '%s', exiting.\n", argv[1]);
       WM_exit(C, app_state.exit_code_on_error.python);
@@ -2075,7 +2020,7 @@ static const char arg_handle_python_text_run_doc[] =
 static int arg_handle_python_text_run(int argc, const char **argv, void *data)
 {
 #  ifdef WITH_PYTHON
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
 
   /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */
   if (argc > 1) {
@@ -2085,7 +2030,7 @@ static int arg_handle_python_text_run(int argc, const char **argv, void *data)
     bool ok;
 
     if (text) {
-      BPY_CTX_SETUP(ok = BPY_run_text(C, text, NULL, false));
+      BPY_CTX_SETUP(ok = BPY_run_text(C, text, nullptr, false));
     }
     else {
       fprintf(stderr, "\nError: text block not found %s.\n", argv[1]);
@@ -2115,12 +2060,12 @@ static const char arg_handle_python_expr_run_doc[] =
 static int arg_handle_python_expr_run(int argc, const char **argv, void *data)
 {
 #  ifdef WITH_PYTHON
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
 
   /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */
   if (argc > 1) {
     bool ok;
-    BPY_CTX_SETUP(ok = BPY_run_string_exec(C, NULL, argv[1]));
+    BPY_CTX_SETUP(ok = BPY_run_string_exec(C, nullptr, argv[1]));
     if (!ok && app_state.exit_code_on_error.python) {
       fprintf(stderr, "\nError: script failed, expr: '%s', exiting.\n", argv[1]);
       WM_exit(C, app_state.exit_code_on_error.python);
@@ -2140,12 +2085,13 @@ static int arg_handle_python_expr_run(int argc, const char **argv, void *data)
 static const char arg_handle_python_console_run_doc[] =
     "\n\t"
     "Run Blender with an interactive console.";
-static int arg_handle_python_console_run(int UNUSED(argc), const char **argv, void *data)
+static int arg_handle_python_console_run(int /*argc*/, const char **argv, void *data)
 {
 #  ifdef WITH_PYTHON
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
 
-  BPY_CTX_SETUP(BPY_run_string_eval(C, (const char *[]){"code", NULL}, "code.interact()"));
+  const char *imports[] = {"code", nullptr};
+  BPY_CTX_SETUP(BPY_run_string_eval(C, imports, "code.interact()"));
 
   return 0;
 #  else
@@ -2159,14 +2105,14 @@ static const char arg_handle_python_exit_code_set_doc[] =
     "<code>\n"
     "\tSet the exit-code in [0..255] to exit if a Python exception is raised\n"
     "\t(only for scripts executed from the command line), zero disables.";
-static int arg_handle_python_exit_code_set(int argc, const char **argv, void *UNUSED(data))
+static int arg_handle_python_exit_code_set(int argc, const char **argv, void * /*data*/)
 {
   const char *arg_id = "--python-exit-code";
   if (argc > 1) {
-    const char *err_msg = NULL;
+    const char *err_msg = nullptr;
     const int min = 0, max = 255;
     int exit_code;
-    if (!parse_int_strict_range(argv[1], NULL, min, max, &exit_code, &err_msg)) {
+    if (!parse_int_strict_range(argv[1], nullptr, min, max, &exit_code, &err_msg)) {
       fprintf(stderr,
               "\nError: %s '%s %s', expected number in [%d..%d].\n",
               err_msg,
@@ -2188,9 +2134,9 @@ static const char arg_handle_python_use_system_env_set_doc[] =
     "\n\t"
     "Allow Python to use system environment variables such as 'PYTHONPATH' and the user "
     "site-packages directory.";
-static int arg_handle_python_use_system_env_set(int UNUSED(argc),
-                                                const char **UNUSED(argv),
-                                                void *UNUSED(data))
+static int arg_handle_python_use_system_env_set(int /*argc*/,
+                                                const char ** /*argv*/,
+                                                void * /*data*/)
 {
 #  ifdef WITH_PYTHON
   BPY_python_use_system_env();
@@ -2212,12 +2158,12 @@ static int arg_handle_addons_set(int argc, const char **argv, void *data)
         "    if check(m)[1] is False:\n"
         "        enable(m, persistent=True)";
     const int slen = strlen(argv[1]) + (sizeof(script_str) - 2);
-    char *str = malloc(slen);
-    bContext *C = data;
+    char *str = static_cast<char *>(malloc(slen));
+    bContext *C = static_cast<bContext *>(data);
     BLI_snprintf(str, slen, script_str, argv[1]);
 
     BLI_assert(strlen(str) + 1 == slen);
-    BPY_CTX_SETUP(BPY_run_string_exec(C, NULL, str));
+    BPY_CTX_SETUP(BPY_run_string_exec(C, nullptr, str));
     free(str);
 #  else
     UNUSED_VARS(argv, data);
@@ -2249,7 +2195,7 @@ static bool handle_load_file(bContext *C, const char *filepath_arg, const bool l
   if (success) {
     if (G.background) {
       /* Ensure we use 'C->data.scene' for background render. */
-      CTX_wm_window_set(C, NULL);
+      CTX_wm_window_set(C, nullptr);
     }
   }
   else {
@@ -2265,7 +2211,7 @@ static bool handle_load_file(bContext *C, const char *filepath_arg, const bool l
     }
 
     const char *error_msg_generic = "file could not be loaded";
-    const char *error_msg = NULL;
+    const char *error_msg = nullptr;
 
     if (load_empty_file == false) {
       error_msg = error_msg_generic;
@@ -2304,9 +2250,9 @@ static bool handle_load_file(bContext *C, const char *filepath_arg, const bool l
   return true;
 }
 
-int main_args_handle_load_file(int UNUSED(argc), const char **argv, void *data)
+int main_args_handle_load_file(int /*argc*/, const char **argv, void *data)
 {
-  bContext *C = data;
+  bContext *C = static_cast<bContext *>(data);
   const char *filepath = argv[0];
 
   /* NOTE: we could skip these, but so far we always tried to load these files. */
@@ -2323,15 +2269,15 @@ int main_args_handle_load_file(int UNUSED(argc), const char **argv, void *data)
 static const char arg_handle_load_last_file_doc[] =
     "\n\t"
     "Open the most recently opened blend file, instead of the default startup file.";
-static int arg_handle_load_last_file(int UNUSED(argc), const char **UNUSED(argv), void *data)
+static int arg_handle_load_last_file(int /*argc*/, const char ** /*argv*/, void *data)
 {
   if (BLI_listbase_is_empty(&G.recent_files)) {
     fprintf(stderr, "Warning: no recent files known, opening default startup file instead.\n");
     return -1;
   }
 
-  bContext *C = data;
-  const RecentFile *recent_file = G.recent_files.first;
+  bContext *C = static_cast<bContext *>(data);
+  const RecentFile *recent_file = static_cast<const RecentFile *>(G.recent_files.first);
   if (!handle_load_file(C, recent_file->filepath, false)) {
     return -1;
   }
@@ -2340,11 +2286,11 @@ static int arg_handle_load_last_file(int UNUSED(argc), const char **UNUSED(argv)
 
 void main_args_setup(bContext *C, bArgs *ba, bool all)
 {
-  /** Expand the doc-string from the function. */
+/** Expand the doc-string from the function. */
 #  define CB(a) a##_doc, a
-  /** A version of `CB` that expands an additional suffix. */
+/** A version of `CB` that expands an additional suffix. */
 #  define CB_EX(a, b) a##_doc_##b, a
-  /** A version of `CB` that uses `all`, needed when the doc-string depends on build options. */
+/** A version of `CB` that uses `all`, needed when the doc-string depends on build options. */
 #  define CB_ALL(a) (all ? a##_doc_all : a##_doc), a
 
   struct BuildDefs defs;
@@ -2352,7 +2298,7 @@ void main_args_setup(bContext *C, bArgs *ba, bool all)
 
   /* end argument processing after -- */
   BLI_args_pass_set(ba, -1);
-  BLI_args_add(ba, "--", NULL, CB(arg_handle_arguments_end), NULL);
+  BLI_args_add(ba, "--", nullptr, CB(arg_handle_arguments_end), nullptr);
 
   /* Pass: Environment Setup
    *
@@ -2361,28 +2307,30 @@ void main_args_setup(bContext *C, bArgs *ba, bool all)
    * sub-systems such as color management. */
   BLI_args_pass_set(ba, ARG_PASS_ENVIRONMENT);
   BLI_args_add(
-      ba, NULL, "--python-use-system-env", CB(arg_handle_python_use_system_env_set), NULL);
+      ba, nullptr, "--python-use-system-env", CB(arg_handle_python_use_system_env_set), nullptr);
 
   /* Note that we could add used environment variables too. */
   BLI_args_add(
-      ba, NULL, "--env-system-datafiles", CB_EX(arg_handle_env_system_set, datafiles), NULL);
-  BLI_args_add(ba, NULL, "--env-system-scripts", CB_EX(arg_handle_env_system_set, scripts), NULL);
-  BLI_args_add(ba, NULL, "--env-system-python", CB_EX(arg_handle_env_system_set, python), NULL);
+      ba, nullptr, "--env-system-datafiles", CB_EX(arg_handle_env_system_set, datafiles), nullptr);
+  BLI_args_add(
+      ba, nullptr, "--env-system-scripts", CB_EX(arg_handle_env_system_set, scripts), nullptr);
+  BLI_args_add(
+      ba, nullptr, "--env-system-python", CB_EX(arg_handle_env_system_set, python), nullptr);
 
-  BLI_args_add(ba, "-t", "--threads", CB(arg_handle_threads_set), NULL);
+  BLI_args_add(ba, "-t", "--threads", CB(arg_handle_threads_set), nullptr);
 
   /* Include in the environment pass so it's possible display errors initializing subsystems,
    * especially `bpy.appdir` since it's useful to show errors finding paths on startup. */
-  BLI_args_add(ba, NULL, "--log", CB(arg_handle_log_set), ba);
-  BLI_args_add(ba, NULL, "--log-level", CB(arg_handle_log_level_set), ba);
-  BLI_args_add(ba, NULL, "--log-show-basename", CB(arg_handle_log_show_basename_set), ba);
-  BLI_args_add(ba, NULL, "--log-show-backtrace", CB(arg_handle_log_show_backtrace_set), ba);
-  BLI_args_add(ba, NULL, "--log-show-timestamp", CB(arg_handle_log_show_timestamp_set), ba);
-  BLI_args_add(ba, NULL, "--log-file", CB(arg_handle_log_file_set), ba);
+  BLI_args_add(ba, nullptr, "--log", CB(arg_handle_log_set), ba);
+  BLI_args_add(ba, nullptr, "--log-level", CB(arg_handle_log_level_set), ba);
+  BLI_args_add(ba, nullptr, "--log-show-basename", CB(arg_handle_log_show_basename_set), ba);
+  BLI_args_add(ba, nullptr, "--log-show-backtrace", CB(arg_handle_log_show_backtrace_set), ba);
+  BLI_args_add(ba, nullptr, "--log-show-timestamp", CB(arg_handle_log_show_timestamp_set), ba);
+  BLI_args_add(ba, nullptr, "--log-file", CB(arg_handle_log_file_set), ba);
 
   /* GPU backend selection should be part of #ARG_PASS_ENVIRONMENT for correct GPU context
    * selection for animation player. */
-  BLI_args_add(ba, NULL, "--gpu-backend", CB_ALL(arg_handle_gpu_backend_set), NULL);
+  BLI_args_add(ba, nullptr, "--gpu-backend", CB_ALL(arg_handle_gpu_backend_set), nullptr);
 
   /* Pass: Background Mode & Settings
    *
@@ -2390,26 +2338,28 @@ void main_args_setup(bContext *C, bArgs *ba, bool all)
   BLI_args_pass_set(ba, ARG_PASS_SETTINGS);
   BLI_args_add(ba, "-h", "--help", CB(arg_handle_print_help), ba);
   /* Windows only */
-  BLI_args_add(ba, "/?", NULL, CB_EX(arg_handle_print_help, win32), ba);
+  BLI_args_add(ba, "/?", nullptr, CB_EX(arg_handle_print_help, win32), ba);
 
-  BLI_args_add(ba, "-v", "--version", CB(arg_handle_print_version), NULL);
+  BLI_args_add(ba, "-v", "--version", CB(arg_handle_print_version), nullptr);
 
   BLI_args_add(ba, "-y", "--enable-autoexec", CB_EX(arg_handle_python_set, enable), (void *)true);
   BLI_args_add(
       ba, "-Y", "--disable-autoexec", CB_EX(arg_handle_python_set, disable), (void *)false);
 
-  BLI_args_add(ba, NULL, "--disable-crash-handler", CB(arg_handle_crash_handler_disable), NULL);
-  BLI_args_add(ba, NULL, "--disable-abort-handler", CB(arg_handle_abort_handler_disable), NULL);
+  BLI_args_add(
+      ba, nullptr, "--disable-crash-handler", CB(arg_handle_crash_handler_disable), nullptr);
+  BLI_args_add(
+      ba, nullptr, "--disable-abort-handler", CB(arg_handle_abort_handler_disable), nullptr);
 
-  BLI_args_add(ba, "-b", "--background", CB(arg_handle_background_mode_set), NULL);
+  BLI_args_add(ba, "-b", "--background", CB(arg_handle_background_mode_set), nullptr);
 
-  BLI_args_add(ba, "-a", NULL, CB(arg_handle_playback_mode), NULL);
+  BLI_args_add(ba, "-a", nullptr, CB(arg_handle_playback_mode), nullptr);
 
   BLI_args_add(ba, "-d", "--debug", CB(arg_handle_debug_mode_set), ba);
 
   if (defs.with_ffmpeg) {
     BLI_args_add(ba,
-                 NULL,
+                 nullptr,
                  "--debug-ffmpeg",
                  CB_EX(arg_handle_debug_mode_generic_set, ffmpeg),
                  (void *)G_DEBUG_FFMPEG);
@@ -2417,149 +2367,155 @@ void main_args_setup(bContext *C, bArgs *ba, bool all)
 
   if (defs.with_freestyle) {
     BLI_args_add(ba,
-                 NULL,
+                 nullptr,
                  "--debug-freestyle",
                  CB_EX(arg_handle_debug_mode_generic_set, freestyle),
                  (void *)G_DEBUG_FREESTYLE);
   }
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-python",
                CB_EX(arg_handle_debug_mode_generic_set, python),
                (void *)G_DEBUG_PYTHON);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-events",
                CB_EX(arg_handle_debug_mode_generic_set, events),
                (void *)G_DEBUG_EVENTS);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-handlers",
                CB_EX(arg_handle_debug_mode_generic_set, handlers),
                (void *)G_DEBUG_HANDLERS);
   BLI_args_add(
-      ba, NULL, "--debug-wm", CB_EX(arg_handle_debug_mode_generic_set, wm), (void *)G_DEBUG_WM);
+      ba, nullptr, "--debug-wm", CB_EX(arg_handle_debug_mode_generic_set, wm), (void *)G_DEBUG_WM);
   if (defs.with_xr_openxr) {
-    BLI_args_add(
-        ba, NULL, "--debug-xr", CB_EX(arg_handle_debug_mode_generic_set, xr), (void *)G_DEBUG_XR);
     BLI_args_add(ba,
-                 NULL,
+                 nullptr,
+                 "--debug-xr",
+                 CB_EX(arg_handle_debug_mode_generic_set, xr),
+                 (void *)G_DEBUG_XR);
+    BLI_args_add(ba,
+                 nullptr,
                  "--debug-xr-time",
                  CB_EX(arg_handle_debug_mode_generic_set, xr_time),
                  (void *)G_DEBUG_XR_TIME);
   }
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-ghost",
                CB_EX(arg_handle_debug_mode_generic_set, ghost),
                (void *)G_DEBUG_GHOST);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-wintab",
                CB_EX(arg_handle_debug_mode_generic_set, wintab),
                (void *)G_DEBUG_WINTAB);
-  BLI_args_add(ba, NULL, "--debug-all", CB(arg_handle_debug_mode_all), NULL);
+  BLI_args_add(ba, nullptr, "--debug-all", CB(arg_handle_debug_mode_all), nullptr);
 
-  BLI_args_add(ba, NULL, "--debug-io", CB(arg_handle_debug_mode_io), NULL);
+  BLI_args_add(ba, nullptr, "--debug-io", CB(arg_handle_debug_mode_io), nullptr);
 
-  BLI_args_add(ba, NULL, "--debug-fpe", CB(arg_handle_debug_fpe_set), NULL);
+  BLI_args_add(ba, nullptr, "--debug-fpe", CB(arg_handle_debug_fpe_set), nullptr);
 
   if (defs.with_libmv) {
-    BLI_args_add(ba, NULL, "--debug-libmv", CB(arg_handle_debug_mode_libmv), NULL);
+    BLI_args_add(ba, nullptr, "--debug-libmv", CB(arg_handle_debug_mode_libmv), nullptr);
   }
   if (defs.with_cycles_logging) {
-    BLI_args_add(ba, NULL, "--debug-cycles", CB(arg_handle_debug_mode_cycles), NULL);
+    BLI_args_add(ba, nullptr, "--debug-cycles", CB(arg_handle_debug_mode_cycles), nullptr);
   }
-  BLI_args_add(ba, NULL, "--debug-memory", CB(arg_handle_debug_mode_memory_set), NULL);
+  BLI_args_add(ba, nullptr, "--debug-memory", CB(arg_handle_debug_mode_memory_set), nullptr);
 
-  BLI_args_add(ba, NULL, "--debug-value", CB(arg_handle_debug_value_set), NULL);
+  BLI_args_add(ba, nullptr, "--debug-value", CB(arg_handle_debug_value_set), nullptr);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-jobs",
                CB_EX(arg_handle_debug_mode_generic_set, jobs),
                (void *)G_DEBUG_JOBS);
-  BLI_args_add(ba, NULL, "--debug-gpu", CB(arg_handle_debug_gpu_set), NULL);
+  BLI_args_add(ba, nullptr, "--debug-gpu", CB(arg_handle_debug_gpu_set), nullptr);
   if (defs.with_renderdoc) {
-    BLI_args_add(ba, NULL, "--debug-gpu-renderdoc", CB(arg_handle_debug_gpu_renderdoc_set), NULL);
+    BLI_args_add(
+        ba, nullptr, "--debug-gpu-renderdoc", CB(arg_handle_debug_gpu_renderdoc_set), nullptr);
   }
 
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-depsgraph",
                CB_EX(arg_handle_debug_mode_generic_set, depsgraph),
                (void *)G_DEBUG_DEPSGRAPH);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-depsgraph-build",
                CB_EX(arg_handle_debug_mode_generic_set, depsgraph_build),
                (void *)G_DEBUG_DEPSGRAPH_BUILD);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-depsgraph-eval",
                CB_EX(arg_handle_debug_mode_generic_set, depsgraph_eval),
                (void *)G_DEBUG_DEPSGRAPH_EVAL);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-depsgraph-tag",
                CB_EX(arg_handle_debug_mode_generic_set, depsgraph_tag),
                (void *)G_DEBUG_DEPSGRAPH_TAG);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-depsgraph-time",
                CB_EX(arg_handle_debug_mode_generic_set, depsgraph_time),
                (void *)G_DEBUG_DEPSGRAPH_TIME);
   BLI_args_add(ba,
 
-               NULL,
+               nullptr,
                "--debug-depsgraph-no-threads",
                CB_EX(arg_handle_debug_mode_generic_set, depsgraph_no_threads),
                (void *)G_DEBUG_DEPSGRAPH_NO_THREADS);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-depsgraph-pretty",
                CB_EX(arg_handle_debug_mode_generic_set, depsgraph_pretty),
                (void *)G_DEBUG_DEPSGRAPH_PRETTY);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-depsgraph-uuid",
                CB_EX(arg_handle_debug_mode_generic_set, depsgraph_uuid),
                (void *)G_DEBUG_DEPSGRAPH_UUID);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-gpu-force-workarounds",
                CB_EX(arg_handle_debug_mode_generic_set, gpu_force_workarounds),
                (void *)G_DEBUG_GPU_FORCE_WORKAROUNDS);
   BLI_args_add(ba,
-               NULL,
+               nullptr,
                "--debug-gpu-disable-ssbo",
                CB_EX(arg_handle_debug_mode_generic_set, gpu_disable_ssbo),
                (void *)G_DEBUG_GPU_FORCE_DISABLE_SSBO);
-  BLI_args_add(ba, NULL, "--debug-exit-on-error", CB(arg_handle_debug_exit_on_error), NULL);
+  BLI_args_add(ba, nullptr, "--debug-exit-on-error", CB(arg_handle_debug_exit_on_error), nullptr);
 
-  BLI_args_add(ba, NULL, "--verbose", CB(arg_handle_verbosity_set), NULL);
+  BLI_args_add(ba, nullptr, "--verbose", CB(arg_handle_verbosity_set), nullptr);
 
-  BLI_args_add(ba, NULL, "--app-template", CB(arg_handle_app_template), NULL);
-  BLI_args_add(ba, NULL, "--factory-startup", CB(arg_handle_factory_startup_set), NULL);
-  BLI_args_add(ba, NULL, "--enable-event-simulate", CB(arg_handle_enable_event_simulate), NULL);
+  BLI_args_add(ba, nullptr, "--app-template", CB(arg_handle_app_template), nullptr);
+  BLI_args_add(ba, nullptr, "--factory-startup", CB(arg_handle_factory_startup_set), nullptr);
+  BLI_args_add(
+      ba, nullptr, "--enable-event-simulate", CB(arg_handle_enable_event_simulate), nullptr);
 
   /* Pass: Custom Window Stuff. */
   BLI_args_pass_set(ba, ARG_PASS_SETTINGS_GUI);
-  BLI_args_add(ba, "-p", "--window-geometry", CB(arg_handle_window_geometry), NULL);
-  BLI_args_add(ba, "-w", "--window-border", CB(arg_handle_with_borders), NULL);
-  BLI_args_add(ba, "-W", "--window-fullscreen", CB(arg_handle_without_borders), NULL);
-  BLI_args_add(ba, "-M", "--window-maximized", CB(arg_handle_window_maximized), NULL);
-  BLI_args_add(ba, NULL, "--no-window-focus", CB(arg_handle_no_window_focus), NULL);
-  BLI_args_add(ba, "-con", "--start-console", CB(arg_handle_start_with_console), NULL);
-  BLI_args_add(ba, "-r", "--register", CB(arg_handle_register_extension), NULL);
-  BLI_args_add(ba, NULL, "--register-allusers", CB(arg_handle_register_extension_all), NULL);
-  BLI_args_add(ba, NULL, "--unregister", CB(arg_handle_unregister_extension), NULL);
-  BLI_args_add(ba, NULL, "--unregister-allusers", CB(arg_handle_unregister_extension_all), NULL);
-  BLI_args_add(ba, NULL, "--no-native-pixels", CB(arg_handle_native_pixels_set), ba);
+  BLI_args_add(ba, "-p", "--window-geometry", CB(arg_handle_window_geometry), nullptr);
+  BLI_args_add(ba, "-w", "--window-border", CB(arg_handle_with_borders), nullptr);
+  BLI_args_add(ba, "-W", "--window-fullscreen", CB(arg_handle_without_borders), nullptr);
+  BLI_args_add(ba, "-M", "--window-maximized", CB(arg_handle_window_maximized), nullptr);
+  BLI_args_add(ba, nullptr, "--no-window-focus", CB(arg_handle_no_window_focus), nullptr);
+  BLI_args_add(ba, "-con", "--start-console", CB(arg_handle_start_with_console), nullptr);
+  BLI_args_add(ba, "-r", "--register", CB(arg_handle_register_extension), nullptr);
+  BLI_args_add(ba, nullptr, "--register-allusers", CB(arg_handle_register_extension_all), nullptr);
+  BLI_args_add(ba, nullptr, "--unregister", CB(arg_handle_unregister_extension), nullptr);
+  BLI_args_add(
+      ba, nullptr, "--unregister-allusers", CB(arg_handle_unregister_extension_all), nullptr);
+  BLI_args_add(ba, nullptr, "--no-native-pixels", CB(arg_handle_native_pixels_set), ba);
 
   /* Pass: Disabling Things & Forcing Settings. */
   BLI_args_pass_set(ba, ARG_PASS_SETTINGS_FORCE);
-  BLI_args_add_case(ba, "-noaudio", 1, NULL, 0, CB(arg_handle_audio_disable), NULL);
-  BLI_args_add_case(ba, "-setaudio", 1, NULL, 0, CB(arg_handle_audio_set), NULL);
+  BLI_args_add_case(ba, "-noaudio", 1, nullptr, 0, CB(arg_handle_audio_disable), nullptr);
+  BLI_args_add_case(ba, "-setaudio", 1, nullptr, 0, CB(arg_handle_audio_set), nullptr);
 
   /* Pass: Processing Arguments. */
   /* NOTE: Use #WM_exit for these callbacks, not `exit()`
@@ -2572,11 +2528,11 @@ void main_args_setup(bContext *C, bArgs *ba, bool all)
   BLI_args_add(ba, "-e", "--frame-end", CB(arg_handle_frame_end_set), C);
   BLI_args_add(ba, "-j", "--frame-jump", CB(arg_handle_frame_skip_set), C);
   BLI_args_add(ba, "-P", "--python", CB(arg_handle_python_file_run), C);
-  BLI_args_add(ba, NULL, "--python-text", CB(arg_handle_python_text_run), C);
-  BLI_args_add(ba, NULL, "--python-expr", CB(arg_handle_python_expr_run), C);
-  BLI_args_add(ba, NULL, "--python-console", CB(arg_handle_python_console_run), C);
-  BLI_args_add(ba, NULL, "--python-exit-code", CB(arg_handle_python_exit_code_set), NULL);
-  BLI_args_add(ba, NULL, "--addons", CB(arg_handle_addons_set), C);
+  BLI_args_add(ba, nullptr, "--python-text", CB(arg_handle_python_text_run), C);
+  BLI_args_add(ba, nullptr, "--python-expr", CB(arg_handle_python_expr_run), C);
+  BLI_args_add(ba, nullptr, "--python-console", CB(arg_handle_python_console_run), C);
+  BLI_args_add(ba, nullptr, "--python-exit-code", CB(arg_handle_python_exit_code_set), nullptr);
+  BLI_args_add(ba, nullptr, "--addons", CB(arg_handle_addons_set), C);
 
   BLI_args_add(ba, "-o", "--render-output", CB(arg_handle_output_set), C);
   BLI_args_add(ba, "-E", "--engine", CB(arg_handle_engine_set), C);
@@ -2584,7 +2540,7 @@ void main_args_setup(bContext *C, bArgs *ba, bool all)
   BLI_args_add(ba, "-F", "--render-format", CB(arg_handle_image_type_set), C);
   BLI_args_add(ba, "-x", "--use-extension", CB(arg_handle_extension_set), C);
 
-  BLI_args_add(ba, NULL, "--open-last", CB(arg_handle_load_last_file), C);
+  BLI_args_add(ba, nullptr, "--open-last", CB(arg_handle_load_last_file), C);
 
 #  undef CB
 #  undef CB_EX
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.cc
similarity index 94%
rename from source/creator/creator_signals.c
rename to source/creator/creator_signals.cc
index 6beef05db76..ed0b90fe869 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.cc
@@ -9,7 +9,9 @@
 #ifndef WITH_PYTHON_MODULE
 
 #  if defined(__linux__) && defined(__GNUC__)
-#    define _GNU_SOURCE
+#    ifndef _GNU_SOURCE
+#      define _GNU_SOURCE
+#    endif
 #    include <fenv.h>
 #  endif
 
@@ -61,7 +63,7 @@
 
 /* set breakpoints here when running in debug mode, useful to catch floating point errors */
 #  if defined(__linux__) || defined(_WIN32) || defined(OSX_SSE_FPE)
-static void sig_handle_fpe(int UNUSED(sig))
+static void sig_handle_fpe(int /*sig*/)
 {
   fprintf(stderr, "debug: SIGFPE trapped\n");
 }
@@ -91,10 +93,10 @@ static void sig_handle_crash_backtrace(FILE *fp)
 
 static void sig_handle_crash(int signum)
 {
-  /* Might be called after WM/Main exit, so needs to be careful about NULL-checking before
+  /* Might be called after WM/Main exit, so needs to be careful about nullptr-checking before
    * de-referencing. */
 
-  wmWindowManager *wm = G_MAIN ? G_MAIN->wm.first : NULL;
+  wmWindowManager *wm = G_MAIN ? static_cast<wmWindowManager *>(G_MAIN->wm.first) : nullptr;
 
 #  ifdef USE_WRITE_CRASH_BLEND
   if (wm && wm->undo_stack) {
@@ -149,7 +151,7 @@ static void sig_handle_crash(int signum)
   /* open the crash log */
   errno = 0;
   fp = BLI_fopen(filepath, "wb");
-  if (fp == NULL) {
+  if (fp == nullptr) {
     fprintf(stderr,
             "Unable to save '%s': %s\n",
             filepath,
@@ -193,7 +195,7 @@ extern LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo)
     LPVOID address = ExceptionInfo->ExceptionRecord->ExceptionAddress;
     fprintf(stderr, "Error   : EXCEPTION_STACK_OVERFLOW\n");
     fprintf(stderr, "Address : 0x%p\n", address);
-    if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, address, &mod)) {
+    if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, LPCSTR(address), &mod)) {
       if (GetModuleFileName(mod, modulename, MAX_PATH)) {
         fprintf(stderr, "Module  : %s\n", modulename);
       }
@@ -208,7 +210,7 @@ extern LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo)
 }
 #  endif
 
-static void sig_handle_abort(int UNUSED(signum))
+static void sig_handle_abort(int /*signum*/)
 {
   /* Delete content of temp dir! */
   BKE_tempdir_session_purge();
@@ -264,9 +266,9 @@ void main_signal_setup_fpe(void)
 #    endif /* OSX_SSE_FPE */
 #    if defined(_WIN32) && defined(_MSC_VER)
   /* enables all fp exceptions */
-  _controlfp_s(NULL, 0, _MCW_EM);
+  _controlfp_s(nullptr, 0, _MCW_EM);
   /* hide the ones we don't care about */
-  _controlfp_s(NULL, _EM_DENORMAL | _EM_UNDERFLOW | _EM_INEXACT, _MCW_EM);
+  _controlfp_s(nullptr, _EM_DENORMAL | _EM_UNDERFLOW | _EM_INEXACT, _MCW_EM);
 #    endif /* _WIN32 && _MSC_VER */
 #  endif
 }