diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index fd27b3efe87bc4833a45061a159a293d5072bfbd..15caa1affa31f18accd78b1b43c9ee6749f155e8 100644
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.21 2007/03/26 17:23:36 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.22 2007/06/04 10:02:40 petere Exp $
PostgreSQL documentation
-->
@@ -102,7 +102,7 @@ PostgreSQL documentation
<term><option>--quiet</></term>
<listitem>
<para>
- Do not display a response.
+ Do not display progress messages.
</para>
</listitem>
</varlistentry>
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 02a3a7948f18e53966b9e0ffe15c3a5786dfd17d..caffb5c35a1afd0ef969574ae58dc4247dad15f9 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.44 2007/03/26 17:23:36 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.45 2007/06/04 10:02:40 petere Exp $
PostgreSQL documentation
-->
@@ -129,16 +129,6 @@ PostgreSQL documentation
</listitem>
</varlistentry>
- <varlistentry>
- <term><option>-q</></term>
- <term><option>--quiet</></term>
- <listitem>
- <para>
- Do not display a response.
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><option>-T <replaceable class="parameter">template</replaceable></></term>
<term><option>--template <replaceable class="parameter">template</replaceable></></term>
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index 834ec1db7b64913858c9788bbaf0b9473e6bb242..eb70ace453b9201ea61d90eb2b60ce6c3103586d 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.47 2007/03/26 17:23:36 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.48 2007/06/04 10:02:40 petere Exp $
PostgreSQL documentation
-->
@@ -242,16 +242,6 @@ PostgreSQL documentation
</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term><option>-q</></term>
- <term><option>--quiet</></term>
- <listitem>
- <para>
- Do not display a response.
- </para>
- </listitem>
- </varlistentry>
</variablelist>
</para>
diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index bb07abe0500d70ce4841570106eb20f203912900..4904bdd64b64e143c7b48075f21cb4819fb141d3 100644
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.31 2007/03/26 17:23:36 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.32 2007/06/04 10:02:40 petere Exp $
PostgreSQL documentation
-->
@@ -85,16 +85,6 @@ PostgreSQL documentation
</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term><option>-q</></term>
- <term><option>--quiet</></term>
- <listitem>
- <para>
- Do not display a response.
- </para>
- </listitem>
- </varlistentry>
</variablelist>
</para>
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index 303f053e52b260d97a6ad42493d847d63e2cc343..a4e2195e21d76234d00c96fea7644048314ebb6f 100644
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.36 2007/03/26 17:23:36 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.37 2007/06/04 10:02:40 petere Exp $
PostgreSQL documentation
-->
@@ -87,16 +87,6 @@ PostgreSQL documentation
</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term><option>-q</></term>
- <term><option>--quiet</></term>
- <listitem>
- <para>
- Do not display a response.
- </para>
- </listitem>
- </varlistentry>
</variablelist>
</para>
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 657930d9e5293374bfd203253800a82ab7fdb2a6..e4469bb12effd7bb54d084beff109d8fdd4610b8 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -75,21 +75,27 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term><option>-s</></term>
- <term><option>--system</></term>
+ <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
+ <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
<listitem>
<para>
- Reindex database's system catalogs.
+ Specifies the name of the database to be reindexed.
+ If this is not specified and <option>-a</option> (or
+ <option>--all</option>) is not used, the database name is read
+ from the environment variable <envar>PGDATABASE</envar>. If
+ that is not set, the user name specified for the connection is
+ used.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-t <replaceable class="parameter">table</replaceable></></term>
- <term><option>--table <replaceable class="parameter">table</replaceable></></term>
+ <term><option>-e</></term>
+ <term><option>--echo</></term>
<listitem>
<para>
- Reindex <replaceable class="parameter">table</replaceable> only.
+ Echo the commands that <application>reindexdb</application> generates
+ and sends to the server.
</para>
</listitem>
</varlistentry>
@@ -105,41 +111,34 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
- <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
+ <term><option>-q</></term>
+ <term><option>--quiet</></term>
<listitem>
<para>
- Specifies the name of the database to be reindexed.
- If this is not specified and <option>-a</option> (or
- <option>--all</option>) is not used, the database name is read
- from the environment variable <envar>PGDATABASE</envar>. If
- that is not set, the user name specified for the connection is
- used.
+ Do not display progress messages.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-e</></term>
- <term><option>--echo</></term>
+ <term><option>-s</></term>
+ <term><option>--system</></term>
<listitem>
<para>
- Echo the commands that <application>reindexdb</application> generates
- and sends to the server.
+ Reindex database's system catalogs.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-q</></term>
- <term><option>--quiet</></term>
+ <term><option>-t <replaceable class="parameter">table</replaceable></></term>
+ <term><option>--table <replaceable class="parameter">table</replaceable></></term>
<listitem>
<para>
- Do not display a response.
+ Reindex <replaceable class="parameter">table</replaceable> only.
</para>
</listitem>
</varlistentry>
-
</variablelist>
</para>
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index 600b25d5723c9598b962c12968f59d2eee1a4a72..87c34cee4b2c04a98659ed45b7a6dc0ba22add09 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.40 2007/03/26 17:23:37 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.41 2007/06/04 10:02:40 petere Exp $
PostgreSQL documentation
-->
@@ -119,7 +119,7 @@ PostgreSQL documentation
<term><option>--quiet</></term>
<listitem>
<para>
- Do not display a response.
+ Do not display progress messages.
</para>
</listitem>
</varlistentry>
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index c077e26f43d7107b01fc25361a054c1afe482bab..261aea2c027fa4754ce06de703e965e845cfd611 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);
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 667fbe002474a49019670867bff9a0fb7569d9fd..5004f3c63e6460cdf69e96bdc08e95c4b3d9c148 100644
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.22 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.23 2007/06/04 10:02:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,6 @@ main(int argc, char *argv[])
char *username = NULL;
bool password = false;
bool echo = false;
- bool quiet = false;
char *owner = NULL;
char *tablespace = NULL;
char *template = NULL;
@@ -84,7 +83,7 @@ main(int argc, char *argv[])
echo = true;
break;
case 'q':
- quiet = true;
+ /* obsolete; remove in 8.4 */
break;
case 'O':
owner = optarg;
@@ -175,12 +174,6 @@ main(int argc, char *argv[])
PQclear(result);
PQfinish(conn);
- if (!quiet)
- {
- puts("CREATE DATABASE");
- fflush(stdout);
- }
-
if (comment)
{
conn = connectDatabase(dbname, host, port, username, password, progname);
@@ -203,11 +196,6 @@ main(int argc, char *argv[])
PQclear(result);
PQfinish(conn);
- if (!quiet)
- {
- puts("COMMENT");
- fflush(stdout);
- }
}
exit(0);
@@ -226,7 +214,6 @@ help(const char *progname)
printf(_(" -O, --owner=OWNER database user to own the new database\n"));
printf(_(" -T, --template=TEMPLATE template database to copy\n"));
printf(_(" -e, --echo show the commands being sent to the server\n"));
- printf(_(" -q, --quiet don't write any messages\n"));
printf(_(" --help show this help, then exit\n"));
printf(_(" --version output version information, then exit\n"));
printf(_("\nConnection options:\n"));
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 0fb84f00b91435b681b1b5279ead5c44bc7eae5d..aa7eac674ff7312c0941aa41f38f93126afdd3f3 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.35 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.36 2007/06/04 10:02:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,7 +63,6 @@ main(int argc, char *argv[])
char *username = NULL;
bool password = false;
bool echo = false;
- bool quiet = false;
char *conn_limit = NULL;
bool pwprompt = false;
char *newpassword = NULL;
@@ -107,7 +106,7 @@ main(int argc, char *argv[])
echo = true;
break;
case 'q':
- quiet = true;
+ /* obsolete; remove in 8.4 */
break;
case 'd':
createdb = TRI_YES;
@@ -297,11 +296,6 @@ main(int argc, char *argv[])
PQclear(result);
PQfinish(conn);
- if (!quiet)
- {
- puts("CREATE ROLE");
- fflush(stdout);
- }
exit(0);
}
@@ -329,7 +323,6 @@ help(const char *progname)
printf(_(" -E, --encrypted encrypt stored password\n"));
printf(_(" -N, --unencrypted do not encrypt stored password\n"));
printf(_(" -e, --echo show the commands being sent to the server\n"));
- printf(_(" -q, --quiet don't write any messages\n"));
printf(_(" --help show this help, then exit\n"));
printf(_(" --version output version information, then exit\n"));
printf(_("\nConnection options:\n"));
diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index f7f896b2e8253fc7877881212c148c9f44777c71..d912338d567bd9b9da7e11c66ad338f357fbe0d2 100644
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.19 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.20 2007/06/04 10:02:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,7 +42,6 @@ main(int argc, char *argv[])
char *username = NULL;
bool password = false;
bool echo = false;
- bool quiet = false;
bool interactive = false;
PQExpBufferData sql;
@@ -75,7 +74,7 @@ main(int argc, char *argv[])
echo = true;
break;
case 'q':
- quiet = true;
+ /* obsolete; remove in 8.4 */
break;
case 'i':
interactive = true;
@@ -130,11 +129,6 @@ main(int argc, char *argv[])
PQclear(result);
PQfinish(conn);
- if (!quiet)
- {
- puts("DROP DATABASE");
- fflush(stdout);
- }
exit(0);
}
@@ -148,7 +142,6 @@ help(const char *progname)
printf(_("\nOptions:\n"));
printf(_(" -e, --echo show the commands being sent to the server\n"));
printf(_(" -i, --interactive prompt before deleting anything\n"));
- printf(_(" -q, --quiet don't write any messages\n"));
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
printf(_(" -p, --port=PORT database server port\n"));
printf(_(" -U, --username=USERNAME user name to connect as\n"));
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index b6590beec4cf3bfe173efa7da5678f336954b253..3ee2502fe099712dcf2e840b5ea82932d0a9d28d 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.20 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.21 2007/06/04 10:02:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,7 +42,6 @@ main(int argc, char *argv[])
char *username = NULL;
bool password = false;
bool echo = false;
- bool quiet = false;
bool interactive = false;
PQExpBufferData sql;
@@ -75,7 +74,7 @@ main(int argc, char *argv[])
echo = true;
break;
case 'q':
- quiet = true;
+ /* obsolete; remove in 8.4 */
break;
case 'i':
interactive = true;
@@ -129,11 +128,6 @@ main(int argc, char *argv[])
PQclear(result);
PQfinish(conn);
- if (!quiet)
- {
- puts("DROP ROLE");
- fflush(stdout);
- }
exit(0);
}
@@ -147,7 +141,6 @@ help(const char *progname)
printf(_("\nOptions:\n"));
printf(_(" -e, --echo show the commands being sent to the server\n"));
printf(_(" -i, --interactive prompt before deleting anything\n"));
- printf(_(" -q, --quiet don't write any messages\n"));
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
printf(_(" -p, --port=PORT database server port\n"));
printf(_(" -U, --username=USERNAME user name to connect as (not the one to drop)\n"));
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 34dd72ff4b4f92dff72693c7a997c26e410beb2e..99a676f8f545e316cda24d6a5671d7a8784632f6 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -4,7 +4,7 @@
*
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.10 2007/04/09 18:21:22 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.11 2007/06/04 10:02:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@ static void reindex_one_database(const char *name, const char *dbname,
const char *type, const char *host,
const char *port, const char *username,
bool password, const char *progname,
- bool echo, bool quiet);
+ bool echo);
static void reindex_all_databases(const char *host, const char *port,
const char *username, bool password,
const char *progname, bool echo,
@@ -26,8 +26,7 @@ static void reindex_all_databases(const char *host, const char *port,
static void reindex_system_catalogs(const char *dbname,
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 help(const char *progname);
int
@@ -178,7 +177,7 @@ main(int argc, char *argv[])
}
reindex_system_catalogs(dbname, host, port, username, password,
- progname, echo, quiet);
+ progname, echo);
}
else
{
@@ -194,14 +193,14 @@ main(int argc, char *argv[])
if (index)
reindex_one_database(index, dbname, "INDEX", host, port,
- username, password, progname, echo, quiet);
+ username, password, progname, echo);
if (table)
reindex_one_database(table, dbname, "TABLE", host, port,
- username, password, progname, echo, quiet);
+ username, password, progname, echo);
/* reindex database only if index or table is not specified */
if (index == NULL && table == NULL)
reindex_one_database(dbname, dbname, "DATABASE", host, port,
- username, password, progname, echo, quiet);
+ username, password, progname, echo);
}
exit(0);
@@ -210,8 +209,7 @@ main(int argc, char *argv[])
static void
reindex_one_database(const char *name, const char *dbname, const char *type,
const char *host, const char *port, const char *username,
- bool password, const char *progname, bool echo,
- bool quiet)
+ bool password, const char *progname, bool echo)
{
PQExpBufferData sql;
@@ -247,12 +245,6 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
PQfinish(conn);
termPQExpBuffer(&sql);
-
- if (!quiet)
- {
- puts("REINDEX");
- fflush(stdout);
- }
}
static void
@@ -273,10 +265,13 @@ reindex_all_databases(const char *host, const char *port,
char *dbname = PQgetvalue(result, i, 0);
if (!quiet)
- fprintf(stderr, _("%s: reindexing database \"%s\"\n"), progname, dbname);
+ {
+ printf(_("%s: reindexing database \"%s\"\n"), progname, dbname);
+ fflush(stdout);
+ }
reindex_one_database(dbname, dbname, "DATABASE", host, port, username,
- password, progname, echo, quiet);
+ password, progname, echo);
}
PQclear(result);
@@ -285,7 +280,7 @@ reindex_all_databases(const char *host, const char *port,
static void
reindex_system_catalogs(const char *dbname, 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;
@@ -305,12 +300,6 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
}
PQfinish(conn);
termPQExpBuffer(&sql);
-
- if (!quiet)
- {
- puts("REINDEX");
- fflush(stdout);
- }
}
static void
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index b767133361e96e457309014f898155aef83d1a1c..b4f65b2dc2e07ae7f59496a2fc929b92ce26fa1d 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.17 2007/04/09 18:21:22 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@ static void vacuum_one_database(const char *dbname, bool full, bool verbose, boo
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 vacuum_all_databases(bool full, bool verbose, bool analyze,
const char *host, const char *port,
const char *username, bool password,
@@ -163,7 +163,7 @@ main(int argc, char *argv[])
vacuum_one_database(dbname, full, verbose, analyze, table,
host, port, username, password,
- progname, echo, quiet);
+ progname, echo);
}
exit(0);
@@ -175,7 +175,7 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze,
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;
@@ -208,12 +208,6 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze,
}
PQfinish(conn);
termPQExpBuffer(&sql);
-
- if (!quiet)
- {
- puts("VACUUM");
- fflush(stdout);
- }
}
@@ -236,11 +230,14 @@ vacuum_all_databases(bool full, bool verbose, bool analyze,
char *dbname = PQgetvalue(result, i, 0);
if (!quiet)
- fprintf(stderr, _("%s: vacuuming database \"%s\"\n"), progname, dbname);
+ {
+ printf(_("%s: vacuuming database \"%s\"\n"), progname, dbname);
+ fflush(stdout);
+ }
vacuum_one_database(dbname, full, verbose, analyze, NULL,
host, port, username, password,
- progname, echo, quiet);
+ progname, echo);
}
PQclear(result);