diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c index ad66f892696232ccd29004d361fc7e2674d79e67..c77636bca8bc71739d06602faff9e215e8e8490e 100644 --- a/src/backend/catalog/indexing.c +++ b/src/backend/catalog/indexing.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.26 1998/09/01 04:27:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.27 1998/09/01 06:22:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,15 +45,15 @@ */ char *Name_pg_attr_indices[Num_pg_attr_indices] = {AttributeNameIndex, - AttributeNumIndex, -AttributeRelidIndex}; + AttributeNumIndex, + AttributeRelidIndex}; char *Name_pg_proc_indices[Num_pg_proc_indices] = {ProcedureNameIndex, - ProcedureOidIndex, -ProcedureSrcIndex}; + ProcedureOidIndex, + ProcedureSrcIndex}; char *Name_pg_type_indices[Num_pg_type_indices] = {TypeNameIndex, -TypeOidIndex}; + TypeOidIndex}; char *Name_pg_class_indices[Num_pg_class_indices] = {ClassNameIndex, -ClassOidIndex}; + ClassOidIndex}; char *Name_pg_attrdef_indices[Num_pg_attrdef_indices] = {AttrDefaultIndex}; char *Name_pg_relcheck_indices[Num_pg_relcheck_indices] = {RelCheckIndex}; diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index 4eb646392f67b87063d59af03130b58ee83c8fde..6037032ed135a9db7762564731fa5dcf03727f44 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.17 1998/09/01 04:32:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.18 1998/09/01 06:22:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,12 +80,12 @@ int2out(int16 sh) int16 * int28in(char *shs) { - int16 **result; + int16 (*result)[]; int nums; if (shs == NULL) return NULL; - result = (int16 **) palloc(sizeof(int16[8])); + result = (int16 (*)[]) palloc(sizeof(int16[8])); if ((nums = sscanf(shs, "%hd%hd%hd%hd%hd%hd%hd%hd", *result, *result + 1, @@ -107,7 +107,7 @@ int28in(char *shs) * int28out - converts internal form to "num num ..." */ char * -int28out(int16 **shs) +int28out(int16 (*shs)[]) { int num; int16 *sp; diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 67a98fedbd73b84b5d8bca146f2450425bcd2407..5dae5620c37bf204f4d74809b8563399ae6465db 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.52 1998/09/01 05:34:16 momjian Exp $ + * $Id: builtins.h,v 1.53 1998/09/01 06:22:46 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -64,7 +64,7 @@ extern bool cideq(int8 arg1, int8 arg2); extern int32 int2in(char *num); extern char *int2out(int16 sh); extern int16 *int28in(char *shs); -extern char *int28out(int16 **shs); +extern char *int28out(int16 (*shs)[]); extern int32 *int44in(char *input_string); extern char *int44out(int32 *an_array); extern int32 int4in(char *num);