When compiling with GCC, use the printf format attribute for the log method so

that the compiler checks the type of its parameters.

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index de3ae562..dcd84ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
 	* src/gui/gccontainer.h, src/gui/gccontainer.cpp: Removed unused
 	option from GCContainer to not delete a child, fixing warnings about
 	hiding virtual method gcn::Container::add.
+	* src/log.h, src/resources/imageset.cpp: When compiling with GCC, use
+	the printf format attribute for the log method so that the compiler
+	checks the type of its parameters.
 
 2008-04-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/src/log.h b/src/log.h
index dd1c0f91..6fe9dccd 100644
--- a/src/log.h
+++ b/src/log.h
@@ -61,7 +61,11 @@ class Logger
         /**
          * Enters a message in the log. The message will be timestamped.
          */
-        void log(const char *log_text, ...);
+        void log(const char *log_text, ...)
+#ifdef __GNUC__
+            __attribute__((__format__(__printf__, 2, 3)))
+#endif
+            ;
 
         /**
          * Log an error and quit. The error will pop-up in Windows and will be
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 08a6a110..4b6dd592 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -54,7 +54,7 @@ ImageSet::get(size_type i)
 {
     if (i >= mImages.size())
     {
-        logger->log("Warning: Sprite #%i does not exist in this image set", i);
+        logger->log("Warning: No sprite %d in this image set", (int) i);
         return NULL;
     }
     else