Commit19f7adc

committed

Permit use of vsprintf() in PostgreSQL code.

The next commit needs it. Back-patch to 9.0 (all supported versions).

1 parent648e41a commit19f7adcCopy full SHA for 19f7adc

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,9 @@ extern unsigned char pg_tolower(unsigned char ch);`
`161`	`161`	`#ifdefsnprintf`
`162`	`162`	`#undef snprintf`
`163`	`163`	`#endif`
	`164`	`+#ifdefvsprintf`
	`165`	`+#undef vsprintf`
	`166`	`+#endif`
`164`	`167`	`#ifdefsprintf`
`165`	`168`	`#undef sprintf`
`166`	`169`	`#endif`
`@@ -179,6 +182,7 @@ extern int`
`179`	`182`	`pg_snprintf(charstr,size_tcount,constcharfmt,...)`
`180`	`183`	`/* This extension allows gcc to check the format string */`
`181`	`184`	`__attribute__((format(printf,3,4)));`
	`185`	`+externintpg_vsprintf(charstr,constcharfmt,va_listargs);`
`182`	`186`	`externint`
`183`	`187`	`pg_sprintf(charstr,constcharfmt,...)`
`184`	`188`	`/* This extension allows gcc to check the format string */`
`@@ -201,13 +205,15 @@ __attribute__((format(printf, 1, 2)));`
`201`	`205`	`#ifdef__GNUC__`
`202`	`206`	`#definevsnprintf(...)pg_vsnprintf(__VA_ARGS__)`
`203`	`207`	`#definesnprintf(...)pg_snprintf(__VA_ARGS__)`
	`208`	`+#definevsprintf(...)pg_vsprintf(__VA_ARGS__)`
`204`	`209`	`#definesprintf(...)pg_sprintf(__VA_ARGS__)`
`205`	`210`	`#definevfprintf(...)pg_vfprintf(__VA_ARGS__)`
`206`	`211`	`#definefprintf(...)pg_fprintf(__VA_ARGS__)`
`207`	`212`	`#defineprintf(...)pg_printf(__VA_ARGS__)`
`208`	`213`	`#else`
`209`	`214`	`#definevsnprintfpg_vsnprintf`
`210`	`215`	`#definesnprintfpg_snprintf`
	`216`	`+#definevsprintfpg_vsprintf`
`211`	`217`	`#definesprintfpg_sprintf`
`212`	`218`	`#definevfprintfpg_vfprintf`
`213`	`219`	`#definefprintfpg_fprintf`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@`
`99`	`99`	`/* Prevent recursion */`
`100`	`100`	`#undefvsnprintf`
`101`	`101`	`#undefsnprintf`
	`102`	`+#undefvsprintf`
`102`	`103`	`#undefsprintf`
`103`	`104`	`#undefvfprintf`
`104`	`105`	`#undeffprintf`
`@@ -178,7 +179,7 @@ pg_snprintf(char str, size_t count, const char fmt,...)`
`178`	`179`	`returnlen;`
`179`	`180`	`}`
`180`	`181`
`181`		`-staticint`
	`182`	`+int`
`182`	`183`	`pg_vsprintf(charstr,constcharfmt,va_listargs)`
`183`	`184`	`{`
`184`	`185`	`PrintfTargettarget;`

Comments

(0)