diff options
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 7 | ||||
| -rw-r--r-- | src/backend/utils/adt/nabstime.c | 5 | ||||
| -rw-r--r-- | src/backend/utils/misc/pg_rusage.c | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index ad6477a372d..956dbf98739 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.471 2005/10/20 20:05:44 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.472 2005/10/22 14:27:28 adunstan Exp $ * * NOTES * @@ -1148,9 +1148,8 @@ ServerLoop(void) last_touch_time; struct timeval earlier, later; - struct timezone tz; - gettimeofday(&earlier, &tz); + gettimeofday(&earlier, NULL); last_touch_time = time(NULL); nSockets = initMasks(&readmask); @@ -1207,7 +1206,7 @@ ServerLoop(void) */ while (random_seed == 0) { - gettimeofday(&later, &tz); + gettimeofday(&later, NULL); /* * We are not sure how much precision is in tv_usec, so we diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 40e7522b879..63e5347c5b2 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.145 2005/10/15 02:49:29 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.146 2005/10/22 14:27:29 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -1584,14 +1584,13 @@ Datum timeofday(PG_FUNCTION_ARGS) { struct timeval tp; - struct timezone tpz; char templ[128]; char buf[128]; text *result; int len; pg_time_t tt; - gettimeofday(&tp, &tpz); + gettimeofday(&tp, NULL); tt = (pg_time_t) tp.tv_sec; pg_strftime(templ, sizeof(templ), "%a %b %d %H:%M:%S.%%06d %Y %Z", pg_localtime(&tt, global_timezone)); diff --git a/src/backend/utils/misc/pg_rusage.c b/src/backend/utils/misc/pg_rusage.c index cf7bbb427cb..dffbb699d49 100644 --- a/src/backend/utils/misc/pg_rusage.c +++ b/src/backend/utils/misc/pg_rusage.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/pg_rusage.c,v 1.2 2005/10/15 02:49:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/pg_rusage.c,v 1.3 2005/10/22 14:27:29 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -26,10 +26,8 @@ void pg_rusage_init(PGRUsage *ru0) { - struct timezone tz; - getrusage(RUSAGE_SELF, &ru0->ru); - gettimeofday(&ru0->tv, &tz); + gettimeofday(&ru0->tv, NULL); } /* |