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

Commit78693c8

Browse files
committed
Clean up include files use in psql.
1 parent5933f18 commit78693c8

27 files changed

+65
-134
lines changed

‎src/bin/pg_id/pg_id.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
*
77
* Copyright (C) 2000 by PostgreSQL Global Development Group
88
*
9-
* $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.12 2000/02/09 16:23:42 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.13 2000/02/16 13:15:25 momjian Exp $
1010
*/
11-
#include<c.h>
11+
#include<postgres.h>
1212

1313
#ifdefHAVE_GETOPT_H
1414
#include<getopt.h>

‎src/bin/psql/command.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.18 2000/02/07 23:10:04 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.19 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"command.h"
1010

1111
#include<errno.h>
1212
#include<assert.h>
13-
#include<string.h>
14-
#include<stdio.h>
15-
#include<stdlib.h>
1613
#include<ctype.h>
1714
#ifndefWIN32
1815
#include<sys/types.h>/* for umask() */
@@ -22,8 +19,8 @@
2219
#include<win32.h>
2320
#endif
2421

25-
#include<libpq-fe.h>
26-
#include<pqexpbuffer.h>
22+
#include"libpq-fe.h"
23+
#include"pqexpbuffer.h"
2724

2825
#include"common.h"
2926
#include"copy.h"

‎src/bin/psql/command.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.7 2000/01/29 16:58:48 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
77
*/
88
#ifndefCOMMAND_H
99
#defineCOMMAND_H
1010

11-
#include<c.h>
12-
13-
#include<pqexpbuffer.h>
11+
#include"pqexpbuffer.h"
1412

1513
#include"settings.h"
1614
#include"print.h"

‎src/bin/psql/common.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.13 2000/02/13 21:45:14 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.14 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"common.h"
1010

1111
#include<errno.h>
12-
#include<stdlib.h>
13-
#include<stdio.h>
14-
#include<string.h>
1512
#include<stdarg.h>
1613
#ifdefHAVE_TERMIOS_H
1714
#include<termios.h>
@@ -27,10 +24,10 @@
2724
#include<win32.h>
2825
#endif
2926

30-
#include<libpq-fe.h>
31-
#include<postgres_ext.h>
32-
#include<pqsignal.h>
33-
#include<version.h>
27+
#include"libpq-fe.h"
28+
#include"postgres_ext.h"
29+
#include"pqsignal.h"
30+
#include"version.h"
3431

3532
#include"settings.h"
3633
#include"variables.h"

‎src/bin/psql/common.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.5 2000/01/29 16:58:48 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.6 2000/02/16 13:15:26 momjian Exp $
77
*/
88
#ifndefCOMMON_H
99
#defineCOMMON_H
1010

11-
#include<c.h>
12-
#include<libpq-fe.h>
11+
#include"libpq-fe.h"
1312

1413
char*xstrdup(constchar*string);
1514

‎src/bin/psql/copy.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.9 2000/01/29 16:58:48 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.10 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"copy.h"
1010

11-
#include<stdlib.h>
12-
#include<stdio.h>
13-
#include<string.h>
1411
#include<errno.h>
1512
#include<assert.h>
1613
#ifndefWIN32
@@ -19,7 +16,7 @@
1916
#include<io.h>/* I think */
2017
#endif
2118

22-
#include<libpq-fe.h>
19+
#include"libpq-fe.h"
2320

2421
#include"settings.h"
2522
#include"common.h"

‎src/bin/psql/copy.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/copy.h,v 1.6 2000/01/29 16:58:48 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/copy.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
77
*/
88
#ifndefCOPY_H
99
#defineCOPY_H
1010

11-
#include<c.h>
12-
#include<stdio.h>
13-
#include<libpq-fe.h>
11+
#include"libpq-fe.h"
1412

1513
/* handler for \copy */
1614
booldo_copy(constchar*args);

‎src/bin/psql/describe.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.16 2000/02/07 23:10:06 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.17 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"describe.h"
1010

11-
#include<string.h>
12-
13-
#include<postgres.h>/* for VARHDRSZ, int4 type */
14-
#include<postgres_ext.h>
15-
#include<libpq-fe.h>
11+
#include"libpq-fe.h"
1612

1713
#include"common.h"
1814
#include"settings.h"

‎src/bin/psql/describe.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.7 2000/01/29 16:58:48 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
77
*/
88
#ifndefDESCRIBE_H
99
#defineDESCRIBE_H
1010

11-
#include<c.h>
1211
#include"settings.h"
1312

1413
/* \da */

‎src/bin/psql/help.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.18 2000/02/13 21:45:14 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.19 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"help.h"
1010

11-
#include<stdio.h>
12-
#include<stdlib.h>
1311
#include<signal.h>
1412
#include<errno.h>
1513

@@ -24,8 +22,8 @@
2422
#include<win32.h>
2523
#endif
2624

27-
#include<pqsignal.h>
28-
#include<libpq-fe.h>
25+
#include"pqsignal.h"
26+
#include"libpq-fe.h"
2927

3028
#include"settings.h"
3129
#include"common.h"

‎src/bin/psql/help.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/help.h,v 1.5 2000/01/29 16:58:48 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/help.h,v 1.6 2000/02/16 13:15:26 momjian Exp $
77
*/
88
#ifndefHELP_H
99
#defineHELP_H
1010

11-
#include<c.h>
12-
1311
voidusage(void);
1412

1513
voidslashUsage(void);

‎src/bin/psql/input.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.9 2000/02/07 23:10:06 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.10 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"input.h"
1010

1111
#include<errno.h>
1212

13-
#include<pqexpbuffer.h>
14-
13+
#include"pqexpbuffer.h"
1514
#include"settings.h"
1615
#include"tab-complete.h"
1716
#include"common.h"

‎src/bin/psql/input.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.7 2000/02/07 23:10:06 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
77
*/
88
#ifndefINPUT_H
99
#defineINPUT_H
1010

11-
#include<c.h>
12-
#include<stdio.h>
13-
1411
/*
1512
* If some other file needs to have access to readline/history, include this
1613
* file and save yourself all this work.

‎src/bin/psql/large_obj.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.8 2000/02/07 23:10:06 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.9 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"large_obj.h"
1010

11-
#include<stdio.h>
12-
#include<string.h>
13-
14-
#include<libpq-fe.h>
15-
#include<postgres.h>
11+
#include"libpq-fe.h"
1612

1713
#include"settings.h"
1814
#include"variables.h"

‎src/bin/psql/large_obj.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.7 2000/01/29 16:58:49 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
77
*/
88
#ifndefLARGE_OBJ_H
99
#defineLARGE_OBJ_H
1010

11-
#include<c.h>
12-
1311
booldo_lo_export(constchar*loid_arg,constchar*filename_arg);
1412
booldo_lo_import(constchar*filename_arg,constchar*comment_arg);
1513
booldo_lo_unlink(constchar*loid_arg);

‎src/bin/psql/mainloop.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.19 2000/02/13 21:45:14 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.20 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"mainloop.h"
1010

11-
#include<stdio.h>
12-
#include<stdlib.h>
13-
#include<string.h>
14-
15-
#include<pqexpbuffer.h>
11+
#include"pqexpbuffer.h"
1612

1713
#include"settings.h"
1814
#include"prompt.h"

‎src/bin/psql/mainloop.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.6 2000/01/29 16:58:49 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
77
*/
88
#ifndefMAINLOOP_H
99
#defineMAINLOOP_H
1010

11-
#include<stdio.h>
12-
1311
intMainLoop(FILE*source);
1412

1513
#endif/* MAINLOOP_H */

‎src/bin/psql/print.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.11 2000/02/09 16:23:43 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.12 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"print.h"
1010

11-
#include<stdio.h>
12-
#include<stdlib.h>
1311
#include<math.h>
1412
#include<signal.h>
1513
#ifndefWIN32
@@ -20,9 +18,8 @@
2018
#definepclose(x) _pclose(x)
2119
#endif
2220

23-
#include<pqsignal.h>
24-
#include<libpq-fe.h>
25-
#include<postgres_ext.h>/* for Oid type */
21+
#include"pqsignal.h"
22+
#include"libpq-fe.h"
2623

2724
#ifndef__CYGWIN__
2825
#defineDEFAULT_PAGER "more"

‎src/bin/psql/print.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.6 2000/01/29 16:58:49 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
77
*/
88
#ifndefPRINT_H
99
#definePRINT_H
1010

11-
#include<config.h>
12-
#include<c.h>
13-
14-
#include<stdio.h>
15-
#include<libpq-fe.h>
11+
#include"libpq-fe.h"
1612

1713
enumprintFormat
1814
{

‎src/bin/psql/prompt.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.8 2000/02/07 23:10:06 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.9 2000/02/16 13:15:26 momjian Exp $
77
*/
8-
#include<c.h>
8+
#include"postgres.h"
99
#include"prompt.h"
1010

11-
#include<string.h>
12-
#include<stdio.h>
13-
#include<stdlib.h>
14-
15-
#include<libpq-fe.h>
11+
#include"libpq-fe.h"
1612

1713
#include"settings.h"
1814
#include"common.h"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp