Final removal of -q options, which haven't done anything since 8.3 and

were marked for removal in 8.4.

diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 218f7b3822b9e0051d1b73ff784ea6a4e7ea53ea..6ea03feab8fe63be791b28ee113ef9707b7a55b5 100644 (file)
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -28,7 +28,6 @@ main(int argc, char *argv[])
                {"no-password", no_argument, NULL, 'w'},
                {"password", no_argument, NULL, 'W'},
                {"echo", no_argument, NULL, 'e'},
-               {"quiet", no_argument, NULL, 'q'},
                {"owner", required_argument, NULL, 'O'},
                {"tablespace", required_argument, NULL, 'D'},
                {"template", required_argument, NULL, 'T'},
@@ -68,7 +67,7 @@ main(int argc, char *argv[])
 
        handle_help_version_opts(argc, argv, "createdb", help);
 
-       while ((c = getopt_long(argc, argv, "h:p:U:wWeqO:D:T:E:l:", long_options, &optindex)) != -1)
+       while ((c = getopt_long(argc, argv, "h:p:U:wWeO:D:T:E:l:", long_options, &optindex)) != -1)
        {
                switch (c)
                {
@@ -90,9 +89,6 @@ main(int argc, char *argv[])
                        case 'e':
                                echo = true;
                                break;
-                       case 'q':
-                               /* obsolete; remove in 8.4 */
-                               break;
                        case 'O':
                                owner = optarg;
                                break;

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 7f30d5080daa6b98c86b6061e5ddea68fc3a76de..b2af4155fe257995fe283633566b39962862b874 100644 (file)
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -27,7 +27,6 @@ main(int argc, char *argv[])
                {"no-password", no_argument, NULL, 'w'},
                {"password", no_argument, NULL, 'W'},
                {"echo", no_argument, NULL, 'e'},
-               {"quiet", no_argument, NULL, 'q'},
                {"createdb", no_argument, NULL, 'd'},
                {"no-createdb", no_argument, NULL, 'D'},
                {"superuser", no_argument, NULL, 's'},
@@ -79,7 +78,7 @@ main(int argc, char *argv[])
 
        handle_help_version_opts(argc, argv, "createuser", help);
 
-       while ((c = getopt_long(argc, argv, "h:p:U:wWeqdDsSaArRiIlLc:PEN",
+       while ((c = getopt_long(argc, argv, "h:p:U:wWedDsSaArRiIlLc:PEN",
                                                        long_options, &optindex)) != -1)
        {
                switch (c)
@@ -102,9 +101,6 @@ main(int argc, char *argv[])
                        case 'e':
                                echo = true;
                                break;
-                       case 'q':
-                               /* obsolete; remove in 8.4 */
-                               break;
                        case 'd':
                                createdb = TRI_YES;
                                break;

diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index c3bb7a2951e48e8a84aadb8e2062750aa840f3cf..3aeae5edb4f8c387d8175316bb658ce334dd78f8 100644 (file)
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -28,7 +28,6 @@ main(int argc, char *argv[])
                {"no-password", no_argument, NULL, 'w'},
                {"password", no_argument, NULL, 'W'},
                {"echo", no_argument, NULL, 'e'},
-               {"quiet", no_argument, NULL, 'q'},
                {"interactive", no_argument, NULL, 'i'},
                {NULL, 0, NULL, 0}
        };
@@ -55,7 +54,7 @@ main(int argc, char *argv[])
 
        handle_help_version_opts(argc, argv, "dropdb", help);
 
-       while ((c = getopt_long(argc, argv, "h:p:U:wWeqi", long_options, &optindex)) != -1)
+       while ((c = getopt_long(argc, argv, "h:p:U:wWei", long_options, &optindex)) != -1)
        {
                switch (c)
                {
@@ -77,9 +76,6 @@ main(int argc, char *argv[])
                        case 'e':
                                echo = true;
                                break;
-                       case 'q':
-                               /* obsolete; remove in 8.4 */
-                               break;
                        case 'i':
                                interactive = true;
                                break;

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index a8f8775fdac698930b1db099eea07767e5d40a87..63c15d283f2f857ea43055ae042fe67bc5fbb7fc 100644 (file)
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -28,7 +28,6 @@ main(int argc, char *argv[])
                {"no-password", no_argument, NULL, 'w'},
                {"password", no_argument, NULL, 'W'},
                {"echo", no_argument, NULL, 'e'},
-               {"quiet", no_argument, NULL, 'q'},
                {"interactive", no_argument, NULL, 'i'},
                {NULL, 0, NULL, 0}
        };
@@ -55,7 +54,7 @@ main(int argc, char *argv[])
 
        handle_help_version_opts(argc, argv, "dropuser", help);
 
-       while ((c = getopt_long(argc, argv, "h:p:U:wWeqi", long_options, &optindex)) != -1)
+       while ((c = getopt_long(argc, argv, "h:p:U:wWei", long_options, &optindex)) != -1)
        {
                switch (c)
                {
@@ -77,9 +76,6 @@ main(int argc, char *argv[])
                        case 'e':
                                echo = true;
                                break;
-                       case 'q':
-                               /* obsolete; remove in 8.4 */
-                               break;
                        case 'i':
                                interactive = true;
                                break;