Commitf7c4fe7

committed

Permit use of vsprintf() in PostgreSQL code.

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

1 parent7a0d48a commitf7c4fe7Copy full SHA for f7c4fe7

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,9 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);`
`139`	`139`	`#ifdefsnprintf`
`140`	`140`	`#undef snprintf`
`141`	`141`	`#endif`
	`142`	`+#ifdefvsprintf`
	`143`	`+#undef vsprintf`
	`144`	`+#endif`
`142`	`145`	`#ifdefsprintf`
`143`	`146`	`#undef sprintf`
`144`	`147`	`#endif`
`@@ -157,6 +160,7 @@ extern int`
`157`	`160`	`pg_snprintf(charstr,size_tcount,constcharfmt,...)`
`158`	`161`	`/* This extension allows gcc to check the format string */`
`159`	`162`	`__attribute__((format(PG_PRINTF_ATTRIBUTE,3,4)));`
	`163`	`+externintpg_vsprintf(charstr,constcharfmt,va_listargs);`
`160`	`164`	`externint`
`161`	`165`	`pg_sprintf(charstr,constcharfmt,...)`
`162`	`166`	`/* This extension allows gcc to check the format string */`
`@@ -179,13 +183,15 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));`
`179`	`183`	`#ifdef__GNUC__`
`180`	`184`	`#definevsnprintf(...)pg_vsnprintf(__VA_ARGS__)`
`181`	`185`	`#definesnprintf(...)pg_snprintf(__VA_ARGS__)`
	`186`	`+#definevsprintf(...)pg_vsprintf(__VA_ARGS__)`
`182`	`187`	`#definesprintf(...)pg_sprintf(__VA_ARGS__)`
`183`	`188`	`#definevfprintf(...)pg_vfprintf(__VA_ARGS__)`
`184`	`189`	`#definefprintf(...)pg_fprintf(__VA_ARGS__)`
`185`	`190`	`#defineprintf(...)pg_printf(__VA_ARGS__)`
`186`	`191`	`#else`
`187`	`192`	`#definevsnprintfpg_vsnprintf`
`188`	`193`	`#definesnprintfpg_snprintf`
	`194`	`+#definevsprintfpg_vsprintf`
`189`	`195`	`#definesprintfpg_sprintf`
`190`	`196`	`#definevfprintfpg_vfprintf`
`191`	`197`	`#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)