diff options
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/int.c | 33 | ||||
| -rw-r--r-- | src/backend/utils/adt/oid.c | 31 | ||||
| -rw-r--r-- | src/backend/utils/adt/regproc.c | 4 |
3 files changed, 35 insertions, 33 deletions
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index 6037032ed13..2f03fd3f918 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.18 1998/09/01 06:22:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.19 1998/09/22 20:28:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,34 +80,35 @@ 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, - *result + 2, - *result + 3, - *result + 4, - *result + 5, - *result + 6, - *result + 7)) != 8) + &result[0], + &result[1], + &result[2], + &result[3], + &result[4], + &result[5], + &result[6], + &result[7])) != 8) { do - (*result)[nums++] = 0; + result[nums++] = 0; while (nums < 8); } - return (int16 *) result; + return result; } /* * int28out - converts internal form to "num num ..." */ char * -int28out(int16 (*shs)[]) +int28out(int16 *shs) { int num; int16 *sp; @@ -123,7 +124,7 @@ int28out(int16 (*shs)[]) } rp = result = (char *) palloc(8 * 7); /* assumes sign, 5 digits, * ' ' */ - sp = *shs; + sp = shs; for (num = 8; num != 0; num--) { itoa(*sp++, rp); @@ -136,7 +137,7 @@ int28out(int16 (*shs)[]) } /* - * int28in - converts "num num ..." to internal form + * int44in - converts "num num ..." to internal form * * Note: * Fills any nonexistent digits with NULLs. diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index 92946f86fd0..9b3a8ffbca0 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.19 1998/09/01 05:34:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.20 1998/09/22 20:28:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,34 +31,35 @@ Oid * oid8in(char *oidString) { - Oid (*result)[]; + Oid *result; int nums; if (oidString == NULL) return NULL; - result = (Oid (*)[]) palloc(sizeof(Oid[8])); + + result = (Oid *) palloc(sizeof(Oid[8])); if ((nums = sscanf(oidString, "%d%d%d%d%d%d%d%d", - &(*result)[0], - &(*result)[1], - &(*result)[2], - &(*result)[3], - &(*result)[4], - &(*result)[5], - &(*result)[6], - &(*result)[7])) != 8) + &result[0], + &result[1], + &result[2], + &result[3], + &result[4], + &result[5], + &result[6], + &result[7])) != 8) { do - (*result)[nums++] = 0; + result[nums++] = 0; while (nums < 8); } - return (Oid *) result; + return result; } /* * oid8out - converts internal form to "num num ..." */ char * -oid8out(Oid (*oidArray)[]) +oid8out(Oid *oidArray) { int num; Oid *sp; @@ -75,7 +76,7 @@ oid8out(Oid (*oidArray)[]) /* assumes sign, 10 digits, ' ' */ rp = result = (char *) palloc(8 * 12); - sp = *oidArray; + sp = oidArray; for (num = 8; num != 0; num--) { ltoa(*sp++, rp); diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 4d11727b723..ad3cd7a63ef 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.27 1998/09/18 04:43:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.28 1998/09/22 20:28:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -211,7 +211,7 @@ regprocout(RegProcedure proid) * int8typeout - converts int8 type oids to "typname" list */ text * -oid8types(Oid (*oidArray)[]) +oid8types(Oid *oidArray) { HeapTuple typetup; text *result; |