Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6981766

Browse files
bmomjianbmomjian
committed
Final cleanup
1 parent ba42b68 commit 6981766

File tree

23 files changed

+70
-92
lines changed

23 files changed

+70
-92
lines changed

‎src/backend/tcop/postgres.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.123 1999/07/16 04:59:53 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.124 1999/07/16 05:23:18 momjian Exp $
1111
*
1212
* NOTES
1313
* this is the "main" module of the postgres backend and
@@ -42,6 +42,7 @@
4242
#include <arpa/inet.h>
4343
#include <netdb.h>
4444
#ifdef __CYGWIN32__
45+
#include <getopt.h>
4546
#endif
4647

4748
#include "commands/async.h"
@@ -1495,7 +1496,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
14951496
if (!IsUnderPostmaster)
14961497
{
14971498
puts("\nPOSTGRES backend interactive interface ");
1498-
puts("$Revision: 1.123 $ $Date: 1999/07/16 04:59:53 $\n");
1499+
puts("$Revision: 1.124 $ $Date: 1999/07/16 05:23:18 $\n");
14991500
}
15001501

15011502
/* ----------------
@@ -1660,7 +1661,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
16601661
}
16611662

16621663
#ifndef HAVE_GETRUSAGE
1663-
#else /* HAVE_GETRUSAGE */
1664+
#include "rusagestub.h"
1665+
#else
16641666
#include <sys/resource.h>
16651667
#endif /* HAVE_GETRUSAGE */
16661668

‎src/backend/utils/adt/nabstime.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Copyright (c) 1994, Regents of the University of California
66
*
7-
* $Id: nabstime.c,v 1.59 1999/07/16 05:00:14 momjian Exp $
7+
* $Id: nabstime.c,v 1.60 1999/07/16 05:23:19 momjian Exp $
88
*
99
*/
1010
#include <stdio.h>
@@ -349,8 +349,6 @@ nabstimeout(AbsoluteTime time)
349349
break;
350350
default:
351351
abstime2tm(time, &tz, tm, tzn);
352-
#if DATEDEBUG
353-
#endif
354352
EncodeDateTime(tm, fsec, &tz, &tzn, DateStyle, buf);
355353
break;
356354
}

‎src/backend/utils/cache/lsyscache.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.29 1999/07/15 22:40:04 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.30 1999/07/16 05:23:19 momjian Exp $
1111
*
1212
* NOTES
1313
* Eventually, the index information should go through here, too.
@@ -16,11 +16,11 @@
1616
#include <string.h>
1717
#include "postgres.h"
1818

19-
#include "utils/syscache.h"
20-
#include "utils/lsyscache.h"
2119

2220
#include "catalog/pg_operator.h"
2321
#include "catalog/pg_type.h"
22+
#include "utils/lsyscache.h"
23+
#include "utils/syscache.h"
2424

2525
/* ---------- AMOP CACHES ---------- */
2626

‎src/backend/utils/cache/relcache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.65 1999/07/16 03:14:18 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.66 1999/07/16 05:23:20 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -46,8 +46,8 @@
4646
#include "catalog/index.h"
4747
#include "catalog/indexing.h"
4848
#include "catalog/pg_attrdef.h"
49-
#include "catalog/pg_proc.h"
5049
#include "catalog/pg_log.h"
50+
#include "catalog/pg_proc.h"
5151
#include "catalog/pg_relcheck.h"
5252
#include "catalog/pg_rewrite.h"
5353
#include "catalog/pg_type.h"

‎src/backend/utils/cache/syscache.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.29 1999/07/15 22:40:04 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.30 1999/07/16 05:23:21 momjian Exp $
1111
*
1212
* NOTES
1313
* These routines allow the parser/planner/executor to perform
@@ -17,31 +17,25 @@
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
20+
#include <string.h>
2021
#include "postgres.h"
2122

2223
#include "access/heapam.h"
2324
#include "catalog/catname.h"
24-
#include "utils/catcache.h"
25-
#include <string.h>
26-
27-
28-
/* ----------------
29-
* hardwired attribute information comes from system catalog files.
30-
* ----------------
31-
*/
25+
#include "catalog/pg_aggregate.h"
3226
#include "catalog/pg_amop.h"
3327
#include "catalog/pg_group.h"
3428
#include "catalog/pg_index.h"
3529
#include "catalog/pg_inherits.h"
3630
#include "catalog/pg_language.h"
31+
#include "catalog/pg_listener.h"
3732
#include "catalog/pg_opclass.h"
3833
#include "catalog/pg_operator.h"
3934
#include "catalog/pg_proc.h"
40-
#include "catalog/pg_type.h"
4135
#include "catalog/pg_rewrite.h"
42-
#include "catalog/pg_aggregate.h"
4336
#include "catalog/pg_shadow.h"
44-
#include "catalog/pg_listener.h"
37+
#include "catalog/pg_type.h"
38+
#include "utils/catcache.h"
4539

4640
extern bool AMI_OVERRIDE; /* XXX style */
4741

‎src/backend/utils/cache/temprel.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.8 1999/07/15 22:40:04 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.9 1999/07/16 05:23:21 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -26,10 +26,10 @@
2626
#include <string.h>
2727

2828
#include "postgres.h"
29-
#include "utils/temprel.h"
3029
#include "access/heapam.h"
3130
#include "catalog/heap.h"
3231
#include "catalog/index.h"
32+
#include "utils/temprel.h"
3333

3434
GlobalMemory CacheCxt;
3535

‎src/backend/utils/error/elog.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.45 1999/05/25 16:12:24 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.46 1999/07/16 05:23:22 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -24,14 +24,14 @@
2424
#include <unistd.h>
2525
#include <signal.h>
2626

27+
#include "postgres.h"
2728
#ifdef USE_SYSLOG
2829
#include <syslog.h>
2930
#endif
3031

31-
#include "postgres.h"
32-
#include "miscadmin.h"
3332
#include "libpq/libpq.h"
3433
#include "libpq/pqformat.h"
34+
#include "miscadmin.h"
3535
#include "storage/proc.h"
3636
#include "tcop/tcopprot.h"
3737
#include "utils/trace.h"

‎src/backend/utils/error/exc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.26 1999/07/16 03:14:22 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.27 1999/07/16 05:23:22 momjian Exp $
1111
*
1212
* NOTE
1313
* XXX this code needs improvement--check for state violations and
@@ -21,8 +21,8 @@
2121

2222
#include "postgres.h"
2323

24-
#include "utils/exc.h"
2524
#include "storage/ipc.h"
25+
#include "utils/exc.h"
2626

2727
static void ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data,
2828
ExcMessage message);

‎src/backend/utils/fmgr/dfmgr.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.28 1999/07/15 22:40:06 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.29 1999/07/16 05:23:23 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -18,17 +18,12 @@
1818

1919
#include "postgres.h"
2020

21-
#include "utils/builtins.h"
2221
#include "access/heapam.h"
23-
24-
#include "dynloader.h"
25-
26-
#ifdef __ultrix
27-
#endif
28-
2922
#include "catalog/catname.h"
30-
#include "utils/syscache.h"
3123
#include "catalog/pg_proc.h"
24+
#include "dynloader.h"
25+
#include "utils/builtins.h"
26+
#include "utils/syscache.h"
3227

3328
static DynamicFileList *file_list = (DynamicFileList *) NULL;
3429
static DynamicFileList *file_tail = (DynamicFileList *) NULL;

‎src/backend/utils/fmgr/fmgr.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.30 1999/07/15 22:40:07 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.31 1999/07/16 05:23:23 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,16 +17,12 @@
1717

1818
#include "postgres.h"
1919

20-
/* these 2 files are generated by Gen_fmgrtab.sh; contain the declarations */
21-
#include "utils/fmgrtab.h"
22-
23-
#include "catalog/pg_proc.h"
2420
#include "catalog/pg_language.h"
25-
#include "utils/syscache.h"
26-
27-
#include "utils/builtins.h"
28-
21+
#include "catalog/pg_proc.h"
2922
#include "commands/trigger.h"
23+
#include "utils/builtins.h"
24+
#include "utils/fmgrtab.h"
25+
#include "utils/syscache.h"
3026

3127

3228
/*

0 commit comments

Comments
 (0)