sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-06 00:02:36 -04:00
Code Issues Projects Releases Wiki Activity

Permit use of vsprintf() in PostgreSQL code.

Browse Source 
The next commit needs it.  Back-patch to 9.0 (all supported versions).
This commit is contained in:
Noah Misch 2015-05-18 10:02:31 -04:00
parent b0ce385032
commit cac18a76bb
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/port.h
View File

@ -139,6 +139,9 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);
#ifdef snprintf #ifdef snprintf
#undef snprintf #undef snprintf
#endif #endif
#ifdef vsprintf
#undef vsprintf
#endif
#ifdef sprintf #ifdef sprintf
#undef sprintf #undef sprintf
#endif #endif
@ -154,6 +157,7 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);
extern int pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args); extern int pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
extern int pg_snprintf(char *str, size_t count, const char *fmt,...) pg_attribute_printf(3, 4); extern int pg_snprintf(char *str, size_t count, const char *fmt,...) pg_attribute_printf(3, 4);
extern int pg_vsprintf(char *str, const char *fmt, va_list args);
extern int pg_sprintf(char *str, const char *fmt,...) pg_attribute_printf(2, 3); extern int pg_sprintf(char *str, const char *fmt,...) pg_attribute_printf(2, 3);
extern int pg_vfprintf(FILE *stream, const char *fmt, va_list args); extern int pg_vfprintf(FILE *stream, const char *fmt, va_list args);
extern int pg_fprintf(FILE *stream, const char *fmt,...) pg_attribute_printf(2, 3); extern int pg_fprintf(FILE *stream, const char *fmt,...) pg_attribute_printf(2, 3);
@ -167,6 +171,7 @@ extern int pg_printf(const char *fmt,...) pg_attribute_printf(1, 2);
#ifdef __GNUC__ #ifdef __GNUC__
#define vsnprintf(...) pg_vsnprintf(__VA_ARGS__) #define vsnprintf(...) pg_vsnprintf(__VA_ARGS__)
#define snprintf(...) pg_snprintf(__VA_ARGS__) #define snprintf(...) pg_snprintf(__VA_ARGS__)
#define vsprintf(...) pg_vsprintf(__VA_ARGS__)
#define sprintf(...) pg_sprintf(__VA_ARGS__) #define sprintf(...) pg_sprintf(__VA_ARGS__)
#define vfprintf(...) pg_vfprintf(__VA_ARGS__) #define vfprintf(...) pg_vfprintf(__VA_ARGS__)
#define fprintf(...) pg_fprintf(__VA_ARGS__) #define fprintf(...) pg_fprintf(__VA_ARGS__)
@ -174,6 +179,7 @@ extern int pg_printf(const char *fmt,...) pg_attribute_printf(1, 2);
#else #else
#define vsnprintf pg_vsnprintf #define vsnprintf pg_vsnprintf
#define snprintf pg_snprintf #define snprintf pg_snprintf
#define vsprintf pg_vsprintf
#define sprintf pg_sprintf #define sprintf pg_sprintf
#define vfprintf pg_vfprintf #define vfprintf pg_vfprintf
#define fprintf pg_fprintf #define fprintf pg_fprintf

3
src/port/snprintf.c
View File

@ -99,6 +99,7 @@
/* Prevent recursion */ /* Prevent recursion */
#undef vsnprintf #undef vsnprintf
#undef snprintf #undef snprintf
#undef vsprintf
#undef sprintf #undef sprintf
#undef vfprintf #undef vfprintf
#undef fprintf #undef fprintf
@ -178,7 +179,7 @@ pg_snprintf(char *str, size_t count, const char *fmt,...)
return len; return len;
} }
static int int
pg_vsprintf(char *str, const char *fmt, va_list args) pg_vsprintf(char *str, const char *fmt, va_list args)
{ {
PrintfTarget target; PrintfTarget target;