Warnings for printf-wrappers

ChangeLog

@@ -11,6 +11,7 @@
 	  is added to the map list if it validates.
 	* The menu map list can now be stepped per folder with the
 	  right and left arrows.
+	* Methods wrapping printf-style functions now get compiler warnings
 
 	[ 20140216 ]
 	* Removed the FastCard option. Not necessary on todays hardware?!

Makefile

@@ -78,8 +78,8 @@ INSTALL_INCLUDE=$(DESTDIR)/usr/include
 
 ###############################################################
 CC=gcc
-WARNINGS=-Weverything -Wno-padded -Wno-packed -Wno-documentation
-WARNINGS+=-Wno-documentation-unknown-command -Wno-format-nonliteral
+WARNINGS=-Weverything -Wno-padded -Wno-packed
+WARNINGS+=-Wno-documentation-unknown-command
 WARNINGS+=-Wno-covered-switch-default -Wno-global-constructors
 WARNINGS+=-Wno-exit-time-destructors -Wno-c++98-compat-pedantic
 WARNINGS+=-Wno-disabled-macro-expansion -Wno-missing-variable-declarations

include/GLString.h

@@ -74,6 +74,7 @@ public:
      * \param string valid string id
      * \param s format string and args like for printf
      */
+    __attribute__((format(printf, 3, 4)))
     void SetString(unsigned int string, const char *s, ...);
 
     /*!
@@ -89,6 +90,7 @@ public:
      * \param string valid format string with args like for printf
      * \returns 0 on success, -1 on invalid string, -2 on full string list
      */
+    __attribute__((format(printf, 4, 5)))
     int glPrintf(int x, int y, const char *string, ...);
 
     /*!

include/OpenRaider.h

@@ -130,6 +130,7 @@ public:
      * \param dump_stdout if true, also print to stdout
      * \param format printf() style format string
      */
+    __attribute__((format(printf, 3, 4)))
     void print(bool dump_stdout, const char *format, ...);
 
 protected:

include/Quaternion.h

@@ -108,7 +108,7 @@ public:
 
     /*!
      * \brief Inverse this quaternion
-     * \brief Returns inverse of this quaternion
+     * \returns inverse of this quaternion
      */
     Quaternion inverse();
 

include/System.h

@@ -70,6 +70,7 @@ public:
      * \param string Format string like for printf
      * \returns string in a buffer
      */
+    __attribute__((format(printf, 1, 2)))
     static char *bufferString(const char *string, ...);
 
     /*!

include/Texture.h

@@ -249,6 +249,7 @@ private:
 
 // Experimental testing
 
+__attribute__((format(printf, 3, 4)))
 void bufferedPrintf(char *string, unsigned int len, char *s, ...);
 
 void glPrint3d(float x, float y, float z,

include/TombRaider.h

@@ -2238,8 +2238,10 @@ private:
      * Mongoose - Created
      ------------------------------------------------------*/
 
-    void print(const char *methodName, const char *s, ...);
+__attribute__((format(printf, 3, 4)))
+    void print(const char *methodName, const char *s, ...) ;
 
+__attribute__((format(printf, 3, 4)))
     void printDebug(const char *methodName, const char *s, ...);
 
 

include/tga.h

@@ -83,6 +83,7 @@ int tga_save(FILE *f, unsigned char *image,
  * \param s format string for file path/name
  * \returns 0 on success, else error condition
  */
+__attribute__((format(printf, 5, 6)))
 int tga_save_filename(unsigned char *image,
         unsigned int width, unsigned int height,
         char type,

src/OpenRaider.cpp

@@ -610,7 +610,7 @@ void OpenRaider::handleConsoleKeyPressEvent(unsigned int key,unsigned int mod)
                 i = lastCmd[0];
 
                 lastCmd[0] = '>';
-                mText->SetString(textConsole, lastCmd);
+                mText->SetString(textConsole, "%s", lastCmd);
                 break;
             case 0:
                 break;
@@ -849,7 +849,7 @@ void OpenRaider::print(bool dump_stdout, const char *format, ...)
     // Print to game 'console'
     if (mText)
     {
-        mText->SetString(textOutput, buffer);
+        mText->SetString(textOutput, "%s", buffer);
     }
 
     // Print to stdout

src/Render.cpp

@@ -261,8 +261,8 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
     // String 0: OpenRaider version in lower right corner
     mString.Scale(1.00);
     err = mString.glPrintf(mWidth - 15 * strlen(VERSION),
-            mHeight-35, VERSION);
-    mString.SetString(0, VERSION);
+            mHeight-35, "%s", VERSION);
+    mString.SetString(0, "%s", VERSION);
 
     if (err)
     {
@@ -271,8 +271,8 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
 
     // String 1: Used for FPS in game text output
     mString.Scale(0.75);
-    err = mString.glPrintf(8, mHeight - 25, "                ");
-    mString.SetString(1, "                ");
+    err = mString.glPrintf(8, mHeight - 25, "%s", "                ");
+    mString.SetString(1, "%s", "                ");
 
     if (err)
     {
@@ -281,8 +281,8 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
 
     // String 2: Used for game console
     mString.Scale(1.0);
-    err = mString.glPrintf(8, 25, console);
-    mString.SetString(2, console);
+    err = mString.glPrintf(8, 25, "%s", console);
+    mString.SetString(2, "%s", console);
 
     if (err)
     {
@@ -291,8 +291,8 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
 
     // String 3: Used for one line map select menu
     mString.Scale(1.75);
-    err = mString.glPrintf(mWidth/2-235, mHeight/2-24, menu);
-    mString.SetString(3, menu);
+    err = mString.glPrintf(mWidth/2-235, mHeight/2-24, "%s", menu);
+    mString.SetString(3, "%s", menu);
 
     if (err)
     {
@@ -301,8 +301,8 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
 
     // String 4: Used for one line in game text output
     mString.Scale(1.0);
-    err = mString.glPrintf(8, 55, "                    ");
-    mString.SetString(4, "                    ");
+    err = mString.glPrintf(8, 55, "%s", "                    ");
+    mString.SetString(4, "%s", "                    ");
 
     if (err)
     {

src/TombRaider.cpp

@@ -544,7 +544,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
         _num_textiles = usz / sizeof(tr2_textile32_t);
 
-        printDebug("LoadTR4", "_num_textiles = %i/%i = %i",
+        printDebug("LoadTR4", "_num_textiles = %i/%lu = %i",
                 usz, sizeof(tr2_textile32_t), _num_textiles);
 
         _textile32 = new tr2_textile32_t[_num_textiles];
@@ -594,7 +594,7 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
         _num_textiles = usz / sizeof(tr2_textile16_t);
 
-        printDebug("Load", "TR4 _num_textiles = %i/%i = %i",
+        printDebug("Load", "TR4 _num_textiles = %i/%lu = %i",
                 usz, sizeof(tr2_textile16_t), _num_textiles);
 
         _textile16 = new tr2_textile16_t[_num_textiles];
@@ -4769,7 +4769,7 @@ int TombRaider::Fread(void *buffer, size_t size, size_t count, FILE *f)
         }
         else
         {
-            print("Fread(%p, %d, %d, %p)", "ERROR: Returned %d bytes too far",
+            print("Fread", "(%p, %lu, %lu, %p) ERROR: Returned %d bytes too far",
                     buffer, size, count, f, num_read);
             reset();
             exit(2);
@@ -5122,7 +5122,7 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
 
     _num_textiles = usz / sizeof(tr2_textile32_t);
 
-    printDebug("LoadTR5", "_num_textiles = %i/%i = %i",
+    printDebug("LoadTR5", "_num_textiles = %i/%lu = %i",
             usz, sizeof(tr2_textile32_t), _num_textiles);
 
     _textile32 = new tr2_textile32_t[_num_textiles];
@@ -5169,7 +5169,7 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
 
     _num_textiles = usz / sizeof(tr2_textile16_t);
 
-    printDebug("LoadTR5", "_num_textiles = %i/%i = %i",
+    printDebug("LoadTR5", "_num_textiles = %i/%lu = %i",
             usz, sizeof(tr2_textile16_t), _num_textiles);
 
     _textile16 = new tr2_textile16_t[_num_textiles];
@@ -5435,7 +5435,7 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
         // Start 20byte structure ///////////////
         printDebug("LoadTR5", "20byte struct {");
         Fread(mRoomsTR5[i].seperator6, 6, 1, f);
-        printDebug("LoadTR5", "6 bytes 0xFF = 0x%x%x%x%x%x",
+        printDebug("LoadTR5", "6 bytes 0xFF = 0x%x%x%x%x%x%x",
                 mRoomsTR5[i].seperator6[0], mRoomsTR5[i].seperator6[1],
                 mRoomsTR5[i].seperator6[2], mRoomsTR5[i].seperator6[3],
                 mRoomsTR5[i].seperator6[4], mRoomsTR5[i].seperator6[5]);
@@ -5468,7 +5468,7 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
         Fread(&mRoomsTR5[i].unknownR6, 4, 1, f);
         printDebug("LoadTR5", "unknownR6 = %i", mRoomsTR5[i].unknownR6);
         Fread(&mRoomsTR5[i].roomX, 4, 1, f);
-        printDebug("LoadTR5", "roomX = %i", mRoomsTR5[i].roomX);
+        printDebug("LoadTR5", "roomX = %f", mRoomsTR5[i].roomX);
 
         Fread(&mRoomsTR5[i].seperator9, 4, 1, f);
         printDebug("LoadTR5", "seperator9 CDCDCDCD | 0x0 = 0x%x",
@@ -5483,7 +5483,7 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
         }
 
         Fread(&mRoomsTR5[i].roomZ, 4, 1, f);
-        printDebug("LoadTR5", "roomZ = %i", mRoomsTR5[i].roomZ);
+        printDebug("LoadTR5", "roomZ = %f", mRoomsTR5[i].roomZ);
         printDebug("LoadTR5", "}");
 
 
@@ -6218,7 +6218,7 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
 
     if (u != 0xcdcdcdcd)
     {
-        print("LoadTR5", "Check 0xCDCDCDCD != 0x%X @ %u", u, ftell(f));
+        print("LoadTR5", "Check 0xCDCDCDCD != 0x%X @ %ld", u, ftell(f));
         return -5;
     }
 
@@ -6318,7 +6318,6 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
     return 0;
 }
 
-
 void TombRaider::print(const char *methodName, const char *s, ...)
 {
     va_list args;