From f464bb35e8601535462bfd1bbcd8d2de79d404d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 11 Sep 2007 20:32:27 +0000 Subject: [PATCH] All: missing ATTRIBUTE_FORMAT Now lets hunt the format warnings! --- include/vlc_charset.h | 2 +- include/vlc_common.h | 2 +- include/vlc_httpd.h | 2 +- include/vlc_interface.h | 4 ++-- include/vlc_network.h | 2 +- include/vlc_osd.h | 4 ++-- include/vlc_vlm.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/vlc_charset.h b/include/vlc_charset.h index d6e81e4171..d97d3b76be 100644 --- a/include/vlc_charset.h +++ b/include/vlc_charset.h @@ -54,7 +54,7 @@ VLC_EXPORT( int, utf8_stat, ( const char *filename, struct stat *buf ) ); VLC_EXPORT( int, utf8_lstat, ( const char *filename, struct stat *buf ) ); VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) ); -VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) ); +VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); VLC_EXPORT( char *, EnsureUTF8, ( char * ) ); VLC_EXPORT( const char *, IsUTF8, ( const char * ) ); diff --git a/include/vlc_common.h b/include/vlc_common.h index a741bfa246..57aa4212a0 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -861,7 +861,7 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) #if !defined(HAVE_ASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS) # define asprintf vlc_asprintf - VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ); + VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); #elif !defined(__PLUGIN__) # define vlc_asprintf NULL #endif diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h index 1fd82248aa..a3c179e4dd 100644 --- a/include/vlc_httpd.h +++ b/include/vlc_httpd.h @@ -139,7 +139,7 @@ VLC_EXPORT( int, httpd_StreamSend, ( httpd_stream_t *, uint8_t *p /* Msg functions facilities */ VLC_EXPORT( void, httpd_MsgInit, ( httpd_message_t * ) ); -VLC_EXPORT( void, httpd_MsgAdd, ( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) ); +VLC_EXPORT( void, httpd_MsgAdd, ( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) ATTRIBUTE_FORMAT( 3, 4 ) ); /* return "" if not found. The string is not allocated */ VLC_EXPORT( const char *, httpd_MsgGet, ( const httpd_message_t *, const char *psz_name ) ); VLC_EXPORT( void, httpd_MsgClean, ( httpd_message_t * ) ); diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 53a6f095f7..2bf65b1519 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -307,9 +307,9 @@ struct interaction_t ***************************************************************************/ #define intf_UserFatal( a, b, c, d, e... ) __intf_UserFatal( VLC_OBJECT(a),b,c,d, ## e ) -VLC_EXPORT( int, __intf_UserFatal,( vlc_object_t*, vlc_bool_t, const char*, const char*, ...) ); +VLC_EXPORT( int, __intf_UserFatal,( vlc_object_t*, vlc_bool_t, const char*, const char*, ...) ATTRIBUTE_FORMAT( 4, 5 ) ); #define intf_UserWarn( a, c, d, e... ) __intf_UserWarn( VLC_OBJECT(a),c,d, ## e ) -VLC_EXPORT( int, __intf_UserWarn,( vlc_object_t*, const char*, const char*, ...) ); +VLC_EXPORT( int, __intf_UserWarn,( vlc_object_t*, const char*, const char*, ...) ATTRIBUTE_FORMAT( 3, 4 ) ); #define intf_UserLoginPassword( a, b, c, d, e... ) __intf_UserLoginPassword( VLC_OBJECT(a),b,c,d,e) VLC_EXPORT( int, __intf_UserLoginPassword,( vlc_object_t*, const char*, const char*, char **, char **) ); #define intf_UserYesNo( a, b, c, d, e, f ) __intf_UserYesNo( VLC_OBJECT(a),b,c, d, e, f ) diff --git a/include/vlc_network.h b/include/vlc_network.h index 5b5cec175d..1c589625a7 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -138,7 +138,7 @@ VLC_EXPORT( ssize_t, __net_Write, ( vlc_object_t *p_this, int fd, const v_socket #define net_Gets(a,b,c) __net_Gets(VLC_OBJECT(a),b,c) VLC_EXPORT( char *, __net_Gets, ( vlc_object_t *p_this, int fd, const v_socket_t * ) ); -VLC_EXPORT( ssize_t, net_Printf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, ... ) ); +VLC_EXPORT( ssize_t, net_Printf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, ... ) ATTRIBUTE_FORMAT( 4, 5 ) ); #define net_vaPrintf(a,b,c,d,e) __net_vaPrintf(VLC_OBJECT(a),b,c,d,e) VLC_EXPORT( ssize_t, __net_vaPrintf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args ) ); diff --git a/include/vlc_osd.h b/include/vlc_osd.h index a55245ec57..45344c4f7e 100644 --- a/include/vlc_osd.h +++ b/include/vlc_osd.h @@ -580,7 +580,7 @@ static inline void osd_SetMenuUpdate( osd_menu_t *p_osd, vlc_bool_t b_value ) */ VLC_EXPORT( int, osd_ShowTextRelative, ( spu_t *, int, char *, text_style_t *, int, int, int, mtime_t ) ); VLC_EXPORT( int, osd_ShowTextAbsolute, ( spu_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t ) ); -VLC_EXPORT( void,osd_Message, ( spu_t *, int, char *, ... ) ); +VLC_EXPORT( void,osd_Message, ( spu_t *, int, char *, ... ) ATTRIBUTE_FORMAT( 3, 4 ) ); /** * Default feedback images @@ -644,7 +644,7 @@ VLC_EXPORT( int, vout_ShowTextAbsolute, ( vout_thread_t *, int, const char *, te * \param i_channel Subpicture channel * \param psz_format printf style formatting **/ -VLC_EXPORT( void, __vout_OSDMessage, ( vlc_object_t *, int, const char *, ... ) ); +VLC_EXPORT( void, __vout_OSDMessage, ( vlc_object_t *, int, const char *, ... ) ATTRIBUTE_FORMAT( 3, 4 ) ); /** * Same as __vlc_OSDMessage() but with automatic casting diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h index 1ca38d5095..563f2b4cbe 100644 --- a/include/vlc_vlm.h +++ b/include/vlc_vlm.h @@ -157,7 +157,7 @@ VLC_EXPORT( void, vlm_Delete, ( vlm_t * ) ); VLC_EXPORT( int, vlm_ExecuteCommand, ( vlm_t *, const char *, vlm_message_t ** ) ); VLC_EXPORT( int, vlm_Control, ( vlm_t *p_vlm, int i_query, ... ) ); -VLC_EXPORT( vlm_message_t *, vlm_MessageNew, ( const char *, const char *, ... ) ); +VLC_EXPORT( vlm_message_t *, vlm_MessageNew, ( const char *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); VLC_EXPORT( vlm_message_t *, vlm_MessageAdd, ( vlm_message_t *, vlm_message_t * ) ); VLC_EXPORT( void, vlm_MessageDelete, ( vlm_message_t * ) ); -- 2.39.2