Clean up include files use in psql.

bmomjian · bmomjian · commit 78693c89d77c · 2000-02-16T13:15:26.000Z
diff --git a/src/bin/pg_id/pg_id.c b/src/bin/pg_id/pg_id.c
@@ -6,9 +6,9 @@
  *
  * Copyright (C) 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.12 2000/02/09 16:23:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.13 2000/02/16 13:15:25 momjian Exp $
  */
-#include <c.h>
+#include <postgres.h>
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -3,16 +3,13 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.18 2000/02/07 23:10:04 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.19 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "command.h"
 
 #include <errno.h>
 #include <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
 #ifndef WIN32
 #include <sys/types.h>			/* for umask() */
@@ -22,8 +19,8 @@
 #include <win32.h>
 #endif
 
-#include <libpq-fe.h>
-#include <pqexpbuffer.h>
+#include "libpq-fe.h"
+#include "pqexpbuffer.h"
 
 #include "common.h"
 #include "copy.h"
diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h
@@ -3,14 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.7 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef COMMAND_H
 #define COMMAND_H
 
-#include <c.h>
-
-#include <pqexpbuffer.h>
+#include "pqexpbuffer.h"
 
 #include "settings.h"
 #include "print.h"
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
@@ -3,15 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.13 2000/02/13 21:45:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.14 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "common.h"
 
 #include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <stdarg.h>
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
@@ -27,10 +24,10 @@
 #include <win32.h>
 #endif
 
-#include <libpq-fe.h>
-#include <postgres_ext.h>
-#include <pqsignal.h>
-#include <version.h>
+#include "libpq-fe.h"
+#include "postgres_ext.h"
+#include "pqsignal.h"
+#include "version.h"
 
 #include "settings.h"
 #include "variables.h"
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
@@ -3,13 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.5 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.6 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef COMMON_H
 #define COMMON_H
 
-#include <c.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 char *		xstrdup(const char *string);
 
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
@@ -3,14 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.9 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.10 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "copy.h"
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 #include <assert.h>
 #ifndef WIN32
@@ -19,7 +16,7 @@
 #include <io.h>					/* I think */
 #endif
 
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 #include "settings.h"
 #include "common.h"
diff --git a/src/bin/psql/copy.h b/src/bin/psql/copy.h
@@ -3,14 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/copy.h,v 1.6 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/copy.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef COPY_H
 #define COPY_H
 
-#include <c.h>
-#include <stdio.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 /* handler for \copy */
 bool		do_copy(const char *args);
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.16 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.17 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "describe.h"
 
-#include <string.h>
-
-#include <postgres.h>			/* for VARHDRSZ, int4 type */
-#include <postgres_ext.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 #include "common.h"
 #include "settings.h"
diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h
@@ -3,12 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.7 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef DESCRIBE_H
 #define DESCRIBE_H
 
-#include <c.h>
 #include "settings.h"
 
 /* \da */
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.18 2000/02/13 21:45:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.19 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "help.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
 
@@ -24,8 +22,8 @@
 #include <win32.h>
 #endif
 
-#include <pqsignal.h>
-#include <libpq-fe.h>
+#include "pqsignal.h"
+#include "libpq-fe.h"
 
 #include "settings.h"
 #include "common.h"
diff --git a/src/bin/psql/help.h b/src/bin/psql/help.h
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.h,v 1.5 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.h,v 1.6 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef HELP_H
 #define HELP_H
 
-#include <c.h>
-
 void		usage(void);
 
 void		slashUsage(void);
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
@@ -3,15 +3,14 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.9 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.10 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "input.h"
 
 #include <errno.h>
 
-#include <pqexpbuffer.h>
-
+#include "pqexpbuffer.h"
 #include "settings.h"
 #include "tab-complete.h"
 #include "common.h"
diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h
@@ -3,14 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.7 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef INPUT_H
 #define INPUT_H
 
-#include <c.h>
-#include <stdio.h>
-
 /*
  * If some other file needs to have access to readline/history, include this
  * file and save yourself all this work.
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.8 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.9 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "large_obj.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <libpq-fe.h>
-#include <postgres.h>
+#include "libpq-fe.h"
 
 #include "settings.h"
 #include "variables.h"
diff --git a/src/bin/psql/large_obj.h b/src/bin/psql/large_obj.h
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.7 2000/01/29 16:58:49 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef LARGE_OBJ_H
 #define LARGE_OBJ_H
 
-#include <c.h>
-
 bool		do_lo_export(const char *loid_arg, const char *filename_arg);
 bool		do_lo_import(const char *filename_arg, const char *comment_arg);
 bool		do_lo_unlink(const char *loid_arg);
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.19 2000/02/13 21:45:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.20 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "mainloop.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <pqexpbuffer.h>
+#include "pqexpbuffer.h"
 
 #include "settings.h"
 #include "prompt.h"
diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.6 2000/01/29 16:58:49 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef MAINLOOP_H
 #define MAINLOOP_H
 
-#include <stdio.h>
-
 int MainLoop(FILE *source);
 
 #endif	 /* MAINLOOP_H */
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.11 2000/02/09 16:23:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.12 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "print.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <math.h>
 #include <signal.h>
 #ifndef WIN32
@@ -20,9 +18,8 @@
 #define pclose(x) _pclose(x)
 #endif
 
-#include <pqsignal.h>
-#include <libpq-fe.h>
-#include <postgres_ext.h>		/* for Oid type */
+#include "pqsignal.h"
+#include "libpq-fe.h"
 
 #ifndef __CYGWIN__
 #define DEFAULT_PAGER "more"
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.6 2000/01/29 16:58:49 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef PRINT_H
 #define PRINT_H
 
-#include <config.h>
-#include <c.h>
-
-#include <stdio.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 enum printFormat
 {
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.8 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.9 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "prompt.h"
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 #include "settings.h"
 #include "common.h"
diff --git a/src/bin/psql/prompt.h b/src/bin/psql/prompt.h
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
diff --git a/src/bin/psql/variables.h b/src/bin/psql/variables.h

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (C) 2000 by PostgreSQL Global Development Group`
`8`	`8`	`*`
`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 $`
`10`	`10`	`*/`
`11`		`-#include <c.h>`
	`11`	`+#include <postgres.h>`
`12`	`12`
`13`	`13`	`#ifdef HAVE_GETOPT_H`
`14`	`14`	`#include <getopt.h>`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,12 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`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 $`
`7`	`7`	`*/`
`8`	`8`	`#ifndef COMMON_H`
`9`	`9`	`#define COMMON_H`
`10`	`10`
`11`		`-#include <c.h>`
`12`		`-#include <libpq-fe.h>`
	`11`	`+#include "libpq-fe.h"`
`13`	`12`
`14`	`13`	`char * xstrdup(const char *string);`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,11 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`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 $`
`7`	`7`	`*/`
`8`	`8`	`#ifndef DESCRIBE_H`
`9`	`9`	`#define DESCRIBE_H`
`10`	`10`
`11`		`-#include <c.h>`
`12`	`11`	`#include "settings.h"`
`13`	`12`
`14`	`13`	`/* \da */`