From 0d945fe20e87ac7ada2d565f751146c2e8fa1ed6 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey@blender.org>
Date: Mon, 7 Nov 2022 15:43:20 +0100
Subject: Fix deprecation warnings about printf() on macOS

The new Xcode 14.1 brings the new Apple Clang compiler which
considers sprintf unsafe and geenrates deprecation warnings
suggesting to sue snprintf instead. This only happens for C++
code by default, and C code can still use sprintf without any
warning.

This changes does the following:

- Whenever is trivial replace sprintf() with BLI_snprintf.
- For all other cases use the newly introduced BLI_sprintf
  which is a wrapper around sprintf() but without warning.

There is a discouragement note in the BLI_sprintf comment to
suggest use of BLI_snprintf when the size is known.

Differential Revision: https://developer.blender.org/D16410
---
 source/blender/editors/render/render_internal.cc | 25 ++++++++++++------------
 source/blender/editors/render/render_preview.cc  |  8 ++++----
 2 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'source/blender/editors/render')

diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc
index e66cabbc9f8..41f1497cac2 100644
--- a/source/blender/editors/render/render_internal.cc
+++ b/source/blender/editors/render/render_internal.cc
@@ -405,56 +405,57 @@ static void make_renderinfo_string(const RenderStats *rs,
 
   /* local view */
   if (rs->localview) {
-    spos += sprintf(spos, "%s | ", TIP_("3D Local View"));
+    spos += BLI_sprintf(spos, "%s | ", TIP_("3D Local View"));
   }
   else if (v3d_override) {
-    spos += sprintf(spos, "%s | ", TIP_("3D View"));
+    spos += BLI_sprintf(spos, "%s | ", TIP_("3D View"));
   }
 
   /* frame number */
-  spos += sprintf(spos, TIP_("Frame:%d "), (scene->r.cfra));
+  spos += BLI_sprintf(spos, TIP_("Frame:%d "), (scene->r.cfra));
 
   /* previous and elapsed time */
   BLI_timecode_string_from_time_simple(info_time_str, sizeof(info_time_str), rs->lastframetime);
 
   if (rs->infostr && rs->infostr[0]) {
     if (rs->lastframetime != 0.0) {
-      spos += sprintf(spos, TIP_("| Last:%s "), info_time_str);
+      spos += BLI_sprintf(spos, TIP_("| Last:%s "), info_time_str);
     }
     else {
-      spos += sprintf(spos, "| ");
+      spos += BLI_sprintf(spos, "| ");
     }
 
     BLI_timecode_string_from_time_simple(
         info_time_str, sizeof(info_time_str), PIL_check_seconds_timer() - rs->starttime);
   }
   else {
-    spos += sprintf(spos, "| ");
+    spos += BLI_sprintf(spos, "| ");
   }
 
-  spos += sprintf(spos, TIP_("Time:%s "), info_time_str);
+  spos += BLI_sprintf(spos, TIP_("Time:%s "), info_time_str);
 
   /* statistics */
   if (rs->statstr) {
     if (rs->statstr[0]) {
-      spos += sprintf(spos, "| %s ", rs->statstr);
+      spos += BLI_sprintf(spos, "| %s ", rs->statstr);
     }
   }
   else {
     if (rs->mem_peak == 0.0f) {
-      spos += sprintf(spos, TIP_("| Mem:%.2fM (Peak %.2fM) "), megs_used_memory, megs_peak_memory);
+      spos += BLI_sprintf(
+          spos, TIP_("| Mem:%.2fM (Peak %.2fM) "), megs_used_memory, megs_peak_memory);
     }
     else {
-      spos += sprintf(spos, TIP_("| Mem:%.2fM, Peak: %.2fM "), rs->mem_used, rs->mem_peak);
+      spos += BLI_sprintf(spos, TIP_("| Mem:%.2fM, Peak: %.2fM "), rs->mem_used, rs->mem_peak);
     }
   }
 
   /* extra info */
   if (rs->infostr && rs->infostr[0]) {
-    spos += sprintf(spos, "| %s ", rs->infostr);
+    spos += BLI_sprintf(spos, "| %s ", rs->infostr);
   }
   else if (error && error[0]) {
-    spos += sprintf(spos, "| %s ", error);
+    spos += BLI_sprintf(spos, "| %s ", error);
   }
 
   /* very weak... but 512 characters is quite safe */
diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc
index 5aae48b1138..5bfa038b4f4 100644
--- a/source/blender/editors/render/render_preview.cc
+++ b/source/blender/editors/render/render_preview.cc
@@ -630,10 +630,10 @@ static bool ed_preview_draw_rect(ScrArea *area, int split, int first, rcti *rect
   bool ok = false;
 
   if (!split || first) {
-    sprintf(name, "Preview %p", (void *)area);
+    BLI_snprintf(name, sizeof(name), "Preview %p", (void *)area);
   }
   else {
-    sprintf(name, "SecondPreview %p", (void *)area);
+    BLI_snprintf(name, sizeof(name), "SecondPreview %p", (void *)area);
   }
 
   if (split) {
@@ -1152,10 +1152,10 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
   }
 
   if (!split || first) {
-    sprintf(name, "Preview %p", sp->owner);
+    BLI_snprintf(name, sizeof(name), "Preview %p", sp->owner);
   }
   else {
-    sprintf(name, "SecondPreview %p", sp->owner);
+    BLI_snprintf(name, sizeof(name), "SecondPreview %p", sp->owner);
   }
   re = RE_GetRender(name);
 
-- 
cgit v1.2.3