Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
9d85c35d
Commit
9d85c35d
authored
May 26, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix HAVE_ATTRIBUTE_FORMAT usage - refs #297
parent
9aba4fad
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
18 additions
and
31 deletions
+18
-31
configure.ac
configure.ac
+0
-13
include/vlc_charset.h
include/vlc_charset.h
+1
-1
include/vlc_common.h
include/vlc_common.h
+3
-3
include/vlc_httpd.h
include/vlc_httpd.h
+1
-1
include/vlc_input.h
include/vlc_input.h
+1
-1
include/vlc_interface.h
include/vlc_interface.h
+2
-2
include/vlc_messages.h
include/vlc_messages.h
+5
-5
include/vlc_network.h
include/vlc_network.h
+1
-1
include/vlc_osd.h
include/vlc_osd.h
+2
-2
include/vlc_sout.h
include/vlc_sout.h
+1
-1
include/vlc_vlm.h
include/vlc_vlm.h
+1
-1
No files found.
configure.ac
View file @
9d85c35d
...
...
@@ -1115,19 +1115,6 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
[${ac_cv_c_attribute_aligned}],[Maximum supported data alignment])
fi
dnl Checks for __attribute__(format()) directive
AC_CACHE_CHECK([__attribute__ ((format ())) support with function pointers],
[ac_cv_c_attribute_format],
[ac_cv_c_attribute_format=no
CFLAGS="${CFLAGS_save} -Werror"
AC_TRY_COMPILE([],
[static void (*pf_printf)(const char *, ...) __attribute__ ((format(printf,1,2)));(void)pf_printf;],
[ac_cv_c_attribute_format=yes])
CFLAGS="${CFLAGS_save}"])
if test "${ac_cv_c_attribute_format}" != "no"; then
AC_DEFINE(HAVE_ATTRIBUTE_FORMAT, 1, Support for __attribute__((format())) with function pointers)
fi
dnl Check for __attribute__((packed))
AC_CACHE_CHECK([for __attribute__((packed))],
[ac_cv_c_attribute_packed],
...
...
include/vlc_charset.h
View file @
9d85c35d
...
...
@@ -57,7 +57,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
*
,
...
)
ATTRIBUTE
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
int
,
utf8_fprintf
,
(
FILE
*
,
const
char
*
,
...
)
LIBVLC
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
char
*
,
EnsureUTF8
,
(
char
*
)
);
VLC_EXPORT
(
const
char
*
,
IsUTF8
,
(
const
char
*
)
);
...
...
include/vlc_common.h
View file @
9d85c35d
...
...
@@ -678,10 +678,10 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
#endif
/* Format string sanity checks */
#ifdef
HAVE_ATTRIBUTE_FORMAT
# define
ATTRIBUTE
_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
#ifdef
__GNUC__
# define
LIBVLC
_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
#else
# define
ATTRIBUTE
_FORMAT(x,y)
# define
LIBVLC
_FORMAT(x,y)
#endif
/* Alignment of critical static data structures */
...
...
include/vlc_httpd.h
View file @
9d85c35d
...
...
@@ -140,7 +140,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
,
...
)
ATTRIBUTE
_FORMAT
(
3
,
4
)
);
VLC_EXPORT
(
void
,
httpd_MsgAdd
,
(
httpd_message_t
*
,
const
char
*
psz_name
,
const
char
*
psz_value
,
...
)
LIBVLC
_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
*
)
);
...
...
include/vlc_input.h
View file @
9d85c35d
...
...
@@ -317,7 +317,7 @@ static inline void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p
#define input_item_GetSetting( item ) input_item_GetMeta( item, vlc_meta_Setting )
VLC_EXPORT
(
char
*
,
input_ItemGetInfo
,
(
input_item_t
*
p_i
,
const
char
*
psz_cat
,
const
char
*
psz_name
)
);
VLC_EXPORT
(
int
,
input_ItemAddInfo
,
(
input_item_t
*
p_i
,
const
char
*
psz_cat
,
const
char
*
psz_name
,
const
char
*
psz_format
,
...
)
ATTRIBUTE
_FORMAT
(
4
,
5
)
);
VLC_EXPORT
(
int
,
input_ItemAddInfo
,
(
input_item_t
*
p_i
,
const
char
*
psz_cat
,
const
char
*
psz_name
,
const
char
*
psz_format
,
...
)
LIBVLC
_FORMAT
(
4
,
5
)
);
#define input_ItemNew( a,b,c ) input_ItemNewExt( a, b, c, 0, NULL, -1 )
#define input_ItemNewExt(a,b,c,d,e,f) __input_ItemNewExt( VLC_OBJECT(a),b,c,d,e,f)
...
...
include/vlc_interface.h
View file @
9d85c35d
...
...
@@ -312,9 +312,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
*
,
bool
,
const
char
*
,
const
char
*
,
...)
ATTRIBUTE
_FORMAT
(
4
,
5
)
);
VLC_EXPORT
(
int
,
__intf_UserFatal
,(
vlc_object_t
*
,
bool
,
const
char
*
,
const
char
*
,
...)
LIBVLC
_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
*
,
...)
ATTRIBUTE
_FORMAT
(
3
,
4
)
);
VLC_EXPORT
(
int
,
__intf_UserWarn
,(
vlc_object_t
*
,
const
char
*
,
const
char
*
,
...)
LIBVLC
_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 )
...
...
include/vlc_messages.h
View file @
9d85c35d
...
...
@@ -81,13 +81,13 @@ struct msg_subscription_t
/*****************************************************************************
* Prototypes
*****************************************************************************/
VLC_EXPORT
(
void
,
__msg_Generic
,
(
vlc_object_t
*
,
int
,
const
char
*
,
const
char
*
,
...
)
ATTRIBUTE
_FORMAT
(
4
,
5
)
);
VLC_EXPORT
(
void
,
__msg_Generic
,
(
vlc_object_t
*
,
int
,
const
char
*
,
const
char
*
,
...
)
LIBVLC
_FORMAT
(
4
,
5
)
);
VLC_EXPORT
(
void
,
__msg_GenericVa
,
(
vlc_object_t
*
,
int
,
const
char
*
,
const
char
*
,
va_list
args
)
);
#define msg_GenericVa(a, b, c, d, e) __msg_GenericVa(VLC_OBJECT(a), b, c, d, e)
VLC_EXPORT
(
void
,
__msg_Info
,
(
vlc_object_t
*
,
const
char
*
,
...
)
ATTRIBUTE
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
void
,
__msg_Err
,
(
vlc_object_t
*
,
const
char
*
,
...
)
ATTRIBUTE
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
void
,
__msg_Warn
,
(
vlc_object_t
*
,
const
char
*
,
...
)
ATTRIBUTE
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
void
,
__msg_Dbg
,
(
vlc_object_t
*
,
const
char
*
,
...
)
ATTRIBUTE
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
void
,
__msg_Info
,
(
vlc_object_t
*
,
const
char
*
,
...
)
LIBVLC
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
void
,
__msg_Err
,
(
vlc_object_t
*
,
const
char
*
,
...
)
LIBVLC
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
void
,
__msg_Warn
,
(
vlc_object_t
*
,
const
char
*
,
...
)
LIBVLC
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
void
,
__msg_Dbg
,
(
vlc_object_t
*
,
const
char
*
,
...
)
LIBVLC
_FORMAT
(
2
,
3
)
);
#define msg_Info( p_this, ... ) \
__msg_Generic( VLC_OBJECT(p_this), VLC_MSG_INFO, \
...
...
include/vlc_network.h
View file @
9d85c35d
...
...
@@ -148,7 +148,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
,
...
)
ATTRIBUTE
_FORMAT
(
4
,
5
)
);
VLC_EXPORT
(
ssize_t
,
net_Printf
,
(
vlc_object_t
*
p_this
,
int
fd
,
const
v_socket_t
*
,
const
char
*
psz_fmt
,
...
)
LIBVLC
_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
)
);
...
...
include/vlc_osd.h
View file @
9d85c35d
...
...
@@ -595,7 +595,7 @@ static inline void osd_SetMenuUpdate( osd_menu_t *p_osd, bool 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
*
,
...
)
ATTRIBUTE
_FORMAT
(
3
,
4
)
);
VLC_EXPORT
(
void
,
osd_Message
,
(
spu_t
*
,
int
,
char
*
,
...
)
LIBVLC
_FORMAT
(
3
,
4
)
);
/**
* Default feedback images
...
...
@@ -650,7 +650,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
*
,
...
)
ATTRIBUTE
_FORMAT
(
3
,
4
)
);
VLC_EXPORT
(
void
,
__vout_OSDMessage
,
(
vlc_object_t
*
,
int
,
const
char
*
,
...
)
LIBVLC
_FORMAT
(
3
,
4
)
);
/**
* Same as __vlc_OSDMessage() but with automatic casting
...
...
include/vlc_sout.h
View file @
9d85c35d
...
...
@@ -235,7 +235,7 @@ VLC_EXPORT(void, sout_MethodRelease, (announce_method_t *) );
VLC_EXPORT
(
char
*
,
vlc_sdp_Start
,
(
vlc_object_t
*
obj
,
const
char
*
cfgpref
,
const
struct
sockaddr
*
src
,
size_t
srclen
,
const
struct
sockaddr
*
addr
,
size_t
addrlen
)
);
VLC_EXPORT
(
char
*
,
sdp_AddMedia
,
(
char
**
sdp
,
const
char
*
type
,
const
char
*
protocol
,
int
dport
,
unsigned
pt
,
bool
bw_indep
,
unsigned
bw
,
const
char
*
ptname
,
unsigned
clockrate
,
unsigned
channels
,
const
char
*
fmtp
)
);
VLC_EXPORT
(
char
*
,
sdp_AddAttribute
,
(
char
**
sdp
,
const
char
*
name
,
const
char
*
fmt
,
...)
ATTRIBUTE
_FORMAT
(
3
,
4
)
);
VLC_EXPORT
(
char
*
,
sdp_AddAttribute
,
(
char
**
sdp
,
const
char
*
name
,
const
char
*
fmt
,
...)
LIBVLC
_FORMAT
(
3
,
4
)
);
#ifdef __cplusplus
...
...
include/vlc_vlm.h
View file @
9d85c35d
...
...
@@ -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
*
,
...
)
ATTRIBUTE
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
vlm_message_t
*
,
vlm_MessageNew
,
(
const
char
*
,
const
char
*
,
...
)
LIBVLC
_FORMAT
(
2
,
3
)
);
VLC_EXPORT
(
vlm_message_t
*
,
vlm_MessageAdd
,
(
vlm_message_t
*
,
vlm_message_t
*
)
);
VLC_EXPORT
(
void
,
vlm_MessageDelete
,
(
vlm_message_t
*
)
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment