diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/copy.c | 8 | ||||
| -rw-r--r-- | src/backend/commands/dbcommands.c | 10 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planner.c | 9 | ||||
| -rw-r--r-- | src/backend/utils/adt/varlena.c | 14 | ||||
| -rw-r--r-- | src/include/utils/builtins.h | 4 |
5 files changed, 22 insertions, 23 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 5f974322a13..c17144b581c 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.54 1998/08/24 01:13:39 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.55 1998/08/29 04:09:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,7 @@ static char *CopyReadAttribute(FILE *fp, bool *isnull, char *delim, int *newline static char *CopyReadAttribute(FILE *fp, bool *isnull, char *delim); #endif -static void CopyAttributeOut(FILE *fp, unsigned char *string, char *delim, int is_array); +static void CopyAttributeOut(FILE *fp, char *string, char *delim, int is_array); static int CountTuples(Relation relation); extern FILE *Pfout, @@ -1146,9 +1146,9 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim) } static void -CopyAttributeOut(FILE *fp, unsigned char *server_string, char *delim, int is_array) +CopyAttributeOut(FILE *fp, char *server_string, char *delim, int is_array) { - unsigned char *string; + char *string; char c; #ifdef MULTIBYTE diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 80cb60f203a..fdd6a6a3cc3 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.21 1998/08/24 01:13:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.22 1998/08/29 04:09:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,8 +45,8 @@ static void stop_vacuum(char *dbpath, char *dbname); void createdb(char *dbname, char *dbpath, int encoding) { - Oid db_id, - user_id; + Oid db_id; + int4 user_id; char buf[512]; char *lp, loc[512]; @@ -100,8 +100,8 @@ createdb(char *dbname, char *dbpath, int encoding) void destroydb(char *dbname) { - Oid user_id, - db_id; + int4 user_id; + Oid db_id; char *path; char dbpath[MAXPGPATH + 1]; char buf[512]; diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 9628423c8e8..4fe55a7b72d 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.29 1998/07/20 21:18:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.30 1998/08/29 04:09:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -244,16 +244,15 @@ union_planner(Query *parse) * using the same function as for a subselect in 'where' */ if (parse->hasSubLinks) { - (List *) parse->havingQual = - (List *) SS_process_sublinks((Node *) parse->havingQual); + parse->havingQual = SS_process_sublinks((Node *) parse->havingQual); } /* convert the havingQual to conjunctive normal form (cnf) */ - (List *) parse->havingQual=cnfify((Expr *)(Node *) parse->havingQual,true); + parse->havingQual = (Node * ) cnfify((Expr *)(Node *) parse->havingQual,true); /* Calculate the opfids from the opnos (=select the correct functions for * the used VAR datatypes) */ - (List *) parse->havingQual=fix_opids((List *) parse->havingQual); + parse->havingQual = (Node * ) fix_opids((List *) parse->havingQual); ((Agg *) result_plan)->plan.qual=(List *) parse->havingQual; diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index f5c4fecba9d..cbb50f7eb4a 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.39 1998/07/24 03:31:43 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.40 1998/08/29 04:09:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -475,10 +475,10 @@ textne(text *arg1, text *arg2) * Returns -1, 0 or 1 */ int -varstr_cmp(unsigned char *arg1, int len1, unsigned char *arg2, int len2) +varstr_cmp(char *arg1, int len1, char *arg2, int len2) { int result; - unsigned char *a1p, *a2p; + char *a1p, *a2p; #ifdef USE_LOCALE a1p = (unsigned char *) palloc(len1 + 1); @@ -518,14 +518,14 @@ varstr_cmp(unsigned char *arg1, int len1, unsigned char *arg2, int len2) int text_cmp(text *arg1, text *arg2) { - unsigned char *a1p, *a2p; - int len1, len2; + char *a1p, *a2p; + int len1, len2; if (arg1 == NULL || arg2 == NULL) return ((bool) FALSE); - a1p = (unsigned char *) VARDATA(arg1); - a2p = (unsigned char *) VARDATA(arg2); + a1p = VARDATA(arg1); + a2p = VARDATA(arg2); len1 = VARSIZE(arg1) - VARHDRSZ; len2 = VARSIZE(arg2) - VARHDRSZ; diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 26453ddae45..f1de816fa15 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.47 1998/08/19 02:04:03 momjian Exp $ + * $Id: builtins.h,v 1.48 1998/08/29 04:09:29 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -438,7 +438,7 @@ extern char *textout(text *vlena); extern text *textcat(text *arg1, text *arg2); extern bool texteq(text *arg1, text *arg2); extern bool textne(text *arg1, text *arg2); -extern int varstr_cmp(unsigned char *arg1, int len1, unsigned char *arg2, int len2); +extern int varstr_cmp(char *arg1, int len1, char *arg2, int len2); extern int text_cmp(text *arg1, text *arg2); extern bool text_lt(text *arg1, text *arg2); extern bool text_le(text *arg1, text *arg2); |