Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit257c4ff

Browse files
committed
Final removal of -q options, which haven't done anything since 8.3 and
were marked for removal in 8.4.
1 parent9de59fd commit257c4ff

File tree

4 files changed

+8
-24
lines changed

4 files changed

+8
-24
lines changed

‎src/bin/scripts/createdb.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
8-
* $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.32 2009/02/26 16:02:39 petere Exp $
8+
* $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.33 2009/02/26 16:20:55 petere Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -28,7 +28,6 @@ main(int argc, char *argv[])
2828
{"no-password",no_argument,NULL,'w'},
2929
{"password",no_argument,NULL,'W'},
3030
{"echo",no_argument,NULL,'e'},
31-
{"quiet",no_argument,NULL,'q'},
3231
{"owner",required_argument,NULL,'O'},
3332
{"tablespace",required_argument,NULL,'D'},
3433
{"template",required_argument,NULL,'T'},
@@ -68,7 +67,7 @@ main(int argc, char *argv[])
6867

6968
handle_help_version_opts(argc,argv,"createdb",help);
7069

71-
while ((c=getopt_long(argc,argv,"h:p:U:wWeqO:D:T:E:l:",long_options,&optindex))!=-1)
70+
while ((c=getopt_long(argc,argv,"h:p:U:wWeO:D:T:E:l:",long_options,&optindex))!=-1)
7271
{
7372
switch (c)
7473
{
@@ -90,9 +89,6 @@ main(int argc, char *argv[])
9089
case'e':
9190
echo= true;
9291
break;
93-
case'q':
94-
/* obsolete; remove in 8.4 */
95-
break;
9692
case'O':
9793
owner=optarg;
9894
break;

‎src/bin/scripts/createuser.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
8-
* $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.42 2009/02/26 16:02:39 petere Exp $
8+
* $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.43 2009/02/26 16:20:55 petere Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -27,7 +27,6 @@ main(int argc, char *argv[])
2727
{"no-password",no_argument,NULL,'w'},
2828
{"password",no_argument,NULL,'W'},
2929
{"echo",no_argument,NULL,'e'},
30-
{"quiet",no_argument,NULL,'q'},
3130
{"createdb",no_argument,NULL,'d'},
3231
{"no-createdb",no_argument,NULL,'D'},
3332
{"superuser",no_argument,NULL,'s'},
@@ -79,7 +78,7 @@ main(int argc, char *argv[])
7978

8079
handle_help_version_opts(argc,argv,"createuser",help);
8180

82-
while ((c=getopt_long(argc,argv,"h:p:U:wWeqdDsSaArRiIlLc:PEN",
81+
while ((c=getopt_long(argc,argv,"h:p:U:wWedDsSaArRiIlLc:PEN",
8382
long_options,&optindex))!=-1)
8483
{
8584
switch (c)
@@ -102,9 +101,6 @@ main(int argc, char *argv[])
102101
case'e':
103102
echo= true;
104103
break;
105-
case'q':
106-
/* obsolete; remove in 8.4 */
107-
break;
108104
case'd':
109105
createdb=TRI_YES;
110106
break;

‎src/bin/scripts/dropdb.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
8-
* $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.26 2009/02/26 16:02:39 petere Exp $
8+
* $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.27 2009/02/26 16:20:55 petere Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -28,7 +28,6 @@ main(int argc, char *argv[])
2828
{"no-password",no_argument,NULL,'w'},
2929
{"password",no_argument,NULL,'W'},
3030
{"echo",no_argument,NULL,'e'},
31-
{"quiet",no_argument,NULL,'q'},
3231
{"interactive",no_argument,NULL,'i'},
3332
{NULL,0,NULL,0}
3433
};
@@ -55,7 +54,7 @@ main(int argc, char *argv[])
5554

5655
handle_help_version_opts(argc,argv,"dropdb",help);
5756

58-
while ((c=getopt_long(argc,argv,"h:p:U:wWeqi",long_options,&optindex))!=-1)
57+
while ((c=getopt_long(argc,argv,"h:p:U:wWei",long_options,&optindex))!=-1)
5958
{
6059
switch (c)
6160
{
@@ -77,9 +76,6 @@ main(int argc, char *argv[])
7776
case'e':
7877
echo= true;
7978
break;
80-
case'q':
81-
/* obsolete; remove in 8.4 */
82-
break;
8379
case'i':
8480
interactive= true;
8581
break;

‎src/bin/scripts/dropuser.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
8-
* $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.27 2009/02/26 16:02:39 petere Exp $
8+
* $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.28 2009/02/26 16:20:55 petere Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -28,7 +28,6 @@ main(int argc, char *argv[])
2828
{"no-password",no_argument,NULL,'w'},
2929
{"password",no_argument,NULL,'W'},
3030
{"echo",no_argument,NULL,'e'},
31-
{"quiet",no_argument,NULL,'q'},
3231
{"interactive",no_argument,NULL,'i'},
3332
{NULL,0,NULL,0}
3433
};
@@ -55,7 +54,7 @@ main(int argc, char *argv[])
5554

5655
handle_help_version_opts(argc,argv,"dropuser",help);
5756

58-
while ((c=getopt_long(argc,argv,"h:p:U:wWeqi",long_options,&optindex))!=-1)
57+
while ((c=getopt_long(argc,argv,"h:p:U:wWei",long_options,&optindex))!=-1)
5958
{
6059
switch (c)
6160
{
@@ -77,9 +76,6 @@ main(int argc, char *argv[])
7776
case'e':
7877
echo= true;
7978
break;
80-
case'q':
81-
/* obsolete; remove in 8.4 */
82-
break;
8379
case'i':
8480
interactive= true;
8581
break;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp