Avoid assuming that the fields of struct timeval have exactly type long.

tglsfdc · tglsfdc · commit a868e2466035 · 2007-05-24T18:54:10.000Z
This is probably incorrect on some platforms, and definitely draws a
compiler warning on Darwin.
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.65 2007/04/08 01:15:07 ishii Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.66 2007/05/24 18:54:10 tgl Exp $
  *
  * pgbench: a simple benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -476,7 +476,8 @@ doCustom(CState * state, int n, int debug)
 				(int) (now.tv_usec - st->txn_begin.tv_usec);
 
 			fprintf(LOGFILE, "%d %d %.0f %d %ld %ld\n",
-				st->id, st->cnt, diff, st->use_file, now.tv_sec,now.tv_usec);
+					st->id, st->cnt, diff, st->use_file,
+					(long) now.tv_sec, (long) now.tv_usec);
 		}
 
 		if (commands[st->state]->type == SQL_COMMAND)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.65 2007/04/08 01:15:07 ishii Exp $`
	`2`	`+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.66 2007/05/24 18:54:10 tgl Exp $`
`3`	`3`	`*`
`4`	`4`	`* pgbench: a simple benchmark program for PostgreSQL`
`5`	`5`	`* written by Tatsuo Ishii`
`@@ -476,7 +476,8 @@ doCustom(CState * state, int n, int debug)`
`476`	`476`	`(int) (now.tv_usec - st->txn_begin.tv_usec);`
`477`	`477`
`478`	`478`	`fprintf(LOGFILE, "%d %d %.0f %d %ld %ld\n",`
`479`		`- st->id, st->cnt, diff, st->use_file, now.tv_sec,now.tv_usec);`
	`479`	`+ st->id, st->cnt, diff, st->use_file,`
	`480`	`+ (long) now.tv_sec, (long) now.tv_usec);`
`480`	`481`	`}`
`481`	`482`
`482`	`483`	`if (commands[st->state]->type == SQL_COMMAND)`