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

Commit de466eb

Browse files
scrappyscrappy
committed
Mostly adding "const" keyword and making some functions static.
Submitted by: D'Arcy Cain
1 parent 257b4d0 commit de466eb

File tree

6 files changed

+62
-62
lines changed

6 files changed

+62
-62
lines changed

‎src/backend/catalog/pg_operator.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/catalog/pg_operator.c,v 1.1.1.1 1996/07/09 06:21:17 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.2 1996/10/07 03:27:48 scrappy Exp $
1111
*
1212
* NOTES
1313
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -35,7 +35,7 @@
3535
#include "fmgr.h"
3636

3737
static Oid OperatorGetWithOpenRelation(Relation pg_operator_desc,
38-
char *operatorName,
38+
const char *operatorName,
3939
Oid leftObjectId,
4040
Oid rightObjectId );
4141
static Oid OperatorGet(char *operatorName,
@@ -79,7 +79,7 @@ static void OperatorUpd(Oid baseId , Oid commId , Oid negId );
7979
*/
8080
static Oid
8181
OperatorGetWithOpenRelation(Relation pg_operator_desc,
82-
char *operatorName,
82+
const char *operatorName,
8383
Oid leftObjectId,
8484
Oid rightObjectId)
8585
{

‎src/backend/include/miscadmin.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* Copyright (c) 1994, Regents of the University of California
1414
*
15-
* $Id: miscadmin.h,v 1.3 1996/09/19 20:02:53 scrappy Exp $
15+
* $Id: miscadmin.h,v 1.4 1996/10/07 03:28:12 scrappy Exp $
1616
*
1717
* NOTES
1818
* some of the information in this file will be moved to
@@ -186,8 +186,8 @@ extern ProcessingMode GetProcessingMode(void);
186186
/*
187187
* Prototypes for utils/init/magic.c
188188
*/
189-
extern int DatabaseMetaGunkIsConsistent(char database[], char path[]);
190-
extern int ValidPgVersion(char path []);
191-
extern void SetPgVersion(char path []);
189+
extern int DatabaseMetaGunkIsConsistent(const char *database, char *path);
190+
extern int ValidPgVersion(const char *path);
191+
extern void SetPgVersion(const char *path);
192192

193193
#endif /* MISCADMIN_H */

‎src/backend/utils/init/magic.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/magic.c,v 1.1.1.1 1996/07/09 06:22:09 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/magic.c,v 1.2 1996/10/07 03:29:30 scrappy Exp $
1111
*
1212
* NOTES
1313
* XXX eventually, should be able to handle version identifiers
@@ -37,7 +37,7 @@ static char Pg_verfile[] = PG_VERFILE;
3737
/*
3838
* private function prototypes
3939
*/
40-
static void PathSetVersionFilePath(char path[], char filepathbuf[]);
40+
static void PathSetVersionFilePath(const char *path, char *filepathbuf);
4141

4242
/*
4343
* DatabaseMetaGunkIsConsistent
@@ -48,7 +48,7 @@ static void PathSetVersionFilePath(char path[], char filepathbuf[]);
4848
* and checking the existence of the database whether Noversion is set or not.
4949
*/
5050
int
51-
DatabaseMetaGunkIsConsistent(char *database, char *path)
51+
DatabaseMetaGunkIsConsistent(const char *database, char *path)
5252
{
5353
int isValid;
5454
#ifndef WIN32
@@ -80,7 +80,7 @@ DatabaseMetaGunkIsConsistent(char *database, char *path)
8080
* version number.
8181
*/
8282
int
83-
ValidPgVersion(char *path)
83+
ValidPgVersion(const char *path)
8484
{
8585
int fd;
8686
char version[4], buf[MAXPGPATH+1];
@@ -131,7 +131,7 @@ ValidPgVersion(char *path)
131131
* SetPgVersion - writes the version to a database directory
132132
*/
133133
void
134-
SetPgVersion(char *path)
134+
SetPgVersion(const char *path)
135135
{
136136
int fd;
137137
char version[4], buf[MAXPGPATH+1];
@@ -159,9 +159,9 @@ SetPgVersion(char *path)
159159
* and the name of the version file name.
160160
*/
161161
static void
162-
PathSetVersionFilePath(char *path, char *filepathbuf)
162+
PathSetVersionFilePath(const char *path, char *filepathbuf)
163163
{
164164
if (strlen(path) > (MAXPGPATH - sizeof(Pg_verfile) - 1))
165165
elog(FATAL, "PathSetVersionFilePath: %s: path too long");
166-
(void) sprintf(filepathbuf, "%s%c%s", path, SEP_CHAR, Pg_verfile);
166+
sprintf(filepathbuf, "%s%c%s", path, SEP_CHAR, Pg_verfile);
167167
}

‎src/bin/pg_dump/common.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.5 1996/09/16 06:05:47 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.6 1996/10/07 03:30:31 scrappy Exp $
1111
*
1212
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
1313
*
@@ -42,7 +42,7 @@
4242
*/
4343

4444
char*
45-
findTypeByOid(TypeInfo* tinfo, int numTypes, char* oid)
45+
findTypeByOid(TypeInfo* tinfo, int numTypes, const char* oid)
4646
{
4747
int i;
4848

@@ -68,7 +68,7 @@ findTypeByOid(TypeInfo* tinfo, int numTypes, char* oid)
6868
*
6969
*/
7070
char*
71-
findOprByOid(OprInfo *oprinfo, int numOprs, char *oid)
71+
findOprByOid(OprInfo *oprinfo, int numOprs, const char *oid)
7272
{
7373
int i;
7474
for (i=0;i<numOprs;i++) {
@@ -94,7 +94,7 @@ findOprByOid(OprInfo *oprinfo, int numOprs, char *oid)
9494

9595
char**
9696
findParentsByOid(TableInfo* tblinfo, int numTables,
97-
InhInfo* inhinfo, int numInherits, char *oid,
97+
InhInfo* inhinfo, int numInherits, const char *oid,
9898
int *numParentsPtr)
9999
{
100100
int i,j;
@@ -134,7 +134,7 @@ findParentsByOid(TableInfo* tblinfo, int numTables,
134134
*/
135135

136136
void
137-
parseArgTypes(char **argtypes, char* str)
137+
parseArgTypes(char **argtypes, const char* str)
138138
{
139139
int j, argNum;
140140
char temp[100];
@@ -171,7 +171,7 @@ parseArgTypes(char **argtypes, char* str)
171171
*/
172172

173173
int
174-
strInArray(char* pattern, char** arr, int arr_size)
174+
strInArray(const char* pattern, char** arr, int arr_size)
175175
{
176176
int i;
177177
for (i=0;i<arr_size;i++) {
@@ -189,7 +189,7 @@ strInArray(char* pattern, char** arr, int arr_size)
189189
*/
190190

191191
TableInfo *
192-
dumpSchema(FILE *fout, int *numTablesPtr, char *tablename)
192+
dumpSchema(FILE *fout, int *numTablesPtr, const char *tablename)
193193
{
194194
int numTypes;
195195
int numFuncs;
@@ -279,7 +279,7 @@ if (!tablename && fout) {
279279
*/
280280

281281
extern void
282-
dumpSchemaIdx(FILE *fout, int *numTablesPtr, char *tablename,
282+
dumpSchemaIdx(FILE *fout, int *numTablesPtr, const char *tablename,
283283
TableInfo* tblinfo, int numTables)
284284
{
285285
int numIndices;
@@ -344,7 +344,7 @@ flagInhAttrs(TableInfo* tblinfo, int numTables,
344344
*/
345345

346346
int
347-
findTableByName(TableInfo* tblinfo, int numTables, char* relname)
347+
findTableByName(TableInfo* tblinfo, int numTables, const char* relname)
348348
{
349349
int i;
350350
for (i=0;i<numTables;i++) {
@@ -363,7 +363,7 @@ findTableByName(TableInfo* tblinfo, int numTables, char* relname)
363363
*/
364364

365365
int
366-
findTableByOid(TableInfo* tblinfo, int numTables, char* oid)
366+
findTableByOid(TableInfo* tblinfo, int numTables, const char* oid)
367367
{
368368
int i;
369369
for (i=0;i<numTables;i++) {
@@ -383,7 +383,7 @@ findTableByOid(TableInfo* tblinfo, int numTables, char* oid)
383383
*/
384384

385385
int
386-
findFuncByName(FuncInfo* finfo, int numFuncs, char* name)
386+
findFuncByName(FuncInfo* finfo, int numFuncs, const char* name)
387387
{
388388
int i;
389389
for (i=0;i<numFuncs;i++) {
@@ -399,7 +399,7 @@ findFuncByName(FuncInfo* finfo, int numFuncs, char* name)
399399
* returns true if the relation name is an archive name, false otherwise
400400
*/
401401
int
402-
isArchiveName(char* relname)
402+
isArchiveName(const char* relname)
403403
{
404404
return (strlen(relname) > 1 && relname[1] == ',');
405405
}

‎src/bin/pg_dump/pg_dump.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
*
2222
* IDENTIFICATION
23-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.9 1996/10/02 21:38:35 scrappy Exp $
23+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.10 1996/10/07 03:30:37 scrappy Exp $
2424
*
2525
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
2626
*
@@ -75,7 +75,7 @@ char g_comment_end[10];
7575

7676

7777
static void
78-
usage(char* progname)
78+
usage(const char* progname)
7979
{
8080
fprintf(stderr, "%s - version 1.13.dhb.2\n\n",progname);
8181
fprintf(stderr, "usage: %s [options] [dbname]\n",progname);
@@ -98,26 +98,26 @@ usage(char* progname)
9898
exit(1);
9999
}
100100

101-
void
101+
static void
102102
exit_nicely(PGconn* conn)
103103
{
104104
PQfinish(conn);
105105
exit(1);
106106
}
107107

108108

109-
void
109+
int
110110
main(int argc, char** argv)
111111
{
112112
int c;
113-
char* progname;
114-
char* filename;
115-
char* dbname;
113+
const char* progname;
114+
const char* filename;
115+
const char* dbname;
116116
int schemaOnly;
117117
int dataOnly;
118-
char *pghost = NULL;
119-
char *pgport = NULL;
120-
char *tablename;
118+
const char *pghost = NULL;
119+
const char *pgport = NULL;
120+
const char *tablename;
121121
int oids;
122122
TableInfo *tblinfo;
123123
int numTables;
@@ -1200,7 +1200,7 @@ void dumpTables(FILE* fout, TableInfo *tblinfo, int numTables,
12001200
char **parentRels; /* list of names of parent relations */
12011201
int numParents;
12021202
int actual_atts; /* number of attrs in this CREATE statment */
1203-
char *archiveMode;
1203+
const char *archiveMode;
12041204

12051205
for (i=0;i<numTables;i++) {
12061206

@@ -1300,12 +1300,12 @@ void dumpTables(FILE* fout, TableInfo *tblinfo, int numTables,
13001300
*/
13011301
void
13021302
dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices,
1303-
TableInfo* tblinfo, int numTables, char *tablename)
1303+
TableInfo* tblinfo, int numTables, const char *tablename)
13041304
{
13051305
int i;
13061306
int tableInd;
1307-
char *attname; /* the name of the indexed attribute */
1308-
char *funcname; /* the name of the function to comput the index key from*/
1307+
const char *attname; /* the name of the indexed attribute */
1308+
const char *funcname; /* the name of the function to comput the index key from*/
13091309
int indkey;
13101310

13111311
char q[MAXQUERYLEN];
@@ -1361,7 +1361,7 @@ dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices,
13611361
* dump the contents of all the classes.
13621362
*/
13631363
void
1364-
dumpClasses(TableInfo *tblinfo, int numTables, FILE *fout, char *onlytable, int oids)
1364+
dumpClasses(TableInfo *tblinfo, int numTables, FILE *fout, const char *onlytable, int oids)
13651365
{
13661366
char query[255];
13671367
#define COPYBUFSIZ 8192
@@ -1605,7 +1605,7 @@ setMaxOid(FILE *fout)
16051605
*/
16061606

16071607
int
1608-
findLastBuiltinOid()
1608+
findLastBuiltinOid(void)
16091609
{
16101610
PGresult* res;
16111611
int ntups;
@@ -1634,7 +1634,7 @@ findLastBuiltinOid()
16341634
* checks a string for quote characters and quotes them
16351635
*/
16361636
char*
1637-
checkForQuote(char* s)
1637+
checkForQuote(const char* s)
16381638
{
16391639
char *r;
16401640
char c;

‎src/bin/pg_dump/pg_dump.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: pg_dump.h,v 1.6 1996/09/23 18:15:41 scrappy Exp $
8+
* $Id: pg_dump.h,v 1.7 1996/10/07 03:30:40 scrappy Exp $
99
*
1010
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
1111
*
@@ -141,27 +141,27 @@ extern char g_opaque_type[10]; /* name for the opaque type */
141141
* common utility functions
142142
*/
143143

144-
extern TableInfo* dumpSchema(FILE* fout, int *numTablesPtr, char *tablename);
145-
extern void dumpSchemaIdx(FILE* fout, int *numTablesPtr, char *tablename,
144+
extern TableInfo* dumpSchema(FILE* fout, int *numTablesPtr, const char *tablename);
145+
extern void dumpSchemaIdx(FILE* fout, int *numTablesPtr, const char *tablename,
146146
TableInfo* tblinfo, int numTables);
147147

148-
extern char* findTypeByOid(TypeInfo* tinfo, int numTypes, char* oid);
149-
extern char* findOprByOid(OprInfo *oprinfo, int numOprs, char *oid);
150-
extern int findFuncByName(FuncInfo* finfo, int numFuncs, char* name);
148+
extern char* findTypeByOid(TypeInfo* tinfo, int numTypes, const char* oid);
149+
extern char* findOprByOid(OprInfo *oprinfo, int numOprs, const char *oid);
150+
extern int findFuncByName(FuncInfo* finfo, int numFuncs, const char* name);
151151
extern char** findParentsByOid(TableInfo* tbinfo, int numTables,
152152
InhInfo* inhinfo, int numInherits,
153-
char *oid,
153+
const char *oid,
154154
int *numParents);
155-
extern int findTableByName(TableInfo *tbinfo, int numTables, char *relname);
156-
extern int findTableByOid(TableInfo *tbinfo, int numTables, char *oid);
155+
extern int findTableByName(TableInfo *tbinfo, int numTables, const char *relname);
156+
extern int findTableByOid(TableInfo *tbinfo, int numTables, const char *oid);
157157
extern void flagInhAttrs(TableInfo* tbinfo, int numTables,
158158
InhInfo* inhinfo, int numInherits);
159159

160-
extern void check_conn_and_db();
161-
extern char* dupstr(char *s);
162-
extern int strInArray(char* pattern, char** arr, int arr_size);
163-
extern void parseArgTypes(char **argtypes, char* str);
164-
extern int isArchiveName(char*);
160+
extern void check_conn_and_db(void);
161+
extern char* dupstr(const char *s);
162+
extern int strInArray(const char* pattern, char** arr, int arr_size);
163+
extern void parseArgTypes(char **argtypes, const char* str);
164+
extern int isArchiveName(const char*);
165165

166166
/*
167167
* version specific routines
@@ -186,16 +186,16 @@ extern void dumpOneFunc(FILE* fout, FuncInfo* finfo, int i,
186186
TypeInfo *tinfo, int numTypes);
187187
extern void dumpTables(FILE* fout, TableInfo* tbinfo, int numTables,
188188
InhInfo *inhinfo, int numInherits,
189-
TypeInfo *tinfo, int numTypes, char *tablename);
189+
TypeInfo *tinfo, int numTypes, const char *tablename);
190190
extern void dumpIndices(FILE* fout, IndInfo* indinfo, int numIndices,
191-
TableInfo* tbinfo, int numTables, char *tablename);
191+
TableInfo* tbinfo, int numTables, const char *tablename);
192192

193193
extern void dumpClasses(TableInfo *tbinfo, int numTables, FILE *fout,
194-
char *tablename, int oids);
194+
const char *tablename, int oids);
195195
extern void dumpTuples(PGresult *res, FILE *fout, int *attrmap);
196196
extern void setMaxOid(FILE *fout);
197-
extern char* checkForQuote(char* s);
198-
extern int findLastBuiltinOid();
197+
extern char* checkForQuote(const char* s);
198+
extern int findLastBuiltinOid(void);
199199

200200

201201
/* largest query string size */

0 commit comments

Comments
 (0)