Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 2bdded3

Browse files
committed
Various cleanups from D'Arcy
1 parent 6913c8b commit 2bdded3

File tree

5 files changed

+25
-16
lines changed

5 files changed

+25
-16
lines changed

src/backend/parser/gram.y

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.14 1996/11/08 20:45:33 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.15 1996/11/11 12:14:09 scrappy Exp $
1414
*
1515
* HISTORY
1616
* AUTHOR DATE MAJOR EVENT
@@ -56,8 +56,6 @@ extern List *parsetree;
5656
*/
5757
/*#define __YYSCLASS*/
5858

59-
extern void yyerror(char message[]);
60-
6159
static char *xlateSqlType(char *);
6260
static Node *makeA_Expr(int op, char *opname, Node *lexpr, Node *rexpr);
6361

src/bin/psql/rlstubs.c

+7-2
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,21 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.c,v 1.3 1996/11/11 05:55:32 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.c,v 1.4 1996/11/11 12:14:21 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include <stdio.h>
1515

1616
#include "rlstubs.h"
1717

18+
extern char *readline(const char *);
19+
extern int write_history(const char *);
20+
extern int using_history(void);
21+
extern int add_history(const char *);
22+
1823
char *
19-
readline(char *prompt)
24+
readline(const char *prompt)
2025
{
2126
static char buf[500];
2227

src/interfaces/libpgtcl/pgtcl.c

+7-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.4 1996/11/09 10:39:40 scrappy Exp $
12+
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.5 1996/11/11 12:14:38 scrappy Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
1616

17+
#include <stdlib.h>
18+
19+
#include "postgres.h"
1720
#include "tcl.h"
1821
#include "libpgtcl.h"
1922
#include "pgtclCmds.h"
23+
#include "pgtclId.h"
2024

2125
/*
2226
* Pgtcl_Init
@@ -27,7 +31,7 @@
2731
/*
2832
* Tidy up forgotten postgres connection at Tcl_Exit
2933
*/
30-
void
34+
static void
3135
Pgtcl_AtExit (ClientData cData)
3236
{
3337
Pg_clientData *cd = (Pg_clientData *)cData;
@@ -52,7 +56,7 @@ Pgtcl_AtExit (ClientData cData)
5256
/*
5357
* Tidy up forgotten postgres connections on Interpreter deletion
5458
*/
55-
void
59+
static void
5660
Pgtcl_Shutdown (ClientData cData, Tcl_Interp *interp)
5761
{
5862
Pgtcl_AtExit(cData);

src/interfaces/libpgtcl/pgtclCmds.c

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.6 1996/11/09 10:39:41 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.7 1996/11/11 12:14:42 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
1615
#include <stdio.h>
1716
#include <stdlib.h>
18-
#include <tcl.h>
1917
#include <string.h>
18+
#include <tcl.h>
19+
20+
#include "postgres.h"
2021
#include "libpq/pqcomm.h"
2122
#include "libpq-fe.h"
2223
#include "libpq/libpq-fs.h"
@@ -224,7 +225,7 @@ tcl_value (char *value)
224225
**********************************/
225226

226227
int
227-
Pg_conndefaults(ClientData cData, Tcl_Interp *interp, int argc, char* argv[])
228+
Pg_conndefaults(ClientData cData, Tcl_Interp *interp, int argc, char **argv)
228229
{
229230
PQconninfoOption *option;
230231
char buf[8192];
@@ -581,7 +582,7 @@ Pg_result(ClientData cData, Tcl_Interp *interp, int argc, char* argv[])
581582
Tcl_ResetResult(interp);
582583
for (i = 0; i < PQnfields(result); i++) {
583584
sprintf(buf, "{%s} %ld %d", PQfname(result, i),
584-
PQftype(result, i),
585+
(long) PQftype(result, i),
585586
PQfsize(result, i));
586587
Tcl_AppendElement(interp, buf);
587588
}
@@ -1125,7 +1126,7 @@ Pg_select(ClientData cData, Tcl_Interp *interp, int argc, char **argv)
11251126
Pg_clientData *cd = (Pg_clientData *)cData;
11261127
PGconn *conn;
11271128
PGresult *result;
1128-
int ch_flag, r;
1129+
int r;
11291130
size_t tupno, column, ncols;
11301131
Tcl_DString headers;
11311132
struct {

src/interfaces/libpgtcl/pgtclId.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.2 1996/10/30 06:18:41 scrappy Exp $
15+
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.3 1996/11/11 12:14:45 scrappy Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
1919

2020
#include <stdlib.h>
2121
#include <string.h>
22-
#include "tcl.h"
22+
#include <tcl.h>
2323

24+
#include "postgres.h"
2425
#include "pgtclCmds.h"
2526
#include "pgtclId.h"
2627

0 commit comments

Comments
 (0)