NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitc49e4ae

committed

Use non-literal format for possibly non-standard strftime formats.

Per recent -hackers discussion. The formats in question are %G and %V,and cause warnings on MinGW at least. We assume the ecpg applicationknows what it's doing if it passes these formats to the library.

1 parentab0ba6e commitc49e4aeCopy full SHA for c49e4ae

File tree

1 file changed

+26

-16

lines changed

src/interfaces/ecpg/pgtypeslib
- timestamp.c

1 file changed

+26

-16

lines changed

`‎src/interfaces/ecpg/pgtypeslib/timestamp.c`

Lines changed: 26 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -501,17 +501,22 @@ dttofmtasc_replace(timestamp * ts, date dDate, int dow, struct tm * tm,`
`501`	`501`	`* 4-digit year corresponding to the ISO week number.`
`502`	`502`	`*/`
`503`	`503`	`case'G':`
`504`		`-tm->tm_mon-=1;`
`505`		`-i=strftime(q,*pstr_len,"%G",tm);`
`506`		`-if (i==0)`
`507`		`-return-1;`
`508`		`-while (*q)`
`509`	`504`	`{`
`510`		`-q++;`
`511`		`-(*pstr_len)--;`
	`505`	`+/* Keep compiler quiet - Don't use a literal format */`
	`506`	`+constchar*fmt="%G";`
	`507`	`+`
	`508`	`+tm->tm_mon-=1;`
	`509`	`+i=strftime(q,*pstr_len,fmt,tm);`
	`510`	`+if (i==0)`
	`511`	`+return-1;`
	`512`	`+while (*q)`
	`513`	`+{`
	`514`	`+q++;`
	`515`	`+(*pstr_len)--;`
	`516`	`+}`
	`517`	`+tm->tm_mon+=1;`
	`518`	`+replace_type=PGTYPES_TYPE_NOTHING;`
`512`	`519`	`}`
`513`		`-tm->tm_mon+=1;`
`514`		`-replace_type=PGTYPES_TYPE_NOTHING;`
`515`	`520`	`break;`
`516`	`521`
`517`	`522`	`/*`
`@@ -682,15 +687,20 @@ dttofmtasc_replace(timestamp * ts, date dDate, int dow, struct tm * tm,`
`682`	`687`	`* decimal number.`
`683`	`688`	`*/`
`684`	`689`	`case'V':`
`685`		`-i=strftime(q,*pstr_len,"%V",tm);`
`686`		`-if (i==0)`
`687`		`-return-1;`
`688`		`-while (*q)`
`689`	`690`	`{`
`690`		`-q++;`
`691`		`-(*pstr_len)--;`
	`691`	`+/* Keep compiler quiet - Don't use a literal format */`
	`692`	`+constchar*fmt="%V";`
	`693`	`+`
	`694`	`+i=strftime(q,*pstr_len,fmt,tm);`
	`695`	`+if (i==0)`
	`696`	`+return-1;`
	`697`	`+while (*q)`
	`698`	`+{`
	`699`	`+q++;`
	`700`	`+(*pstr_len)--;`
	`701`	`+}`
	`702`	`+replace_type=PGTYPES_TYPE_NOTHING;`
`692`	`703`	`}`
`693`		`-replace_type=PGTYPES_TYPE_NOTHING;`
`694`	`704`	`break;`
`695`	`705`
`696`	`706`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc49e4ae

File tree

1 file changed

1 file changed

`‎src/interfaces/ecpg/pgtypeslib/timestamp.c`

0 commit comments