diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-10-15 20:24:00 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-10-15 20:24:00 +0000 |
| commit | 0631059c9c5a77b8a7f3332e0f7e4320c40c6e82 (patch) | |
| tree | 82ebb02ba7db992f3110073f65d54c732273aa0f | |
| parent | 2c19629f93d6b9de64de91c4c818c6c1049cf568 (diff) | |
| download | postgresql-0631059c9c5a77b8a7f3332e0f7e4320c40c6e82.tar.gz postgresql-0631059c9c5a77b8a7f3332e0f7e4320c40c6e82.zip | |
Fix unportable struct initializations.
| -rw-r--r-- | contrib/pgbench/pgbench.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index 4ec056b3439..1c0e0bdd68f 100644 --- a/contrib/pgbench/pgbench.c +++ b/contrib/pgbench/pgbench.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.43 2005/10/15 02:49:06 momjian Exp $ + * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.44 2005/10/15 20:24:00 tgl Exp $ * * pgbench: a simple benchmark program for PostgreSQL * written by Tatsuo Ishii @@ -260,12 +260,14 @@ compareVariables(const void *v1, const void *v2) static char * getVariable(CState * st, char *name) { - Variable key = {name}, *var; + Variable key, + *var; /* On some versions of Solaris, bsearch of zero items dumps core */ if (st->nvariables <= 0) return NULL; + key.name = name; var = (Variable *) bsearch((void *) &key, (void *) st->variables, st->nvariables, @@ -280,8 +282,10 @@ getVariable(CState * st, char *name) static int putVariable(CState * st, char *name, char *value) { - Variable key = {name}, *var; + Variable key, + *var; + key.name = name; /* On some versions of Solaris, bsearch of zero items dumps core */ if (st->nvariables > 0) var = (Variable *) bsearch((void *) &key, @@ -1093,11 +1097,10 @@ main(int argc, char **argv) #if !(defined(__CYGWIN__) || defined(__MINGW32__)) #ifdef RLIMIT_NOFILE /* most platform uses RLIMIT_NOFILE */ if (getrlimit(RLIMIT_NOFILE, &rlim) == -1) - { #else /* but BSD doesn't ... */ if (getrlimit(RLIMIT_OFILE, &rlim) == -1) +#endif /* RLIMIT_NOFILE */ { -#endif /* HAVE_RLIMIT_NOFILE */ fprintf(stderr, "getrlimit failed. reason: %s\n", strerror(errno)); exit(1); } @@ -1107,8 +1110,7 @@ main(int argc, char **argv) fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n"); exit(1); } -#endif /* #if !(defined(__CYGWIN__) || - * defined(__MINGW32__)) */ +#endif /* #if !(defined(__CYGWIN__) || defined(__MINGW32__)) */ break; case 'C': is_connect = 1; |