Commit1e6652a

committed

Permit use of vsprintf() in PostgreSQL code.

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

1 parent439ff9b commit1e6652aCopy full SHA for 1e6652a

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 0 deletions

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