aboutsummaryrefslogtreecommitdiff
path: root/src/bin/scripts/clusterdb.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2007-06-04 10:02:40 +0000
committerPeter Eisentraut <peter_e@gmx.net>2007-06-04 10:02:40 +0000
commit9539e64bc01866ecec0082555f7a37271fe62be4 (patch)
tree4beb3ddafe86b9238fa675a19f86398ae0a37a5d /src/bin/scripts/clusterdb.c
parentefbd5bcb5a40179970d39e4a09c9bd6cf4697855 (diff)
downloadpostgresql-9539e64bc01866ecec0082555f7a37271fe62be4.tar.gz
postgresql-9539e64bc01866ecec0082555f7a37271fe62be4.zip
Remove gratuitous response messages from utility programs.
(Possibly release notes material, lest users be confused.) The --quiet option is now obsolete and without effect in createdb, createuser, dropdb, dropuser; kept for compatibility but marked for removal in 8.4. Progress messages when acting on all databases now go to stdout instead of stderr, since they are not in fact errors. Ordered options in reindexdb reference page alphabetically, like in other programs' pages.
Diffstat (limited to 'src/bin/scripts/clusterdb.c')
-rw-r--r--src/bin/scripts/clusterdb.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index c077e26f43d..261aea2c027 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -4,7 +4,7 @@
*
* Portions Copyright (c) 2002-2007, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.17 2007/04/09 18:21:22 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,7 +17,7 @@
static void cluster_one_database(const char *dbname, const char *table,
const char *host, const char *port,
const char *username, bool password,
- const char *progname, bool echo, bool quiet);
+ const char *progname, bool echo);
static void cluster_all_databases(const char *host, const char *port,
const char *username, bool password,
const char *progname, bool echo, bool quiet);
@@ -145,7 +145,7 @@ main(int argc, char *argv[])
cluster_one_database(dbname, table,
host, port, username, password,
- progname, echo, quiet);
+ progname, echo);
}
exit(0);
@@ -156,7 +156,7 @@ static void
cluster_one_database(const char *dbname, const char *table,
const char *host, const char *port,
const char *username, bool password,
- const char *progname, bool echo, bool quiet)
+ const char *progname, bool echo)
{
PQExpBufferData sql;
@@ -183,12 +183,6 @@ cluster_one_database(const char *dbname, const char *table,
}
PQfinish(conn);
termPQExpBuffer(&sql);
-
- if (!quiet)
- {
- puts("CLUSTER");
- fflush(stdout);
- }
}
@@ -210,11 +204,14 @@ cluster_all_databases(const char *host, const char *port,
char *dbname = PQgetvalue(result, i, 0);
if (!quiet)
- fprintf(stderr, _("%s: clustering database \"%s\"\n"), progname, dbname);
+ {
+ printf(_("%s: clustering database \"%s\"\n"), progname, dbname);
+ fflush(stdout);
+ }
cluster_one_database(dbname, NULL,
host, port, username, password,
- progname, echo, quiet);
+ progname, echo);
}
PQclear(result);