Commitb544dcd

committed

Permit use of vsprintf() in PostgreSQL code.

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

1 parent6675ab5 commitb544dcdCopy full SHA for b544dcd

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,9 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);`
`168`	`168`	`#ifdefsnprintf`
`169`	`169`	`#undef snprintf`
`170`	`170`	`#endif`
	`171`	`+#ifdefvsprintf`
	`172`	`+#undef vsprintf`
	`173`	`+#endif`
`171`	`174`	`#ifdefsprintf`
`172`	`175`	`#undef sprintf`
`173`	`176`	`#endif`
`@@ -186,6 +189,7 @@ extern int`
`186`	`189`	`pg_snprintf(charstr,size_tcount,constcharfmt,...)`
`187`	`190`	`/* This extension allows gcc to check the format string */`
`188`	`191`	`__attribute__((format(PG_PRINTF_ATTRIBUTE,3,4)));`
	`192`	`+externintpg_vsprintf(charstr,constcharfmt,va_listargs);`
`189`	`193`	`externint`
`190`	`194`	`pg_sprintf(charstr,constcharfmt,...)`
`191`	`195`	`/* This extension allows gcc to check the format string */`
`@@ -208,13 +212,15 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));`
`208`	`212`	`#ifdef__GNUC__`
`209`	`213`	`#definevsnprintf(...)pg_vsnprintf(__VA_ARGS__)`
`210`	`214`	`#definesnprintf(...)pg_snprintf(__VA_ARGS__)`
	`215`	`+#definevsprintf(...)pg_vsprintf(__VA_ARGS__)`
`211`	`216`	`#definesprintf(...)pg_sprintf(__VA_ARGS__)`
`212`	`217`	`#definevfprintf(...)pg_vfprintf(__VA_ARGS__)`
`213`	`218`	`#definefprintf(...)pg_fprintf(__VA_ARGS__)`
`214`	`219`	`#defineprintf(...)pg_printf(__VA_ARGS__)`
`215`	`220`	`#else`
`216`	`221`	`#definevsnprintfpg_vsnprintf`
`217`	`222`	`#definesnprintfpg_snprintf`
	`223`	`+#definevsprintfpg_vsprintf`
`218`	`224`	`#definesprintfpg_sprintf`
`219`	`225`	`#definevfprintfpg_vfprintf`
`220`	`226`	`#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)