adunstan · adunstan · commit 188c52497dc5 · 2005-10-22T14:27:29.000Z
minor code cleanup - replace useless struct timezone argument to
gettimeofday with NULL in a few places, making it consistent with
usage elsewhere.
diff --git 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
@@ -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
@@ -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);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.471 2005/10/20 20:05:44 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.472 2005/10/22 14:27:28 adunstan Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -1148,9 +1148,8 @@ ServerLoop(void)`
`1148`	`1148`	`last_touch_time;`
`1149`	`1149`	`struct timeval earlier,`
`1150`	`1150`	`later;`
`1151`		`- struct timezone tz;`
`1152`	`1151`
`1153`		`- gettimeofday(&earlier, &tz);`
	`1152`	`+ gettimeofday(&earlier, NULL);`
`1154`	`1153`	`last_touch_time = time(NULL);`
`1155`	`1154`
`1156`	`1155`	`nSockets = initMasks(&readmask);`
`@@ -1207,7 +1206,7 @@ ServerLoop(void)`
`1207`	`1206`	`*/`
`1208`	`1207`	`while (random_seed == 0)`
`1209`	`1208`	`{`
`1210`		`- gettimeofday(&later, &tz);`
	`1209`	`+ gettimeofday(&later, NULL);`
`1211`	`1210`
`1212`	`1211`	`/*`
`1213`	`1212`	`* We are not sure how much precision is in tv_usec, so we`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.145 2005/10/15 02:49:29 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.146 2005/10/22 14:27:29 adunstan Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -1584,14 +1584,13 @@ Datum`
`1584`	`1584`	`timeofday(PG_FUNCTION_ARGS)`
`1585`	`1585`	`{`
`1586`	`1586`	`struct timeval tp;`
`1587`		`- struct timezone tpz;`
`1588`	`1587`	`char templ[128];`
`1589`	`1588`	`char buf[128];`
`1590`	`1589`	`text *result;`
`1591`	`1590`	`int len;`
`1592`	`1591`	`pg_time_t tt;`
`1593`	`1592`
`1594`		`- gettimeofday(&tp, &tpz);`
	`1593`	`+ gettimeofday(&tp, NULL);`
`1595`	`1594`	`tt = (pg_time_t) tp.tv_sec;`
`1596`	`1595`	`pg_strftime(templ, sizeof(templ), "%a %b %d %H:%M:%S.%%06d %Y %Z",`
`1597`	`1596`	`pg_localtime(&tt, global_timezone));`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/pg_rusage.c,v 1.2 2005/10/15 02:49:36 momjian Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/pg_rusage.c,v 1.3 2005/10/22 14:27:29 adunstan Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -26,10 +26,8 @@`
`26`	`26`	`void`
`27`	`27`	`pg_rusage_init(PGRUsage *ru0)`
`28`	`28`	`{`
`29`		`- struct timezone tz;`
`30`		`-`
`31`	`29`	`getrusage(RUSAGE_SELF, &ru0->ru);`
`32`		`- gettimeofday(&ru0->tv, &tz);`
	`30`	`+ gettimeofday(&ru0->tv, NULL);`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`/*`