Add -Wformat=2 since -Wformat is required for -Wformat-security

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fd59669969565500d3db16d60054b947dae524f5..ac24a12654d4b66254cd155ccbd18fb92be1f2fe 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -454,8 +454,8 @@ jobs:
       - run:
           name: configure
           command: |
-            CFLAGS="-O1 -Werror=vla -Werror=format-security" \
-            CXXFLAGS="-O1 -Werror=vla -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
+            CFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security" \
+            CXXFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
             ./configure \
               --disable-lua-records \
               --with-modules='bind lmdb ldap gmysql gsqlite3 gpgsql godbc mydns random tinydns' \
@@ -798,8 +798,8 @@ jobs:
       - run:
           name: configure
           command: |
-            CFLAGS="-O1 -Werror=vla -Werror=format-security" \
-            CXXFLAGS="-O1 -Werror=vla -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
+            CFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security" \
+            CXXFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
             ./configure \
             --enable-unit-tests \
             --enable-nod \
@@ -964,8 +964,8 @@ jobs:
       - run:
           name: configure
           command: |
-            CFLAGS="-O1 -Werror=vla -Werror=format-security" \
-            CXXFLAGS="-O1 -Werror=vla -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
+            CFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security" \
+            CXXFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
             ./configure \
               --disable-lua-records \
               --with-modules='bind lmdb ldap gmysql gsqlite3 gpgsql godbc mydns random tinydns' \
@@ -1032,8 +1032,8 @@ jobs:
       - run:
           name: configure
           command: |
-            CFLAGS="-O1 -Werror=vla -Wformat -Werror=format-security" \
-            CXXFLAGS="-O1 -Werror=vla -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
+            CFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security" \
+            CXXFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
             ./configure \
             --disable-systemd \
             --disable-unit-tests \
@@ -1104,8 +1104,8 @@ jobs:
       - run:
           name: configure
           command: |
-            CFLAGS="-O1 -Werror=vla -Werror=format-security" \
-            CXXFLAGS="-O1 -Werror=vla -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
+            CFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security" \
+            CXXFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
             ./configure \
             --disable-systemd \
             --disable-unit-tests \
@@ -1176,8 +1176,8 @@ jobs:
       - run:
           name: configure
           command: |
-            CFLAGS="-O1 -Werror=vla -Wformat -Werror=format-security" \
-            CXXFLAGS="-O1 -Werror=vla -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
+            CFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security" \
+            CXXFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
             ./configure \
             --enable-unit-tests \
             --enable-dnstap \