--- a/packages/language/c/libc/stdio/current/ChangeLog
+++ b/packages/language/c/libc/stdio/current/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-27  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* include/stdio.h: Added CYGBLD_ATTRIB_{PRINTF|SCANF}_FORMAT where
+	appropriate so the compiler does more checking.
+
 2004-12-08  Daniel Neri  <daniel.neri@sigicom.se>
 
 	* cdl/stdio.cdl (CYGPKG_LIBC_STDIO_FILEIO): The FILEIO variant of

--- a/packages/language/c/libc/stdio/current/include/stdio.h
+++ b/packages/language/c/libc/stdio/current/include/stdio.h
@@ -162,33 +162,40 @@ setvbuf( FILE * /* stream */, char * /* 
 // ISO C89 7.9.6 Formatted input/output functions
 
 __externC int
-fprintf( FILE * /* stream */, const char * /* format */, ... ) __THROW;
+fprintf( FILE * /* stream */, const char * /* format */, ... ) __THROW 
+    CYGBLD_ATTRIB_PRINTF_FORMAT(2, 3);
 
 __externC int
-fscanf( FILE * /* stream */, const char * /* format */, ... ) __THROW;
+fscanf( FILE * /* stream */, const char * /* format */, ... ) __THROW 
+    CYGBLD_ATTRIB_SCANF_FORMAT(2, 3);
 
 __externC int
-printf( const char * /* format */, ... ) __THROW;
+printf( const char * /* format */, ... ) __THROW 
+    CYGBLD_ATTRIB_PRINTF_FORMAT(1, 2);
 
 __externC int
-scanf( const char * /* format */, ... ) __THROW;
+scanf( const char * /* format */, ... ) __THROW 
+    CYGBLD_ATTRIB_SCANF_FORMAT(1, 2);;
 
 __externC int
-sprintf( char * /* str */, const char * /* format */, ... ) __THROW;
+sprintf( char * /* str */, const char * /* format */, ... ) __THROW
+    CYGBLD_ATTRIB_PRINTF_FORMAT(2, 3);
 
 __externC int
-sscanf( const char * /* str */, const char * /* format */, ... ) __THROW;
+sscanf( const char * /* str */, const char * /* format */, ... ) __THROW
+    CYGBLD_ATTRIB_SCANF_FORMAT(2, 3);
 
 __externC int
 vfprintf( FILE * /* stream */, const char * /* format */,
-          va_list /* args */ ) __THROW;
+          va_list /* args */ ) __THROW CYGBLD_ATTRIB_PRINTF_FORMAT(2, 0);
 
 __externC int
-vprintf( const char * /* format */, va_list /* args */ ) __THROW;
+vprintf( const char * /* format */, va_list /* args */ ) __THROW
+    CYGBLD_ATTRIB_PRINTF_FORMAT(1, 0);
 
 __externC int
 vsprintf( char * /* str */, const char * /* format */,
-          va_list /* args */ ) __THROW;
+          va_list /* args */ ) __THROW CYGBLD_ATTRIB_PRINTF_FORMAT(2, 0);
 
 //========================================================================
 
@@ -287,7 +294,8 @@ perror( const char * /* prefix_str */ ) 
 
 __externC int
 fnprintf( FILE * /* stream */, size_t /* length */,
-          const char * /* format */, ... ) __THROW CYGBLD_ATTRIB_PRINTF_FORMAT(3, 4);
+          const char * /* format */, ... ) __THROW 
+    CYGBLD_ATTRIB_PRINTF_FORMAT(3, 4);
 
 __externC int
 snprintf( char * /* str */, size_t /* length */, const char * /* format */,
@@ -295,22 +303,25 @@ snprintf( char * /* str */, size_t /* le
 
 __externC int
 vfnprintf( FILE * /* stream */, size_t /* length */,
-           const char * /* format */, va_list /* args */ ) __THROW;
+           const char * /* format */, va_list /* args */ ) __THROW
+    CYGBLD_ATTRIB_PRINTF_FORMAT(3, 0);
 
 __externC int
 vsnprintf( char * /* str */, size_t /* length */,
-           const char * /* format */, va_list /* args */ ) __THROW;
+           const char * /* format */, va_list /* args */ ) __THROW
+    CYGBLD_ATTRIB_PRINTF_FORMAT(3, 0);
 
 __externC int
-vscanf( const char * /* format */, va_list /* args */ ) __THROW;
+vscanf( const char * /* format */, va_list /* args */ ) __THROW
+    CYGBLD_ATTRIB_SCANF_FORMAT(1, 0);
 
 __externC int
 vsscanf( const char * /* str */, const char * /* format */,
-         va_list /* args */ ) __THROW;
+         va_list /* args */ ) __THROW CYGBLD_ATTRIB_SCANF_FORMAT(2, 0);
 
 __externC int
 vfscanf( FILE * /* stream */, const char * /* format */,
-         va_list /* args */ ) __THROW;
+         va_list /* args */ ) __THROW CYGBLD_ATTRIB_PRINTF_FORMAT(2, 0);
 
 
 // INLINE FUNCTIONS