NotificationsYou must be signed in to change notification settings
Fork86
Star738

Commitcbf2bf9

committed

Merge remote-tracking branch 'origin/REL_2_5' into REL_2_5

2 parents297dd2a +a2387b5 commitcbf2bf9Copy full SHA for cbf2bf9

File tree

1 file changed

-21

lines changed

src/utils
- configuration.c

1 file changed

-21

lines changed

`‎src/utils/configuration.c`

Lines changed: 3 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -1294,9 +1294,7 @@ parse_time(const char value, time_t result, bool utc_default)`
`1294`	`1294`	`{`
`1295`	`1295`	`/* set timezone to UTC */`
`1296`	`1296`	`pgut_setenv("TZ","UTC");`
`1297`		`-#ifdefWIN32`
`1298`	`1297`	`tzset();`
`1299`		`-#endif`
`1300`	`1298`	`}`
`1301`	`1299`
`1302`	`1300`	`/* convert time to utc unix time */`
`@@ -1308,9 +1306,7 @@ parse_time(const char value, time_t result, bool utc_default)`
`1308`	`1306`	`else`
`1309`	`1307`	`pgut_unsetenv("TZ");`
`1310`	`1308`
`1311`		`-#ifdefWIN32`
`1312`	`1309`	`tzset();`
`1313`		`-#endif`
`1314`	`1310`
`1315`	`1311`	`/* adjust time zone */`
`1316`	`1312`	`if (tz_set\|\|utc_default)`
`@@ -1546,33 +1542,19 @@ time2iso(char *buf, size_t len, time_t time, bool utc)`
`1546`	`1542`	`time_tgmt;`
`1547`	`1543`	`time_toffset;`
`1548`	`1544`	`char*ptr=buf;`
`1549`		`-char*local_tz=getenv("TZ");`
`1550`	`1545`
`1551`	`1546`	`/* set timezone to UTC if requested */`
`1552`	`1547`	`if (utc)`
`1553`	`1548`	`{`
`1554`		`-pgut_setenv("TZ","UTC");`
`1555`		`-#ifdefWIN32`
`1556`		`-tzset();`
`1557`		`-#endif`
	`1549`	`+ptm=gmtime(&time);`
	`1550`	`+strftime(ptr,len,"%Y-%m-%d %H:%M:%S+00",ptm);`
	`1551`	`+return;`
`1558`	`1552`	`}`
`1559`	`1553`
`1560`	`1554`	`ptm=gmtime(&time);`
`1561`	`1555`	`gmt=mktime(ptm);`
`1562`	`1556`	`ptm=localtime(&time);`
`1563`	`1557`
`1564`		`-if (utc)`
`1565`		`-{`
`1566`		`-/* return old timezone back if any */`
`1567`		`-if (local_tz)`
`1568`		`-pgut_setenv("TZ",local_tz);`
`1569`		`-else`
`1570`		`-pgut_unsetenv("TZ");`
`1571`		`-#ifdefWIN32`
`1572`		`-tzset();`
`1573`		`-#endif`
`1574`		`-}`
`1575`		`-`
`1576`	`1558`	`/* adjust timezone offset */`
`1577`	`1559`	`offset=time-gmt+ (ptm->tm_isdst ?3600 :0);`
`1578`	`1560`

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!

Commitcbf2bf9

File tree

1 file changed

1 file changed

`‎src/utils/configuration.c`

0 commit comments