[Aptitude-svn-commit] r3903 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Wed Aug 17 22:57:18 2005
New Revision: 3903

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/util.h
Log:
Add a formatting __attribute__ to ssprintf; gcc limitations prevent adding same to swsprintf.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Aug 17 22:57:18 2005
@@ -1,5 +1,11 @@
 2005-08-17  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/util.h:
+
+	  Add a formatting __attribute__ specifier to ssprintf (can't add
+	  one to swsprintf because gcc doesn't know about checking wide
+	  strings).
+
 	* src/generic/aptcache.cc:
 
 	  Penalize broken soft deps less than removals, and add some

Modified: branches/aptitude-0.3/aptitude/src/generic/util.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/util.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/util.h	Wed Aug 17 22:57:18 2005
@@ -27,10 +27,14 @@
 void stripws(std::string &s);
 
 // Printf for std::string.
+#ifdef __GNUG__
+__attribute__ ((format (printf, 1, 2)))
+#endif
 std::string ssprintf(const char *format, ...);
 std::string vssprintf(const char *format, va_list ap);
 
 std::wstring swsprintf(const wchar_t *format, ...);
+
 std::wstring vswsprintf(const wchar_t *format, va_list ap);
 
 /** Compare pairs, with (a,b) considered eqivalent to (b,a). */