[X2Go-Commits] [nx-libs] 31/54: Logger.h: remove pragma, correct attributes

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 059028ce72267de69cb6b1983fc3599ee6491d9d
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Jan 18 23:45:26 2019 +0100

    Logger.h: remove pragma, correct attributes
    
    Instead of using a pragma which will be valid for the whole file this
    only affects the functions where it is actually required and supresses
    "format string is not a string literal" warnings.
    
    According to GCC documentation the second attribute parameter should
    be 0:
    
    "For functions where the arguments are not available to be checked
    (such as vprintf), specify the third parameter as zero".
---
 nxcompshad/src/Logger.h | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/nxcompshad/src/Logger.h b/nxcompshad/src/Logger.h
index 88908f7..8436c5f 100644
--- a/nxcompshad/src/Logger.h
+++ b/nxcompshad/src/Logger.h
@@ -29,9 +29,6 @@
 #include <cerrno>
 #include <cstdarg>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-
 //
 // Error handling macros.
 //
@@ -46,17 +43,17 @@ class Logger
 {
   public:
 
-  void user(const char *format, ...) __attribute__((format(printf, 2, 3)));
+  void user(const char *format, ...) __attribute__((format(printf, 2, 0)));
 
   void error(const char *name, int error);
 
-  void warning(const char *name, const char *format, ...) __attribute__((format(printf, 3, 4)));
+  void warning(const char *name, const char *format, ...) __attribute__((format(printf, 3, 0)));
 
-  void test(const char *name, const char *format, ...) __attribute__((format(printf, 3, 4)));
+  void test(const char *name, const char *format, ...) __attribute__((format(printf, 3, 0)));
 
   void trace(const char *name);
 
-  void debug(const char *name, const char *format, ...) __attribute__((format(printf, 3, 4)));
+  void debug(const char *name, const char *format, ...) __attribute__((format(printf, 3, 0)));
 
   void dump(const char *name, const char *data, int size);
 };
@@ -167,6 +164,4 @@ static inline void logDump(const char *name, const char *data, int size)
   #endif
 }
 
-#pragma GCC diagnostic pop
-
 #endif /* Logger_H */

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git