[Bf-blender-cvs] [fae0685113c] master: Cleanup: quiet warnings

Campbell Barton noreply at git.blender.org
Mon Oct 7 03:26:37 CEST 2019


Commit: fae0685113c8f8ee380d431c210b25eb689a811f
Author: Campbell Barton
Date:   Mon Oct 7 12:21:27 2019 +1100
Branches: master
https://developer.blender.org/rBfae0685113c8f8ee380d431c210b25eb689a811f

Cleanup: quiet warnings

===================================================================

M	intern/clog/clog.c
M	tests/gtests/blenlib/BLI_memiter_test.cc

===================================================================

diff --git a/intern/clog/clog.c b/intern/clog/clog.c
index da94acd97b1..9074e0f85e1 100644
--- a/intern/clog/clog.c
+++ b/intern/clog/clog.c
@@ -174,6 +174,7 @@ static void clg_str_append(CLogStringBuf *cstr, const char *str)
   clg_str_append_with_len(cstr, str, strlen(str));
 }
 
+ATTR_PRINTF_FORMAT(2, 0)
 static void clg_str_vappendf(CLogStringBuf *cstr, const char *fmt, va_list args)
 {
   /* Use limit because windows may use '-1' for a formatting error. */
diff --git a/tests/gtests/blenlib/BLI_memiter_test.cc b/tests/gtests/blenlib/BLI_memiter_test.cc
index c1c07dc7540..d92daefff3b 100644
--- a/tests/gtests/blenlib/BLI_memiter_test.cc
+++ b/tests/gtests/blenlib/BLI_memiter_test.cc
@@ -17,7 +17,7 @@ TEST(memiter, Nop)
   BLI_memiter_destroy(mi);
 }
 
-void memiter_empty_test(int num_elems, const int chunk_size)
+static void memiter_empty_test(int num_elems, const int chunk_size)
 {
   BLI_memiter *mi = BLI_memiter_create(chunk_size);
   void *data;
@@ -39,7 +39,7 @@ void memiter_empty_test(int num_elems, const int chunk_size)
 }
 
 #define MEMITER_NUMBER_TEST_FN(fn, number_type) \
-  void fn(int num_elems, const int chunk_size) \
+  static void fn(int num_elems, const int chunk_size) \
   { \
     BLI_memiter *mi = BLI_memiter_create(chunk_size); \
     number_type *data; \
@@ -65,7 +65,7 @@ MEMITER_NUMBER_TEST_FN(memiter_short_test, short)
 MEMITER_NUMBER_TEST_FN(memiter_int_test, int)
 MEMITER_NUMBER_TEST_FN(memiter_long_test, int64_t)
 
-void memiter_string_test(const char *strings[], const int chunk_size)
+static void memiter_string_test(const char *strings[], const int chunk_size)
 {
   BLI_memiter *mi = BLI_memiter_create(chunk_size);
   char *data;
@@ -95,7 +95,7 @@ void memiter_string_test(const char *strings[], const int chunk_size)
   BLI_memiter_destroy(mi);
 }
 
-void memiter_words10k_test(const char split_char, const int chunk_size)
+static void memiter_words10k_test(const char split_char, const int chunk_size)
 {
   const int words_len = sizeof(words10k) - 1;
   char *words = BLI_strdupn(words10k, words_len);



More information about the Bf-blender-cvs mailing list