github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-24 15:46:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Prevent compiler warnings with 9.0

Browse Source 
PG_PRINTF_ATTRIBUTE was introduced with 9.1.
This commit is contained in:
Ian Barwick
2015-04-14 20:21:54 +09:00
parent 196585c78a
commit e39ec70ef0
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
log.h
View File

@@ -25,9 +25,15 @@
#define REPMGR_SYSLOG 1 #define REPMGR_SYSLOG 1
#define REPMGR_STDERR 2 #define REPMGR_STDERR 2
#if (PG_VERSION_NUM >= 90100)
void void
stderr_log_with_level(const char *level_name, int level, const char *fmt,...) stderr_log_with_level(const char *level_name, int level, const char *fmt,...)
__attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4))); __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
#else
void
stderr_log_with_level(const char *level_name, int level, const char *fmt,...)
__attribute__((format(printf, 3, 4)));
#endif
/* Standard error logging */ /* Standard error logging */
#define stderr_log_debug(...) stderr_log_with_level("DEBUG", LOG_DEBUG, __VA_ARGS__) #define stderr_log_debug(...) stderr_log_with_level("DEBUG", LOG_DEBUG, __VA_ARGS__)

6
strutil.c
View File

@@ -25,9 +25,15 @@
#include "log.h" #include "log.h"
#include "strutil.h" #include "strutil.h"
#if (PG_VERSION_NUM >= 90100)
static int static int
xvsnprintf(char *str, size_t size, const char *format, va_list ap) xvsnprintf(char *str, size_t size, const char *format, va_list ap)
__attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 0))); __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 0)));
#else
static int
xvsnprintf(char *str, size_t size, const char *format, va_list ap)
__attribute__((format(printf, 3, 0)));
#endif
static int static int
xvsnprintf(char *str, size_t size, const char *format, va_list ap) xvsnprintf(char *str, size_t size, const char *format, va_list ap)

14
strutil.h
View File

@@ -31,6 +31,7 @@
#define MAXCONNINFO 1024 #define MAXCONNINFO 1024
#if (PG_VERSION_NUM >= 90100)
extern int extern int
xsnprintf(char *str, size_t size, const char *format,...) xsnprintf(char *str, size_t size, const char *format,...)
__attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4))); __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
@@ -42,5 +43,18 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
extern int extern int
maxlen_snprintf(char *str, const char *format,...) maxlen_snprintf(char *str, const char *format,...)
__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3))); __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
#else
extern int
xsnprintf(char *str, size_t size, const char *format,...)
__attribute__((format(printf, 3, 4)));
extern int
sqlquery_snprintf(char *str, const char *format,...)
__attribute__((format(printf, 2, 3)));
extern int
maxlen_snprintf(char *str, const char *format,...)
__attribute__((format(printf, 2, 3)));
#endif
#endif /* _STRUTIL_H_ */ #endif /* _STRUTIL_H_ */