jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check string format in log_message

Browse Source 
Move "printflike" definition to arch.h, it's used both by log.h and
os_calls.h.
This commit is contained in:
Pavel Roskin 2016-06-21 16:30:16 -07:00
parent be1d034f91
commit b1527b7947
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/arch.h
View File

@ -19,6 +19,10 @@
#if !defined(ARCH_H) #if !defined(ARCH_H)
#define ARCH_H #define ARCH_H
#if defined(HAVE_CONFIG_H)
#include "config_ac.h"
#endif
/* you can define L_ENDIAN or B_ENDIAN and NEED_ALIGN or NO_NEED_ALIGN /* you can define L_ENDIAN or B_ENDIAN and NEED_ALIGN or NO_NEED_ALIGN
in the makefile to override */ in the makefile to override */
@ -125,4 +129,12 @@ typedef signed long long tsi64;
#endif #endif
#endif /* DEFINED_Ts */ #endif /* DEFINED_Ts */
/* format string verification */
#if defined(HAVE_FUNC_ATTRIBUTE_FORMAT)
#define printflike(arg_format, arg_first_check) \
__attribute__((__format__(__printf__, arg_format, arg_first_check)))
#else
#define printflike(arg_format, arg_first_check)
#endif
#endif #endif

2
common/log.h
View File

@ -171,7 +171,7 @@ log_end(void);
* @return * @return
*/ */
enum logReturns DEFAULT_CC enum logReturns DEFAULT_CC
log_message(const enum logLevels lvl, const char *msg, ...); log_message(const enum logLevels lvl, const char *msg, ...) printflike(2, 3);
/** /**
* *

11
common/os_calls.h
View File

@ -21,10 +21,6 @@
#if !defined(OS_CALLS_H) #if !defined(OS_CALLS_H)
#define OS_CALLS_H #define OS_CALLS_H
#if defined(HAVE_CONFIG_H)
#include "config_ac.h"
#endif
#ifndef NULL #ifndef NULL
#define NULL 0 #define NULL 0
#endif #endif
@ -45,13 +41,6 @@
#define g_tcp_select g_sck_select #define g_tcp_select g_sck_select
#define g_close_wait_obj g_delete_wait_obj #define g_close_wait_obj g_delete_wait_obj
#if defined(HAVE_FUNC_ATTRIBUTE_FORMAT)
#define printflike(arg_format, arg_first_check) \
__attribute__((__format__(__printf__, arg_format, arg_first_check)))
#else
#define printflike(arg_format, arg_first_check)
#endif
int APP_CC g_rm_temp_dir(void); int APP_CC g_rm_temp_dir(void);
int APP_CC g_mk_temp_dir(const char* app_name); int APP_CC g_mk_temp_dir(const char* app_name);
void APP_CC g_init(const char* app_name); void APP_CC g_init(const char* app_name);