Skip to content

Commit e5e12f6

Browse files
scrappyscrappy
committed
More cleanups by "Kurt J. Lidl" <lidl@va.pubnix.com>
1 parent 519496b commit e5e12f6

File tree

9 files changed

+23
-38
lines changed

9 files changed

+23
-38
lines changed

‎src/backend/access/sdir.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: sdir.h,v 1.1.1.1 1996/07/09 06:21:09 scrappy Exp $
9+
* $Id: sdir.h,v 1.2 1996/07/30 07:44:57 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -27,29 +27,29 @@ typedef enum ScanDirection {
2727

2828
/*
2929
* ScanDirectionIsValid --
30-
* True iff scan direciton is valid.
30+
* True iff scan direction is valid.
3131
*/
3232
#define ScanDirectionIsValid(direction) \
3333
((bool) (BackwardScanDirection <= direction && \
3434
direction <= ForwardScanDirection))
3535

3636
/*
3737
* ScanDirectionIsBackward --
38-
* True iff scan direciton is backward.
38+
* True iff scan direction is backward.
3939
*/
4040
#define ScanDirectionIsBackward(direction) \
4141
((bool) (direction == BackwardScanDirection))
4242

4343
/*
4444
* ScanDirectionIsNoMovement --
45-
* True iff scan direciton indicates no movement.
45+
* True iff scan direction indicates no movement.
4646
*/
4747
#define ScanDirectionIsNoMovement(direction) \
4848
((bool) (direction == NoMovementScanDirection))
4949

5050
/*
5151
* ScanDirectionIsForward --
52-
* True iff scan direciton is forward.
52+
* True iff scan direction is forward.
5353
*/
5454
#define ScanDirectionIsForward(direction) \
5555
((bool) (direction == ForwardScanDirection))

‎src/backend/executor/execMain.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
*
2828
* IDENTIFICATION
29-
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.1.1.1 1996/07/09 06:21:25 scrappy Exp $
29+
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.2 1996/07/30 07:45:27 scrappy Exp $
3030
*
3131
*-------------------------------------------------------------------------
3232
*/
@@ -49,7 +49,7 @@ static TupleDesc InitPlan(CmdType operation, Query *parseTree,
4949
static void EndPlan(Plan *plan, EState *estate);
5050
static TupleTableSlot *ExecutePlan(EState *estate, Plan *plan,
5151
Query *parseTree, CmdType operation,
52-
int numberTuples, int direction,
52+
int numberTuples, ScanDirection direction,
5353
void (*printfunc)());
5454
static void ExecRetrieve(TupleTableSlot *slot, void (*printfunc)(),
5555
Relation intoRelationDesc);
@@ -153,7 +153,7 @@ ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count)
153153
parseTree,
154154
operation,
155155
ALL_TUPLES,
156-
EXEC_FRWD,
156+
ForwardScanDirection,
157157
destination);
158158
break;
159159
case EXEC_FOR:
@@ -162,7 +162,7 @@ ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count)
162162
parseTree,
163163
operation,
164164
count,
165-
EXEC_FRWD,
165+
ForwardScanDirection,
166166
destination);
167167
break;
168168

@@ -176,7 +176,7 @@ ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count)
176176
parseTree,
177177
operation,
178178
count,
179-
EXEC_BKWD,
179+
BackwardScanDirection,
180180
destination);
181181
break;
182182

@@ -191,7 +191,7 @@ ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count)
191191
parseTree,
192192
operation,
193193
ONE_TUPLE,
194-
EXEC_FRWD,
194+
ForwardScanDirection,
195195
destination);
196196
break;
197197
default:
@@ -600,7 +600,7 @@ ExecutePlan(EState *estate,
600600
Query *parseTree,
601601
CmdType operation,
602602
int numberTuples,
603-
int direction,
603+
ScanDirection direction,
604604
void (*printfunc)())
605605
{
606606
Relation intoRelationDesc;

‎src/backend/executor/execdefs.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,13 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: execdefs.h,v 1.1.1.1 1996/07/09 06:21:25 scrappy Exp $
9+
* $Id: execdefs.h,v 1.2 1996/07/30 07:45:29 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndef EXECDEFS_H
1414
#define EXECDEFS_H
1515

16-
/* ----------------
17-
* executor scan direction definitions
18-
* ----------------
19-
*/
20-
#define EXEC_FRWD 1 /* Scan forward */
21-
#define EXEC_BKWD -1 /* Scan backward */
22-
2316
/* ----------------
2417
* ExecutePlan() tuplecount definitions
2518
* ----------------

‎src/backend/executor/nodeMaterial.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/executor/nodeMaterial.c,v 1.1.1.1 1996/07/09 06:21:26 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.2 1996/07/30 07:45:31 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -79,7 +79,7 @@ ExecMaterial(Material *node)
7979
* while creating the temporary relation.
8080
* ----------------
8181
*/
82-
estate->es_direction = EXEC_FRWD;
82+
estate->es_direction = ForwardScanDirection;
8383

8484
/* ----------------
8585
* if we couldn't create the temp or current relations then

‎src/backend/executor/nodeSort.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/executor/nodeSort.c,v 1.1.1.1 1996/07/09 06:21:27 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.2 1996/07/30 07:45:35 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -138,7 +138,7 @@ ExecSort(Sort *node)
138138
* while creating the temporary relation.
139139
* ----------------
140140
*/
141-
estate->es_direction = EXEC_FRWD;
141+
estate->es_direction = ForwardScanDirection;
142142

143143
/* ----------------
144144
* if we couldn't create the temp or current relations then

‎src/backend/storage/buffer/buf_table.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.1.1.1 1996/07/09 06:21:53 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.2 1996/07/30 07:47:23 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -34,8 +34,6 @@
3434

3535
static HTAB *SharedBufHash;
3636

37-
extern HTAB *ShmemInitHash();
38-
3937
typedef struct lookup {
4038
BufferTag key;
4139
Buffer id;

‎src/backend/storage/lmgr/lock.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.1.1.1 1996/07/09 06:21:56 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.2 1996/07/30 07:47:33 scrappy Exp $
1111
*
1212
* NOTES
1313
* Outside modules can create a lock table and acquire/release
@@ -102,12 +102,6 @@ static MASK BITS_ON[MAX_LOCKTYPES];
102102
*/
103103
static bool LockingIsDisabled;
104104

105-
/* ------------------
106-
* from storage/ipc/shmem.c
107-
* ------------------
108-
*/
109-
extern HTAB *ShmemInitHash();
110-
111105
/* -------------------
112106
* map from tableId to the lock table structure
113107
* -------------------

‎src/backend/utils/builtins.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: builtins.h,v 1.1.1.1 1996/07/09 06:22:01 scrappy Exp $
9+
* $Id: builtins.h,v 1.2 1996/07/30 07:47:42 scrappy Exp $
1010
*
1111
* NOTES
1212
* This should normally only be included by fmgr.h.
@@ -228,7 +228,7 @@ extern POLYGON *rt_poly_inter();
228228
in executor/executor.h*/
229229

230230

231-
extern int32 pqtest();
231+
extern int32 pqtest(struct varlena *vlena);
232232

233233
/* arrayfuncs.c */
234234
#include "utils/array.h"

‎src/bin/psql/rlstubs.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/bin/psql/Attic/rlstubs.c,v 1.1.1.1 1996/07/09 06:22:15 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.c,v 1.2 1996/07/30 07:47:58 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -18,7 +18,7 @@ readline(char *prompt)
1818
{
1919
static char buf[500];
2020

21-
printf("%s");
21+
printf("%s", prompt);
2222
return fgets(buf, 500, stdin);
2323
}
2424

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy