Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcac18a7

Browse files
committed
Permit use of vsprintf() in PostgreSQL code.
The next commit needs it. Back-patch to 9.0 (all supported versions).
1 parentb0ce385 commitcac18a7

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

‎src/include/port.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);
139139
#ifdefsnprintf
140140
#undef snprintf
141141
#endif
142+
#ifdefvsprintf
143+
#undef vsprintf
144+
#endif
142145
#ifdefsprintf
143146
#undef sprintf
144147
#endif
@@ -154,6 +157,7 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);
154157

155158
externintpg_vsnprintf(char*str,size_tcount,constchar*fmt,va_listargs);
156159
externintpg_snprintf(char*str,size_tcount,constchar*fmt,...)pg_attribute_printf(3,4);
160+
externintpg_vsprintf(char*str,constchar*fmt,va_listargs);
157161
externintpg_sprintf(char*str,constchar*fmt,...)pg_attribute_printf(2,3);
158162
externintpg_vfprintf(FILE*stream,constchar*fmt,va_listargs);
159163
externintpg_fprintf(FILE*stream,constchar*fmt,...)pg_attribute_printf(2,3);
@@ -167,13 +171,15 @@ extern intpg_printf(const char *fmt,...) pg_attribute_printf(1, 2);
167171
#ifdef__GNUC__
168172
#definevsnprintf(...)pg_vsnprintf(__VA_ARGS__)
169173
#definesnprintf(...)pg_snprintf(__VA_ARGS__)
174+
#definevsprintf(...)pg_vsprintf(__VA_ARGS__)
170175
#definesprintf(...)pg_sprintf(__VA_ARGS__)
171176
#definevfprintf(...)pg_vfprintf(__VA_ARGS__)
172177
#definefprintf(...)pg_fprintf(__VA_ARGS__)
173178
#defineprintf(...)pg_printf(__VA_ARGS__)
174179
#else
175180
#definevsnprintfpg_vsnprintf
176181
#definesnprintfpg_snprintf
182+
#definevsprintfpg_vsprintf
177183
#definesprintfpg_sprintf
178184
#definevfprintfpg_vfprintf
179185
#definefprintfpg_fprintf

‎src/port/snprintf.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
/* Prevent recursion */
100100
#undefvsnprintf
101101
#undefsnprintf
102+
#undefvsprintf
102103
#undefsprintf
103104
#undefvfprintf
104105
#undeffprintf
@@ -178,7 +179,7 @@ pg_snprintf(char *str, size_t count, const char *fmt,...)
178179
returnlen;
179180
}
180181

181-
staticint
182+
int
182183
pg_vsprintf(char*str,constchar*fmt,va_listargs)
183184
{
184185
PrintfTargettarget;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp