diff options
Diffstat (limited to 'src/backend/utils/adt')
32 files changed, 1194 insertions, 1194 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index aa0f101469..db5ea074c8 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.29 1998/08/19 02:02:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.30 1998/09/01 03:25:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,7 +62,7 @@ getid(char *s, char *n) n[len] = '\0'; while (isspace(*s)) ++s; - return (s); + return s; } /* @@ -169,7 +169,7 @@ aclparse(char *s, AclItem *aip, unsigned *modechg) elog(DEBUG, "aclparse: correctly read [%x %d %x], modechg=%x", aip->ai_idtype, aip->ai_id, aip->ai_mode, *modechg); #endif - return (s); + return s; } /* @@ -196,7 +196,7 @@ makeacl(int n) new_acl->flags = 0; ARR_LBOUND(new_acl)[0] = 0; ARR_DIMS(new_acl)[0] = n; - return (new_acl); + return new_acl; } /* @@ -226,7 +226,7 @@ aclitemin(char *s) ++s; if (*s) elog(ERROR, "aclitemin: extra garbage at end of specification"); - return (aip); + return aip; } /* @@ -307,7 +307,7 @@ aclitemout(AclItem *aip) *p++ = ACL_MODE_STR[i]; *p = '\0'; - return (out); + return out; } /* @@ -324,19 +324,19 @@ static int32 aclitemeq(AclItem *a1, AclItem *a2) { if (!a1 && !a2) - return (1); + return 1; if (!a1 || !a2) - return (0); - return (a1->ai_idtype == a2->ai_idtype && a1->ai_id == a2->ai_id); + return 0; + return a1->ai_idtype == a2->ai_idtype && a1->ai_id == a2->ai_id; } static int32 aclitemgt(AclItem *a1, AclItem *a2) { if (a1 && !a2) - return (1); + return 1; if (!a1 || !a2) - return (0); + return 0; return ((a1->ai_idtype > a2->ai_idtype) || (a1->ai_idtype == a2->ai_idtype && a1->ai_id > a2->ai_id)); } @@ -355,7 +355,7 @@ aclownerdefault(char *relname, AclId ownerid) aip[1].ai_idtype = ACL_IDTYPE_UID; aip[1].ai_id = ownerid; aip[1].ai_mode = ACL_OWNER_DEFAULT; - return (acl); + return acl; } Acl * @@ -369,7 +369,7 @@ acldefault(char *relname) aip[0].ai_idtype = ACL_IDTYPE_WORLD; aip[0].ai_id = ACL_ID_WORLD; aip[0].ai_mode = IsSystemRelationName(relname) ? ACL_RD : ACL_WORLD_DEFAULT; - return (acl); + return acl; } Acl * @@ -385,13 +385,13 @@ aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg) if (!old_acl || ACL_NUM(old_acl) < 1) { new_acl = makeacl(0); - return (new_acl); + return new_acl; } if (!mod_aip) { new_acl = makeacl(ACL_NUM(old_acl)); memmove((char *) new_acl, (char *) old_acl, ACL_SIZE(old_acl)); - return (new_acl); + return new_acl; } num = ACL_NUM(old_acl); @@ -482,7 +482,7 @@ aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg) } } - return (new_acl); + return new_acl; } /* @@ -492,7 +492,7 @@ aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg) Acl * aclinsert(Acl *old_acl, AclItem *mod_aip) { - return (aclinsert3(old_acl, mod_aip, ACL_MODECHG_EQL)); + return aclinsert3(old_acl, mod_aip, ACL_MODECHG_EQL); } Acl * @@ -508,13 +508,13 @@ aclremove(Acl *old_acl, AclItem *mod_aip) if (!old_acl || ACL_NUM(old_acl) < 1) { new_acl = makeacl(0); - return (new_acl); + return new_acl; } if (!mod_aip) { new_acl = makeacl(ACL_NUM(old_acl)); memmove((char *) new_acl, (char *) old_acl, ACL_SIZE(old_acl)); - return (new_acl); + return new_acl; } old_num = ACL_NUM(old_acl); @@ -552,7 +552,7 @@ aclremove(Acl *old_acl, AclItem *mod_aip) (new_num - dst) * sizeof(AclItem)); } } - return (new_acl); + return new_acl; } int32 @@ -563,12 +563,12 @@ aclcontains(Acl *acl, AclItem *aip) AclItem *aidat; if (!acl || !aip || ((num = ACL_NUM(acl)) < 1)) - return (0); + return 0; aidat = ACL_DAT(acl); for (i = 0; i < num; ++i) if (aclitemeq(aip, aidat + i)) - return (1); - return (0); + return 1; + return 0; } /* parser support routines */ diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index cf76efabf3..cb604baa0f 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.32 1998/08/19 02:02:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.33 1998/09/01 03:25:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,9 +42,9 @@ */ /*-=-=--=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-*/ -static int _ArrayCount(char *str, int dim[], int typdelim); +static int _ArrayCount(char *str, int *dim, int typdelim); static char * -_ReadArrayStr(char *arrayStr, int nitems, int ndim, int dim[], +_ReadArrayStr(char *arrayStr, int nitems, int ndim, int *dim, FmgrInfo *inputproc, Oid typelem, int32 typmod, char typdelim, int typlen, bool typbyval, char typalign, int *nbytes); @@ -52,7 +52,7 @@ _ReadArrayStr(char *arrayStr, int nitems, int ndim, int dim[], #ifdef LOARRAY static char * _ReadLOArray(char *str, int *nbytes, int *fd, bool *chunkFlag, - int ndim, int dim[], int baseSize); + int ndim, int *dim, int baseSize); #endif static void @@ -69,17 +69,17 @@ static char *_AdvanceBy1word(char *str, char **word); #endif static void -_ArrayRange(int st[], int endp[], int bsize, char *destPtr, +_ArrayRange(int *st, int *endp, int bsize, char *destPtr, ArrayType *array, int from); -static int _ArrayClipCount(int stI[], int endpI[], ArrayType *array); +static int _ArrayClipCount(int *stI, int *endpI, ArrayType *array); static void -_LOArrayRange(int st[], int endp[], int bsize, int srcfd, +_LOArrayRange(int *st, int *endp, int bsize, int srcfd, int destfd, ArrayType *array, int isSrcLO, bool *isNull); static void -_ReadArray(int st[], int endp[], int bsize, int srcfd, int destfd, +_ReadArray(int *st, int *endp, int bsize, int srcfd, int destfd, ArrayType *array, int isDestLO, bool *isNull); static int ArrayCastAndSet(char *src, bool typbyval, int typlen, char *dest); -static int SanityCheckInput(int ndim, int n, int dim[], int lb[], int indx[]); +static int SanityCheckInput(int ndim, int n, int *dim, int *lb, int *indx); static int array_read(char *destptr, int eltsize, int nitems, char *srcptr); static char *array_seek(char *ptr, int eltsize, int nitems); @@ -248,17 +248,17 @@ array_in(char *string, /* input array in external form */ elog(ERROR, "large object arrays not supported"); } pfree(string_save); - return ((char *) retval); + return (char *) retval; } /*----------------------------------------------------------------------------- * _ArrayCount -- - * Counts the number of dimensions and the dim[] array for an array string. + * Counts the number of dimensions and the *dim array for an array string. * The syntax for array input is C-like nested curly braces *----------------------------------------------------------------------------- */ static int -_ArrayCount(char *str, int dim[], int typdelim) +_ArrayCount(char *str, int *dim, int typdelim) { int nest_level = 0, i; @@ -272,7 +272,7 @@ _ArrayCount(char *str, int dim[], int typdelim) temp[i] = dim[i] = 0; if (strncmp(str, "{}", 2) == 0) - return (0); + return 0; q = str; while (eoArray != true) @@ -337,7 +337,7 @@ _ArrayCount(char *str, int dim[], int typdelim) for (i = 0; i < ndim; ++i) dim[i] = temp[i]; - return (ndim); + return ndim; } /*--------------------------------------------------------------------------- @@ -356,7 +356,7 @@ static char * _ReadArrayStr(char *arrayStr, int nitems, int ndim, - int dim[], + int *dim, FmgrInfo *inputproc, /* function used for the * conversion */ Oid typelem, @@ -495,7 +495,7 @@ _ReadArrayStr(char *arrayStr, } } } - return ((char *) values); + return (char *) values; } @@ -510,7 +510,7 @@ _ReadLOArray(char *str, int *fd, bool *chunkFlag, int ndim, - int dim[], + int *dim, int baseSize) { char *inputfile, @@ -564,7 +564,7 @@ _ReadLOArray(char *str, chunkfile); FreeFile(afd); } - return (retStr); + return retStr; } #endif @@ -624,7 +624,7 @@ array_out(ArrayType *v, Oid element_type) *dim; if (v == (ArrayType *) NULL) - return ((char *) NULL); + return (char *) NULL; if (ARR_IS_LO(v) == true) { @@ -642,7 +642,7 @@ array_out(ArrayType *v, Oid element_type) strcat(save_p, ASSGN); strcat(save_p, ARR_DATA_PTR(v)); pfree(p); - return (save_p); + return save_p; } system_cache_lookup(element_type, false, &typlen, &typbyval, @@ -756,7 +756,7 @@ array_out(ArrayType *v, Oid element_type) } while (j != -1); pfree(values); - return (retval); + return retval; } /*----------------------------------------------------------------------------- @@ -793,7 +793,7 @@ array_dims(ArrayType *v, bool *isNull) } nbytes = strlen(save_p + VARHDRSZ) + VARHDRSZ; memmove(save_p, &nbytes, VARHDRSZ); - return (save_p); + return save_p; } /*--------------------------------------------------------------------------- @@ -806,7 +806,7 @@ array_dims(ArrayType *v, bool *isNull) Datum array_ref(ArrayType *array, int n, - int indx[], + int *indx, int reftype, int elmlen, int arraylen, @@ -927,8 +927,8 @@ array_ref(ArrayType *array, Datum array_clip(ArrayType *array, int n, - int upperIndx[], - int lowerIndx[], + int *upperIndx, + int *lowerIndx, int reftype, int len, bool *isNull) @@ -1036,7 +1036,7 @@ array_clip(ArrayType *array, newArr = NULL; } /* timer_end(); */ - return ((Datum) newArr); + return (Datum) newArr; } if (len > 0) @@ -1069,7 +1069,7 @@ array_clip(ArrayType *array, char * array_set(ArrayType *array, int n, - int indx[], + int *indx, char *dataPtr, int reftype, int elmlen, @@ -1095,7 +1095,7 @@ array_set(ArrayType *array, elog(ERROR, "array_ref: array bound exceeded"); pos = (char *) array + indx[0] * elmlen; ArrayCastAndSet(dataPtr, (bool) reftype, elmlen, pos); - return ((char *) array); + return (char *) array; } dim = ARR_DIMS(array); lb = ARR_LBOUND(array); @@ -1105,7 +1105,7 @@ array_set(ArrayType *array, if (!SanityCheckInput(ndim, n, dim, lb, indx)) { elog(ERROR, "array_set: array bound exceeded"); - return ((char *) array); + return (char *) array; } offset = GetOffset(n, dim, lb, indx); @@ -1121,10 +1121,10 @@ array_set(ArrayType *array, lo_name = ARR_DATA_PTR(array); if ((fd = LOopen(lo_name, ARR_IS_INV(array) ? INV_WRITE : O_WRONLY)) < 0) - return ((char *) array); + return (char *) array; #endif if (lo_lseek(fd, offset, SEEK_SET) < 0) - return ((char *) array); + return (char *) array; v = (struct varlena *) palloc(elmlen + VARHDRSZ); VARSIZE(v) = elmlen + VARHDRSZ; ArrayCastAndSet(dataPtr, (bool) reftype, elmlen, VARDATA(v)); @@ -1137,14 +1137,14 @@ array_set(ArrayType *array, */ pfree(v); lo_close(fd); - return ((char *) array); + return (char *) array; } if (elmlen > 0) { offset = offset * elmlen; /* off the end of the array */ if (nbytes - offset < 1) - return ((char *) array); + return (char *) array; pos = ARR_DATA_PTR(array) + offset; } else @@ -1167,7 +1167,7 @@ array_set(ArrayType *array, { /* new element with same size, overwrite old data */ ArrayCastAndSet(dataPtr, (bool) reftype, elmlen, elt_ptr); - return ((char *) array); + return (char *) array; } /* new element with different size, reallocate the array */ @@ -1186,10 +1186,10 @@ array_set(ArrayType *array, (char *) array + lth0 + lth1 + oldlen, lth2); /* ??? who should free this storage ??? */ - return ((char *) newarray); + return (char *) newarray; } ArrayCastAndSet(dataPtr, (bool) reftype, elmlen, pos); - return ((char *) array); + return (char *) array; } /*---------------------------------------------------------------------------- @@ -1204,8 +1204,8 @@ array_set(ArrayType *array, char * array_assgn(ArrayType *array, int n, - int upperIndx[], - int lowerIndx[], + int *upperIndx, + int *lowerIndx, ArrayType *newArr, int reftype, int len, @@ -1227,7 +1227,7 @@ array_assgn(ArrayType *array, if (!SanityCheckInput(ndim, n, dim, lb, upperIndx) || !SanityCheckInput(ndim, n, dim, lb, lowerIndx)) - return ((char *) array); + return (char *) array; for (i = 0; i < n; i++) if (lowerIndx[i] > upperIndx[i]) @@ -1243,14 +1243,14 @@ array_assgn(ArrayType *array, lo_name = (char *) ARR_DATA_PTR(array); if ((fd = LOopen(lo_name, ARR_IS_INV(array) ? INV_WRITE : O_WRONLY)) < 0) - return ((char *) array); + return (char *) array; #endif if (ARR_IS_LO(newArr)) { #ifdef LOARRAY lo_name = (char *) ARR_DATA_PTR(newArr); if ((newfd = LOopen(lo_name, ARR_IS_INV(newArr) ? INV_READ : O_RDONLY)) < 0) - return ((char *) array); + return (char *) array; #endif _LOArrayRange(lowerIndx, upperIndx, len, fd, newfd, array, 1, isNull); lo_close(newfd); @@ -1261,7 +1261,7 @@ array_assgn(ArrayType *array, array, 0, isNull); } lo_close(fd); - return ((char *) array); + return (char *) array; } _ArrayRange(lowerIndx, upperIndx, len, ARR_DATA_PTR(newArr), array, 0); return (char *) array; @@ -1278,12 +1278,12 @@ int array_eq(ArrayType *array1, ArrayType *array2) { if ((array1 == NULL) || (array2 == NULL)) - return (0); + return 0; if (*(int *) array1 != *(int *) array2) - return (0); + return 0; if (memcmp(array1, array2, *(int *) array1)) - return (0); - return (1); + return 0; + return 1; } /***************************************************************************/ @@ -1300,7 +1300,7 @@ system_cache_lookup(Oid element_type, char *typalign) { HeapTuple typeTuple; - TypeTupleForm typeStruct; + Form_pg_type typeStruct; typeTuple = SearchSysCacheTuple(TYPOID, ObjectIdGetDatum(element_type), @@ -1312,7 +1312,7 @@ system_cache_lookup(Oid element_type, element_type); return; } - typeStruct = (TypeTupleForm) GETSTRUCT(typeTuple); + typeStruct = (Form_pg_type) GETSTRUCT(typeTuple); *typlen = typeStruct->typlen; *typbyval = typeStruct->typbyval; *typdelim = typeStruct->typdelim; @@ -1332,12 +1332,12 @@ _ArrayCast(char *value, bool byval, int len) switch (len) { case 1: - return ((Datum) *value); + return (Datum) *value; case 2: - return ((Datum) *(int16 *) value); + return (Datum) *(int16 *) value; case 3: case 4: - return ((Datum) *(int32 *) value); + return (Datum) *(int32 *) value; default: elog(ERROR, "array_ref: byval and elt len > 4!"); break; @@ -1383,7 +1383,7 @@ ArrayCastAndSet(char *src, memmove(dest, src, *(int32 *) src); inc = (INTALIGN(*(int32 *) src)); } - return (inc); + return inc; } #ifdef LOARRAY @@ -1412,7 +1412,7 @@ _AdvanceBy1word(char *str, char **word) #endif static int -SanityCheckInput(int ndim, int n, int dim[], int lb[], int indx[]) +SanityCheckInput(int ndim, int n, int *dim, int *lb, int *indx) { int i; @@ -1426,8 +1426,8 @@ SanityCheckInput(int ndim, int n, int dim[], int lb[], int indx[]) } static void -_ArrayRange(int st[], - int endp[], +_ArrayRange(int *st, + int *endp, int bsize, char *destPtr, ArrayType *array, @@ -1472,7 +1472,7 @@ _ArrayRange(int st[], } static int -_ArrayClipCount(int stI[], int endpI[], ArrayType *array) +_ArrayClipCount(int *stI, int *endpI, ArrayType *array) { int n, *dim, @@ -1518,10 +1518,10 @@ array_seek(char *ptr, int eltsize, int nitems) int i; if (eltsize > 0) - return (ptr + eltsize * nitems); + return ptr + eltsize * nitems; for (i = 0; i < nitems; i++) ptr += INTALIGN(*(int32 *) ptr); - return (ptr); + return ptr; } static int @@ -1534,7 +1534,7 @@ array_read(char *destptr, int eltsize, int nitems, char *srcptr) if (eltsize > 0) { memmove(destptr, srcptr, eltsize * nitems); - return (eltsize * nitems); + return eltsize * nitems; } for (i = inc = 0; i < nitems; i++) { @@ -1544,12 +1544,12 @@ array_read(char *destptr, int eltsize, int nitems, char *srcptr) destptr += tmp; inc += tmp; } - return (inc); + return inc; } static void -_LOArrayRange(int st[], - int endp[], +_LOArrayRange(int *st, + int *endp, int bsize, int srcfd, int destfd, @@ -1602,8 +1602,8 @@ _LOArrayRange(int st[], static void -_ReadArray(int st[], - int endp[], +_ReadArray(int *st, + int *endp, int bsize, int srcfd, int destfd, @@ -1680,7 +1680,7 @@ _LOtransfer(char **destfd, if (VARSIZE(v) - VARHDRSZ < inc) { pfree(v); - return (-1); + return -1; } tmp += LOwrite((int) *destfd, v); #endif @@ -1704,7 +1704,7 @@ _LOtransfer(char **destfd, *srcfd += inc; *destfd += inc; } - return (tmp); + return tmp; #undef MAX_READ } @@ -1721,5 +1721,5 @@ _array_newLO(int *fd, int flag) if ((*fd = LOcreat(saveName, 0600, flag)) < 0) elog(ERROR, "Large object create failed"); #endif - return (p); + return p; } diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c index 898a604962..a4253f983f 100644 --- a/src/backend/utils/adt/arrayutils.c +++ b/src/backend/utils/adt/arrayutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.5 1997/09/08 02:30:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.6 1998/09/01 03:25:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ #include "utils/array.h" int -GetOffset(int n, int dim[], int lb[], int indx[]) +GetOffset(int n, int *dim, int *lb, int *indx) { int i, scale, @@ -31,7 +31,7 @@ GetOffset(int n, int dim[], int lb[], int indx[]) } int -getNitems(int n, int a[]) +getNitems(int n, int *a) { int i, ret; @@ -43,7 +43,7 @@ getNitems(int n, int a[]) } int -compute_size(int st[], int endp[], int n, int base) +compute_size(int *st, int *endp, int n, int base) { int i, ret; @@ -54,7 +54,7 @@ compute_size(int st[], int endp[], int n, int base) } void -mda_get_offset_values(int n, int dist[], int PC[], int span[]) +mda_get_offset_values(int n, int *dist, int *PC, int *span) { int i, j; @@ -65,7 +65,7 @@ mda_get_offset_values(int n, int dist[], int PC[], int span[]) } void -mda_get_range(int n, int span[], int st[], int endp[]) +mda_get_range(int n, int *span, int *st, int *endp) { int i; @@ -74,7 +74,7 @@ mda_get_range(int n, int span[], int st[], int endp[]) } void -mda_get_prod(int n, int range[], int P[]) +mda_get_prod(int n, int *range, int *P) { int i; @@ -83,7 +83,7 @@ mda_get_prod(int n, int range[], int P[]) } int -tuple2linear(int n, int tup[], int scale[]) +tuple2linear(int n, int *tup, int *scale) { int i, lin; @@ -94,7 +94,7 @@ tuple2linear(int n, int tup[], int scale[]) } void -array2chunk_coord(int n, int C[], int a_coord[], int c_coord[]) +array2chunk_coord(int n, int *C, int *a_coord, int *c_coord) { int i; @@ -110,19 +110,19 @@ array2chunk_coord(int n, int C[], int a_coord[], int c_coord[]) 1 otherwise -----------------------------------------------------------------------------*/ int -next_tuple(int n, int curr[], int span[]) +next_tuple(int n, int *curr, int *span) { int i; if (!n) - return (-1); + return -1; curr[n - 1] = (curr[n - 1] + 1) % span[n - 1]; for (i = n - 1; i * (!curr[i]); i--) curr[i - 1] = (curr[i - 1] + 1) % span[i - 1]; if (i) - return (i); + return i; if (curr[0]) - return (0); - return (-1); + return 0; + return -1; } diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c index e781dbe59f..822d4cfad9 100644 --- a/src/backend/utils/adt/bool.c +++ b/src/backend/utils/adt/bool.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.14 1998/02/26 04:36:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.15 1998/09/01 03:25:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,35 +38,35 @@ boolin(char *b) case 't': case 'T': if (strncasecmp(b, "true", strlen(b)) == 0) - return (TRUE); + return TRUE; break; case 'f': case 'F': if (strncasecmp(b, "false", strlen(b)) == 0) - return (FALSE); + return FALSE; break; case 'y': case 'Y': if (strncasecmp(b, "yes", strlen(b)) == 0) - return (TRUE); + return TRUE; break; case '1': if (strncasecmp(b, "1", strlen(b)) == 0) - return (TRUE); + return TRUE; break; case 'n': case 'N': if (strncasecmp(b, "no", strlen(b)) == 0) - return (FALSE); + return FALSE; break; case '0': if (strncasecmp(b, "0", strlen(b)) == 0) - return (FALSE); + return FALSE; break; default: @@ -75,7 +75,7 @@ boolin(char *b) elog(ERROR, "Bad boolean external representation '%s'", b); /* not reached */ - return (FALSE); + return FALSE; } /* boolin() */ /* @@ -88,7 +88,7 @@ boolout(bool b) *result = (b) ? 't' : 'f'; result[1] = '\0'; - return (result); + return result; } /* boolout() */ @@ -99,35 +99,35 @@ boolout(bool b) bool booleq(bool arg1, bool arg2) { - return (arg1 == arg2); + return arg1 == arg2; } bool boolne(bool arg1, bool arg2) { - return (arg1 != arg2); + return arg1 != arg2; } bool boollt(bool arg1, bool arg2) { - return (arg1 < arg2); + return arg1 < arg2; } bool boolgt(bool arg1, bool arg2) { - return (arg1 > arg2); + return arg1 > arg2; } bool istrue(bool arg1) { - return (arg1 == TRUE); + return arg1 == TRUE; } /* istrue() */ bool isfalse(bool arg1) { - return (arg1 != TRUE); + return arg1 != TRUE; } /* isfalse() */ diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index d57c362afc..dde1eb2f2c 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -9,7 +9,7 @@ * workings can be found in the book "Software Solutions in C" by * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7. * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.24 1998/06/15 19:29:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.25 1998/09/01 03:25:49 momjian Exp $ */ #include <stdio.h> @@ -187,7 +187,7 @@ printf( "cashin- string is '%s'\n", s); printf( "cashin- result is %d\n", *result); #endif - return (result); + return result; } /* cash_in() */ @@ -301,7 +301,7 @@ cash_out(Cash *in_value) strcpy(result, buf + count); } - return (result); + return result; } /* cash_out() */ @@ -309,54 +309,54 @@ bool cash_eq(Cash *c1, Cash *c2) { if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (FALSE); + return FALSE; - return (*c1 == *c2); + return *c1 == *c2; } /* cash_eq() */ bool cash_ne(Cash *c1, Cash *c2) { if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (FALSE); + return FALSE; - return (*c1 != *c2); + return *c1 != *c2; } /* cash_ne() */ bool cash_lt(Cash *c1, Cash *c2) { if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (FALSE); + return FALSE; - return (*c1 < *c2); + return *c1 < *c2; } /* cash_lt() */ bool cash_le(Cash *c1, Cash *c2) { if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (FALSE); + return FALSE; - return (*c1 <= *c2); + return *c1 <= *c2; } /* cash_le() */ bool cash_gt(Cash *c1, Cash *c2) { if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (FALSE); + return FALSE; - return (*c1 > *c2); + return *c1 > *c2; } /* cash_gt() */ bool cash_ge(Cash *c1, Cash *c2) { if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (FALSE); + return FALSE; - return (*c1 >= *c2); + return *c1 >= *c2; } /* cash_ge() */ @@ -369,14 +369,14 @@ cash_pl(Cash *c1, Cash *c2) Cash *result; if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't add cash", NULL); *result = (*c1 + *c2); - return (result); + return result; } /* cash_pl() */ @@ -389,14 +389,14 @@ cash_mi(Cash *c1, Cash *c2) Cash *result; if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't subtract cash", NULL); *result = (*c1 - *c2); - return (result); + return result; } /* cash_mi() */ @@ -409,14 +409,14 @@ cash_mul_flt8(Cash *c, float8 *f) Cash *result; if (!PointerIsValid(f) || !PointerIsValid(c)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't multiply cash", NULL); *result = ((*f) * (*c)); - return (result); + return result; } /* cash_mul_flt8() */ @@ -426,7 +426,7 @@ cash_mul_flt8(Cash *c, float8 *f) Cash * flt8_mul_cash(float8 *f, Cash *c) { - return (cash_mul_flt8(c, f)); + return cash_mul_flt8(c, f); } /* flt8_mul_cash() */ @@ -442,7 +442,7 @@ cash_div_flt8(Cash *c, float8 *f) Cash *result; if (!PointerIsValid(f) || !PointerIsValid(c)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't divide cash", NULL); @@ -452,7 +452,7 @@ cash_div_flt8(Cash *c, float8 *f) *result = rint(*c / *f); - return (result); + return result; } /* cash_div_flt8() */ /* cash_mul_flt4() @@ -464,14 +464,14 @@ cash_mul_flt4(Cash *c, float4 *f) Cash *result; if (!PointerIsValid(f) || !PointerIsValid(c)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't multiply cash", NULL); *result = ((*f) * (*c)); - return (result); + return result; } /* cash_mul_flt4() */ @@ -481,7 +481,7 @@ cash_mul_flt4(Cash *c, float4 *f) Cash * flt4_mul_cash(float4 *f, Cash *c) { - return (cash_mul_flt4(c, f)); + return cash_mul_flt4(c, f); } /* flt4_mul_cash() */ @@ -497,7 +497,7 @@ cash_div_flt4(Cash *c, float4 *f) Cash *result; if (!PointerIsValid(f) || !PointerIsValid(c)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't divide cash", NULL); @@ -507,7 +507,7 @@ cash_div_flt4(Cash *c, float4 *f) *result = rint(*c / *f); - return (result); + return result; } /* cash_div_flt4() */ @@ -520,14 +520,14 @@ cash_mul_int4(Cash *c, int4 i) Cash *result; if (!PointerIsValid(c)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't multiply cash", NULL); *result = ((i) * (*c)); - return (result); + return result; } /* cash_mul_int4() */ @@ -537,7 +537,7 @@ cash_mul_int4(Cash *c, int4 i) Cash * int4_mul_cash(int4 i, Cash *c) { - return (cash_mul_int4(c, i)); + return cash_mul_int4(c, i); } /* int4_mul_cash() */ @@ -553,7 +553,7 @@ cash_div_int4(Cash *c, int4 i) Cash *result; if (!PointerIsValid(c)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't divide cash", NULL); @@ -563,7 +563,7 @@ cash_div_int4(Cash *c, int4 i) *result = rint(*c / i); - return (result); + return result; } /* cash_div_int4() */ @@ -576,14 +576,14 @@ cash_mul_int2(Cash *c, int2 s) Cash *result; if (!PointerIsValid(c)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't multiply cash", NULL); *result = ((s) * (*c)); - return (result); + return result; } /* cash_mul_int2() */ @@ -593,7 +593,7 @@ cash_mul_int2(Cash *c, int2 s) Cash * int2_mul_cash(int2 s, Cash *c) { - return (cash_mul_int2(c, s)); + return cash_mul_int2(c, s); } /* int2_mul_cash() */ @@ -609,7 +609,7 @@ cash_div_int2(Cash *c, int2 s) Cash *result; if (!PointerIsValid(c)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't divide cash", NULL); @@ -619,7 +619,7 @@ cash_div_int2(Cash *c, int2 s) *result = rint(*c / s); - return (result); + return result; } /* cash_div_int2() */ @@ -632,14 +632,14 @@ cashlarger(Cash *c1, Cash *c2) Cash *result; if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't return larger cash", NULL); *result = ((*c1 > *c2) ? *c1 : *c2); - return (result); + return result; } /* cashlarger() */ @@ -652,14 +652,14 @@ cashsmaller(Cash *c1, Cash *c2) Cash *result; if (!PointerIsValid(c1) || !PointerIsValid(c2)) - return (NULL); + return NULL; if (!PointerIsValid(result = palloc(sizeof(Cash)))) elog(ERROR, "Memory allocation failed, can't return smaller cash", NULL); *result = ((*c1 < *c2) ? *c1 : *c2); - return (result); + return result; } /* cashsmaller() */ @@ -714,7 +714,7 @@ cash_words_out(Cash *value) strcat(buf, num_word(m0)); strcat(buf, m0 == 1 ? " cent" : " cents"); *buf = toupper(*buf); - return (buf); + return buf; } /* cash_words_out() */ @@ -737,13 +737,13 @@ num_word(Cash value) /* deal with the simple cases first */ if (value <= 20) - return (small[value]); + return small[value]; /* is it an even multiple of 100? */ if (!tu) { sprintf(buf, "%s hundred", small[value / 100]); - return (buf); + return buf; } /* more than 99? */ @@ -772,5 +772,5 @@ num_word(Cash value) sprintf(buf, "%s %s", big[tu / 10], small[tu % 10]); } - return (buf); + return buf; } /* num_word() */ diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c index 466eeb0c2a..aec4bf8b19 100644 --- a/src/backend/utils/adt/char.c +++ b/src/backend/utils/adt/char.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.18 1998/04/26 04:07:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.19 1998/09/01 03:25:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,8 +29,8 @@ int32 charin(char *ch) { if (ch == NULL) - return ((int32) NULL); - return ((int32) *ch); + return (int32) NULL; + return (int32) *ch; } /* @@ -43,7 +43,7 @@ charout(int32 ch) result[0] = (char) ch; result[1] = '\0'; - return (result); + return result; } /* @@ -62,7 +62,7 @@ cidin(char *s) else c = atoi(s); - return ((int32) c); + return (int32) c; } /* @@ -80,7 +80,7 @@ cidout(int32 c) result = palloc(12); c2 = (CommandId) c; sprintf(result, "%u", (unsigned) (c2)); - return (result); + return result; } @@ -91,65 +91,65 @@ cidout(int32 c) bool chareq(int8 arg1, int8 arg2) { - return (arg1 == arg2); + return arg1 == arg2; } bool charne(int8 arg1, int8 arg2) { - return (arg1 != arg2); + return arg1 != arg2; } bool charlt(int8 arg1, int8 arg2) { - return ((uint8) arg1 < (uint8) arg2); + return (uint8) arg1 < (uint8) arg2; } bool charle(int8 arg1, int8 arg2) { - return ((uint8) arg1 <= (uint8) arg2); + return (uint8) arg1 <= (uint8) arg2; } bool chargt(int8 arg1, int8 arg2) { - return ((uint8) arg1 > (uint8) arg2); + return (uint8) arg1 > (uint8) arg2; } bool charge(int8 arg1, int8 arg2) { - return ((uint8) arg1 >= (uint8) arg2); + return (uint8) arg1 >= (uint8) arg2; } int8 charpl(int8 arg1, int8 arg2) { - return (arg1 + arg2); + return arg1 + arg2; } int8 charmi(int8 arg1, int8 arg2) { - return (arg1 - arg2); + return arg1 - arg2; } int8 charmul(int8 arg1, int8 arg2) { - return (arg1 * arg2); + return arg1 * arg2; } int8 chardiv(int8 arg1, int8 arg2) { - return (arg1 / arg2); + return arg1 / arg2; } bool cideq(int8 arg1, int8 arg2) { - return (arg1 == arg2); + return arg1 == arg2; } diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c index 2eeebfb12d..05d9a52bc5 100644 --- a/src/backend/utils/adt/chunk.c +++ b/src/backend/utils/adt/chunk.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.16 1998/02/26 04:36:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.17 1998/09/01 03:25:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,20 +41,20 @@ static CHUNK_INFO cInfo; /* non-export function prototypes */ static int -_FindBestChunk(int size, int dmax[], int dbest[], int dim, +_FindBestChunk(int size, int *dmax, int *dbest, int dim, int A[MAXPAT][MAXDIM + 1], int N); -static int get_next(int d[], int k, int C, int dmax[]); -static void initialize_info(CHUNK_INFO *A, int ndim, int dim[], int chunk[]); +static int get_next(int *d, int k, int C, int *dmax); +static void initialize_info(CHUNK_INFO *A, int ndim, int *dim, int *chunk); #ifdef LOARRAY static void -_ConvertToChunkFile(int n, int baseSize, int dim[], int C[], +_ConvertToChunkFile(int n, int baseSize, int *dim, int *C, int srcfd, int destfd); static void -read_chunk(int chunk_no[], int C[], char a_chunk[], int srcfd, - int n, int baseSize, int PX[], int dist[]); +read_chunk(int *chunk_no, int *C, char *a_chunk, int srcfd, + int n, int baseSize, int *PX, int *dist); static int write_chunk(struct varlena * a_chunk, int ofile); -static int seek_and_read(int pos, int size, char buff[], int fp, int from); +static int seek_and_read(int pos, int size, char *buff, int fp, int from); #endif static int @@ -74,7 +74,7 @@ char * _ChunkArray(int fd, FILE *afd, int ndim, - int dim[], + int *dim, int baseSize, int *nbytes, char *chunkfile) @@ -172,8 +172,8 @@ GetChunkSize(FILE *fd, */ static int _FindBestChunk(int size, - int dmax[], - int dbest[], + int *dmax, + int *dbest, int dim, int A[MAXPAT][MAXDIM + 1], int N) @@ -188,8 +188,8 @@ _FindBestChunk(int size, { /* - * compute the number of page fetches for a given chunk size (d[]) - * and access pattern (A[][]) + * compute the number of page fetches for a given chunk size (*d) + * and access pattern (**A) */ int i, j, @@ -213,7 +213,7 @@ _FindBestChunk(int size, ; } } - return (mintc); + return mintc; } /*---------------------------------------------------------------------- @@ -222,7 +222,7 @@ _FindBestChunk(int size, *--------------------------------------------------------------------- */ static int -get_next(int d[], int k, int C, int dmax[]) +get_next(int *d, int k, int C, int *dmax) { int i, j, @@ -236,7 +236,7 @@ get_next(int d[], int k, int C, int dmax[]) d[j] = min(temp, dmax[j]); temp = max(1, temp / d[j]); } - return (1); + return 1; } for (j = 0, temp = 1; j < k; j++) @@ -249,7 +249,7 @@ get_next(int d[], int k, int C, int dmax[]) break; } if (i < 0) - return (0); + return 0; d[i]++; j = C / temp; @@ -262,7 +262,7 @@ get_next(int d[], int k, int C, int dmax[]) d[j] = min(temp, dmax[j]); temp = max(1, temp / d[j]); } - return (1); + return 1; } #ifdef LOARRAY @@ -272,7 +272,7 @@ static char a_chunk[BLCKSZ + VARHDRSZ]; /* VARHDRSZ since a_chunk is in #endif static void -initialize_info(CHUNK_INFO *A, int ndim, int dim[], int chunk[]) +initialize_info(CHUNK_INFO *A, int ndim, int *dim, int *chunk) { int i; @@ -295,8 +295,8 @@ initialize_info(CHUNK_INFO *A, int ndim, int dim[], int chunk[]) static void _ConvertToChunkFile(int n, int baseSize, - int dim[], - int C[], + int *dim, + int *C, int srcfd, int destfd) { @@ -335,14 +335,14 @@ _ConvertToChunkFile(int n, *-------------------------------------------------------------------------- */ static void -read_chunk(int chunk_no[], - int C[], - char a_chunk[], +read_chunk(int *chunk_no, + int *C, + char *a_chunk, int srcfd, int n, int baseSize, - int PX[], - int dist[]) + int *PX, + int *dist) { int i, j, @@ -392,7 +392,7 @@ write_chunk(struct varlena * a_chunk, int ofile) #ifdef LOARRAY got_n = LOwrite(ofile, a_chunk); #endif - return (got_n); + return got_n; } /*-------------------------------------------------------------------------- @@ -403,7 +403,7 @@ write_chunk(struct varlena * a_chunk, int ofile) *-------------------------------------------------------------------------- */ static int -seek_and_read(int pos, int size, char buff[], int fp, int from) +seek_and_read(int pos, int size, char *buff, int fp, int from) { struct varlena *v = NULL; @@ -417,7 +417,7 @@ seek_and_read(int pos, int size, char buff[], int fp, int from) elog(ERROR, "File read error"); memmove(buff, VARDATA(v), size); pfree(v); - return (1); + return 1; } @@ -430,8 +430,8 @@ seek_and_read(int pos, int size, char buff[], int fp, int from) *--------------------------------------------------------------------------- */ int -_ReadChunkArray(int st[], - int endp[], +_ReadChunkArray(int *st, + int *endp, int bsize, int fp, char *destfp, @@ -576,7 +576,7 @@ _ReadChunkArray(int st[], block_seek += (to_read / bsize); /* - * compute next tuple in range[] + * compute next tuple in *range */ { int x; @@ -620,7 +620,7 @@ _ReadChunkArray(int st[], range_end[i] = min((chunk_st[i] + chunk_off[i]) * C[i] + C[i] - 1, endp[i]); } } while (jj != -1); - return (words_read); + return words_read; } /*------------------------------------------------------------------------ @@ -630,7 +630,7 @@ _ReadChunkArray(int st[], *------------------------------------------------------------------------- */ struct varlena * -_ReadChunkArray1El(int st[], +_ReadChunkArray1El(int *st, int bsize, int fp, ArrayType *array, diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 0edd618656..720178c400 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.25 1998/06/15 18:39:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.26 1998/09/01 03:25:53 momjian Exp $ * * NOTES * This code is actually (almost) unused. @@ -97,8 +97,8 @@ static int sec_tab[] = { static void reltime2tm(int32 time, struct tm * tm); #if FALSE -static int correct_unit(char unit[], int *unptr); -static int correct_dir(char direction[], int *signptr); +static int correct_unit(char *unit, int *unptr); +static int correct_dir(char *direction, int *signptr); #endif @@ -147,14 +147,14 @@ reltimein(char *str) case DTK_DELTA: result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec); result += (((tm->tm_year * 365) + (tm->tm_mon * 30) + tm->tm_mday) * (24 * 60 * 60)); - return (result); + return result; default: - return (INVALID_RELTIME); + return INVALID_RELTIME; } elog(ERROR, "Bad reltime (internal coding error) '%s'", str); - return (INVALID_RELTIME); + return INVALID_RELTIME; } /* reltimein() */ @@ -183,7 +183,7 @@ reltimeout(int32 time) result = palloc(strlen(buf) + 1); strcpy(result, buf); - return (result); + return result; } /* reltimeout() */ @@ -217,7 +217,7 @@ timestring = (char *) palloc(Max(strlen(INVALID_RELTIME_STR), if (timevalue == INVALID_RELTIME) { strcpy(timestring, INVALID_RELTIME_STR); - return (timestring); + return timestring; } if (timevalue == 0) @@ -236,7 +236,7 @@ if (quantity >= 0) else sprintf(timestring, "%c %lu %s %s", RELTIME_LABEL, (quantity * -1), unit_tab[unitnr], RELTIME_PAST); -return (timestring); +return timestring; } #endif @@ -269,7 +269,7 @@ tintervalin(char *intervalstr) interval->data[1] = i_end; interval->status = T_INTERVAL_VALID; } - return (interval); + return interval; } @@ -298,7 +298,7 @@ tintervalout(TimeInterval interval) pfree(p); } strcat(i_str, "\"]\0"); - return (i_str); + return i_str; } @@ -352,7 +352,7 @@ timespan_reltime(TimeSpan *timespan) time = (((span > INT_MIN) && (span < INT_MAX)) ? span : INVALID_RELTIME); } - return (time); + return time; } /* timespan_reltime() */ @@ -380,7 +380,7 @@ reltime_timespan(RelativeTime reltime) result->month = ((12 * year) + month); } - return (result); + return result; } /* reltime_timespan() */ @@ -427,9 +427,9 @@ timepl(AbsoluteTime t1, RelativeTime t2) RelativeTimeIsValid(t2) && ((t2 > 0) ? (t1 < NOEND_ABSTIME - t2) : (t1 > NOSTART_ABSTIME - t2))) /* prevent overflow */ - return (t1 + t2); + return t1 + t2; - return (INVALID_ABSTIME); + return INVALID_ABSTIME; } @@ -446,9 +446,9 @@ timemi(AbsoluteTime t1, RelativeTime t2) RelativeTimeIsValid(t2) && ((t2 > 0) ? (t1 > NOSTART_ABSTIME + t2) : (t1 < NOEND_ABSTIME + t2))) /* prevent overflow */ - return (t1 - t2); + return t1 - t2; - return (INVALID_ABSTIME); + return INVALID_ABSTIME; } @@ -465,9 +465,9 @@ abstimemi(AbsoluteTime t1, AbsoluteTime t2) if (AbsoluteTimeIsReal(t1) && AbsoluteTimeIsReal(t2)) - return (t1 - t2); + return t1 - t2; - return (INVALID_RELTIME); + return INVALID_RELTIME; } @@ -480,7 +480,7 @@ ininterval(AbsoluteTime t, TimeInterval interval) if (interval->status == T_INTERVAL_VALID && t != INVALID_ABSTIME) return (abstimege(t, interval->data[0]) && abstimele(t, interval->data[1])); - return (0); + return 0; } /* @@ -490,9 +490,9 @@ RelativeTime intervalrel(TimeInterval interval) { if (interval->status == T_INTERVAL_VALID) - return (abstimemi(interval->data[1], interval->data[0])); + return abstimemi(interval->data[1], interval->data[0]); else - return (INVALID_RELTIME); + return INVALID_RELTIME; } /* @@ -506,8 +506,8 @@ timenow() time_t sec; if (time(&sec) < 0) - return (INVALID_ABSTIME); - return ((AbsoluteTime) sec); + return INVALID_ABSTIME; + return (AbsoluteTime) sec; } /* @@ -523,7 +523,7 @@ reltimeeq(RelativeTime t1, RelativeTime t2) { if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) return 0; - return (t1 == t2); + return t1 == t2; } bool @@ -531,7 +531,7 @@ reltimene(RelativeTime t1, RelativeTime t2) { if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) return 0; - return (t1 != t2); + return t1 != t2; } bool @@ -539,7 +539,7 @@ reltimelt(RelativeTime t1, RelativeTime t2) { if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) return 0; - return (t1 < t2); + return t1 < t2; } bool @@ -547,7 +547,7 @@ reltimegt(RelativeTime t1, RelativeTime t2) { if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) return 0; - return (t1 > t2); + return t1 > t2; } bool @@ -555,7 +555,7 @@ reltimele(RelativeTime t1, RelativeTime t2) { if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) return 0; - return (t1 <= t2); + return t1 <= t2; } bool @@ -563,7 +563,7 @@ reltimege(RelativeTime t1, RelativeTime t2) { if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) return 0; - return (t1 >= t2); + return t1 >= t2; } @@ -575,7 +575,7 @@ bool intervalsame(TimeInterval i1, TimeInterval i2) { if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) - return (FALSE); /* invalid interval */ + return FALSE; /* invalid interval */ return (abstimeeq(i1->data[0], i2->data[0]) && abstimeeq(i1->data[1], i2->data[1])); } /* intervalsame() */ @@ -594,7 +594,7 @@ intervaleq(TimeInterval i1, TimeInterval i2) t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) - return (FALSE); /* invalid interval */ + return FALSE; /* invalid interval */ t10 = i1->data[0]; t11 = i1->data[1]; @@ -603,7 +603,7 @@ intervaleq(TimeInterval i1, TimeInterval i2) if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) - return (FALSE); + return FALSE; if (t10 == CURRENT_ABSTIME) t10 = GetCurrentTransactionStartTime(); @@ -614,7 +614,7 @@ intervaleq(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11 - t10) == (t21 - t20)); + return (t11 - t10) == (t21 - t20); } /* intervaleq() */ /* @@ -630,7 +630,7 @@ intervalne(TimeInterval i1, TimeInterval i2) t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) - return (FALSE); /* invalid interval */ + return FALSE; /* invalid interval */ t10 = i1->data[0]; t11 = i1->data[1]; @@ -639,7 +639,7 @@ intervalne(TimeInterval i1, TimeInterval i2) if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) - return (FALSE); + return FALSE; if (t10 == CURRENT_ABSTIME) t10 = GetCurrentTransactionStartTime(); @@ -650,7 +650,7 @@ intervalne(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11 - t10) != (t21 - t20)); + return (t11 - t10) != (t21 - t20); } /* intervalne() */ /* @@ -666,7 +666,7 @@ intervallt(TimeInterval i1, TimeInterval i2) t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) - return (FALSE); /* invalid interval */ + return FALSE; /* invalid interval */ t10 = i1->data[0]; t11 = i1->data[1]; @@ -675,7 +675,7 @@ intervallt(TimeInterval i1, TimeInterval i2) if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) - return (FALSE); + return FALSE; if (t10 == CURRENT_ABSTIME) t10 = GetCurrentTransactionStartTime(); @@ -686,7 +686,7 @@ intervallt(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11 - t10) < (t21 - t20)); + return (t11 - t10) < (t21 - t20); } /* intervallt() */ /* @@ -702,7 +702,7 @@ intervalle(TimeInterval i1, TimeInterval i2) t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) - return (FALSE); /* invalid interval */ + return FALSE; /* invalid interval */ t10 = i1->data[0]; t11 = i1->data[1]; @@ -711,7 +711,7 @@ intervalle(TimeInterval i1, TimeInterval i2) if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) - return (FALSE); + return FALSE; if (t10 == CURRENT_ABSTIME) t10 = GetCurrentTransactionStartTime(); @@ -722,7 +722,7 @@ intervalle(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11 - t10) <= (t21 - t20)); + return (t11 - t10) <= (t21 - t20); } /* intervalle() */ /* @@ -738,7 +738,7 @@ intervalgt(TimeInterval i1, TimeInterval i2) t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) - return (FALSE); /* invalid interval */ + return FALSE; /* invalid interval */ t10 = i1->data[0]; t11 = i1->data[1]; @@ -747,7 +747,7 @@ intervalgt(TimeInterval i1, TimeInterval i2) if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) - return (FALSE); + return FALSE; if (t10 == CURRENT_ABSTIME) t10 = GetCurrentTransactionStartTime(); @@ -758,7 +758,7 @@ intervalgt(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11 - t10) > (t21 - t20)); + return (t11 - t10) > (t21 - t20); } /* intervalgt() */ /* @@ -774,7 +774,7 @@ intervalge(TimeInterval i1, TimeInterval i2) t21; if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) - return (FALSE); /* invalid interval */ + return FALSE; /* invalid interval */ t10 = i1->data[0]; t11 = i1->data[1]; @@ -783,7 +783,7 @@ intervalge(TimeInterval i1, TimeInterval i2) if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME)) - return (FALSE); + return FALSE; if (t10 == CURRENT_ABSTIME) t10 = GetCurrentTransactionStartTime(); @@ -794,7 +794,7 @@ intervalge(TimeInterval i1, TimeInterval i2) if (t21 == CURRENT_ABSTIME) t21 = GetCurrentTransactionStartTime(); - return ((t11 - t10) >= (t21 - t20)); + return (t11 - t10) >= (t21 - t20); } /* intervalge() */ @@ -808,9 +808,9 @@ intervalleneq(TimeInterval i, RelativeTime t) RelativeTime rt; if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) - return (0); + return 0; rt = intervalrel(i); - return (rt != INVALID_RELTIME && rt == t); + return rt != INVALID_RELTIME && rt == t; } /* @@ -823,9 +823,9 @@ intervallenne(TimeInterval i, RelativeTime t) RelativeTime rt; if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) - return (0); + return 0; rt = intervalrel(i); - return (rt != INVALID_RELTIME && rt != t); + return rt != INVALID_RELTIME && rt != t; } /* @@ -838,9 +838,9 @@ intervallenlt(TimeInterval i, RelativeTime t) RelativeTime rt; if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) - return (0); + return 0; rt = intervalrel(i); - return (rt != INVALID_RELTIME && rt < t); + return rt != INVALID_RELTIME && rt < t; } /* @@ -853,9 +853,9 @@ intervallengt(TimeInterval i, RelativeTime t) RelativeTime rt; if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) - return (0); + return 0; rt = intervalrel(i); - return (rt != INVALID_RELTIME && rt > t); + return rt != INVALID_RELTIME && rt > t; } /* @@ -868,9 +868,9 @@ intervallenle(TimeInterval i, RelativeTime t) RelativeTime rt; if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) - return (0); + return 0; rt = intervalrel(i); - return (rt != INVALID_RELTIME && rt <= t); + return rt != INVALID_RELTIME && rt <= t; } /* @@ -883,9 +883,9 @@ intervallenge(TimeInterval i, RelativeTime t) RelativeTime rt; if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) - return (0); + return 0; rt = intervalrel(i); - return (rt != INVALID_RELTIME && rt >= t); + return rt != INVALID_RELTIME && rt >= t; } /* @@ -895,7 +895,7 @@ bool intervalct(TimeInterval i1, TimeInterval i2) { if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) - return (0); + return 0; return (abstimele(i1->data[0], i2->data[0]) && abstimege(i1->data[1], i2->data[1])); } @@ -907,7 +907,7 @@ bool intervalov(TimeInterval i1, TimeInterval i2) { if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL) - return (0); + return 0; return (!(abstimelt(i1->data[1], i2->data[0]) || abstimegt(i1->data[0], i2->data[1]))); } @@ -920,7 +920,7 @@ intervalstart(TimeInterval i) { if (i->status == T_INTERVAL_INVAL) return INVALID_ABSTIME; - return (i->data[0]); + return i->data[0]; } /* @@ -931,7 +931,7 @@ intervalend(TimeInterval i) { if (i->status == T_INTERVAL_INVAL) return INVALID_ABSTIME; - return (i->data[1]); + return i->data[1]; } @@ -971,7 +971,7 @@ isreltime(char *str) switch (dtype) { case (DTK_DELTA): - return ((abs(tm->tm_year) <= 68) ? 1 : 0); + return (abs(tm->tm_year) <= 68) ? 1 : 0; break; case (DTK_INVALID): @@ -1024,14 +1024,14 @@ while ((c = *p) != '\0') /* Test whether 'invalid time' identifier or not */ if (!strncmp(INVALID_RELTIME_STR, p, strlen(INVALID_RELTIME_STR) + 1)) - return (2); /* correct 'invalid time' identifier found */ + return 2; /* correct 'invalid time' identifier found */ /* handle label of relative time */ if (c != RELTIME_LABEL) - return (0); /* syntax error */ + return 0; /* syntax error */ c = *++p; if (c != ' ') - return (0); /* syntax error */ + return 0; /* syntax error */ p++; /* handle the quantity */ *quantity = 0; @@ -1048,7 +1048,7 @@ for (;;) if (c == ' ') break; /* correct quantity found */ else - return (0); /* syntax error */ + return 0; /* syntax error */ } } @@ -1070,7 +1070,7 @@ for (;;) && correct_unit(unit, unitnr)) break; /* correct unit found */ else - return (0); /* syntax error */ + return 0; /* syntax error */ } } @@ -1102,11 +1102,11 @@ for (;;) break; /* correct direction found */ } else - return (0); /* syntax error */ + return 0; /* syntax error */ } } -return (1); +return 1; } /* @@ -1117,7 +1117,7 @@ return (1); * (see function isreltime()) */ static int -correct_unit(char unit[], int *unptr) +correct_unit(char *unit, int *unptr) { int j = 0; @@ -1126,11 +1126,11 @@ correct_unit(char unit[], int *unptr) if (strncmp(unit, unit_tab[j], strlen(unit_tab[j])) == 0) { *unptr = j; - return (1); + return 1; } j++; } - return (0); /* invalid unit descriptor */ + return 0; /* invalid unit descriptor */ } /* @@ -1141,16 +1141,16 @@ correct_unit(char unit[], int *unptr) * else to 1 */ static int -correct_dir(char direction[], int *signptr) +correct_dir(char *direction, int *signptr) { *signptr = 1; if (strncmp(RELTIME_PAST, direction, strlen(RELTIME_PAST) + 1) == 0) { *signptr = -1; - return (1); + return 1; } else - return (0); /* invalid direction descriptor */ + return 0; /* invalid direction descriptor */ } #endif @@ -1188,7 +1188,7 @@ istinterval(char *i_string, if (IsSpace(c)) p++; else if (c != '[') - return (0); /* syntax error */ + return 0; /* syntax error */ else break; } @@ -1199,13 +1199,13 @@ istinterval(char *i_string, if (IsSpace(c)) p++; else if (c != '"') - return (0); /* syntax error */ + return 0; /* syntax error */ else break; } p++; if (strncmp(INVALID_INTERVAL_STR, p, strlen(INVALID_INTERVAL_STR)) == 0) - return (0); /* undefined range, handled like a syntax + return 0; /* undefined range, handled like a syntax * err. */ /* search for the end of the first date and change it to a NULL */ p1 = p; @@ -1229,7 +1229,7 @@ istinterval(char *i_string, if (IsSpace(c)) p++; else if (c != '"') - return (0); /* syntax error */ + return 0; /* syntax error */ else break; } @@ -1256,16 +1256,16 @@ istinterval(char *i_string, if (IsSpace(c)) p++; else if (c != ']') - return (0); /* syntax error */ + return 0; /* syntax error */ else break; } p++; c = *p; if (c != '\0') - return (0); /* syntax error */ + return 0; /* syntax error */ /* it seems to be a valid interval */ - return (1); + return 1; } diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index beb0e719dd..9b612ea4cf 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.24 1998/08/19 02:02:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.25 1998/09/01 03:25:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -109,7 +109,7 @@ date_in(char *str) date = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(2000, 1, 1)); - return (date); + return date; } /* date_in() */ /* date_out() @@ -132,43 +132,43 @@ date_out(DateADT date) strcpy(result, buf); - return (result); + return result; } /* date_out() */ bool date_eq(DateADT dateVal1, DateADT dateVal2) { - return (dateVal1 == dateVal2); + return dateVal1 == dateVal2; } bool date_ne(DateADT dateVal1, DateADT dateVal2) { - return (dateVal1 != dateVal2); + return dateVal1 != dateVal2; } bool date_lt(DateADT dateVal1, DateADT dateVal2) { - return (dateVal1 < dateVal2); + return dateVal1 < dateVal2; } /* date_lt() */ bool date_le(DateADT dateVal1, DateADT dateVal2) { - return (dateVal1 <= dateVal2); + return dateVal1 <= dateVal2; } /* date_le() */ bool date_gt(DateADT dateVal1, DateADT dateVal2) { - return (dateVal1 > dateVal2); + return dateVal1 > dateVal2; } /* date_gt() */ bool date_ge(DateADT dateVal1, DateADT dateVal2) { - return (dateVal1 >= dateVal2); + return dateVal1 >= dateVal2; } /* date_ge() */ int @@ -184,13 +184,13 @@ date_cmp(DateADT dateVal1, DateADT dateVal2) DateADT date_larger(DateADT dateVal1, DateADT dateVal2) { - return (date_gt(dateVal1, dateVal2) ? dateVal1 : dateVal2); + return date_gt(dateVal1, dateVal2) ? dateVal1 : dateVal2; } /* date_larger() */ DateADT date_smaller(DateADT dateVal1, DateADT dateVal2) { - return (date_lt(dateVal1, dateVal2) ? dateVal1 : dateVal2); + return date_lt(dateVal1, dateVal2) ? dateVal1 : dateVal2; } /* date_smaller() */ /* Compute difference between two dates in days. @@ -198,7 +198,7 @@ date_smaller(DateADT dateVal1, DateADT dateVal2) int4 date_mi(DateADT dateVal1, DateADT dateVal2) { - return (dateVal1 - dateVal2); + return dateVal1 - dateVal2; } /* date_mi() */ /* Add a number of days to a date, giving a new date. @@ -207,7 +207,7 @@ date_mi(DateADT dateVal1, DateADT dateVal2) DateADT date_pli(DateADT dateVal, int4 days) { - return (dateVal + days); + return dateVal + days; } /* date_pli() */ /* Subtract a number of days from a date, giving a new date. @@ -215,7 +215,7 @@ date_pli(DateADT dateVal, int4 days) DateADT date_mii(DateADT dateVal, int4 days) { - return (date_pli(dateVal, -days)); + return date_pli(dateVal, -days); } /* date_mii() */ @@ -245,7 +245,7 @@ date_datetime(DateADT dateVal) if (tm2datetime(tm, fsec, &tz, result) != 0) elog(ERROR, "Datetime out of range", NULL); - return (result); + return result; } /* date_datetime() */ @@ -286,7 +286,7 @@ datetime_date(DateTime *datetime) result = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(2000, 1, 1)); - return (result); + return result; } /* datetime_date() */ @@ -328,7 +328,7 @@ abstime_date(AbsoluteTime abstime) break; } - return (result); + return result; } /* abstime_date() */ @@ -453,7 +453,7 @@ time_in(char *str) *time = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec); - return (time); + return time; } /* time_in() */ @@ -482,7 +482,7 @@ time_out(TimeADT *time) strcpy(result, buf); - return (result); + return result; } /* time_out() */ @@ -490,60 +490,60 @@ bool time_eq(TimeADT *time1, TimeADT *time2) { if (!PointerIsValid(time1) || !PointerIsValid(time2)) - return (FALSE); + return FALSE; - return (*time1 == *time2); + return *time1 == *time2; } /* time_eq() */ bool time_ne(TimeADT *time1, TimeADT *time2) { if (!PointerIsValid(time1) || !PointerIsValid(time2)) - return (FALSE); + return FALSE; - return (*time1 != *time2); + return *time1 != *time2; } /* time_eq() */ bool time_lt(TimeADT *time1, TimeADT *time2) { if (!PointerIsValid(time1) || !PointerIsValid(time2)) - return (FALSE); + return FALSE; - return (*time1 < *time2); + return *time1 < *time2; } /* time_eq() */ bool time_le(TimeADT *time1, TimeADT *time2) { if (!PointerIsValid(time1) || !PointerIsValid(time2)) - return (FALSE); + return FALSE; - return (*time1 <= *time2); + return *time1 <= *time2; } /* time_eq() */ bool time_gt(TimeADT *time1, TimeADT *time2) { if (!PointerIsValid(time1) || !PointerIsValid(time2)) - return (FALSE); + return FALSE; - return (*time1 > *time2); + return *time1 > *time2; } /* time_eq() */ bool time_ge(TimeADT *time1, TimeADT *time2) { if (!PointerIsValid(time1) || !PointerIsValid(time2)) - return (FALSE); + return FALSE; - return (*time1 >= *time2); + return *time1 >= *time2; } /* time_eq() */ int time_cmp(TimeADT *time1, TimeADT *time2) { - return ((*time1 < *time2) ? -1 : (((*time1 > *time2) ? 1 : 0))); + return (*time1 < *time2) ? -1 : (((*time1 > *time2) ? 1 : 0)); } /* time_cmp() */ @@ -586,7 +586,7 @@ datetime_time(DateTime *datetime) *result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec); - return (result); + return result; } /* datetime_time() */ @@ -609,12 +609,12 @@ datetime_datetime(DateADT date, TimeADT *time) *result += *time; } - return (result); + return result; } /* datetime_datetime() */ int32 /* RelativeTime */ int4reltime(int32 timevalue) { - return (timevalue); + return timevalue; } diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c index c3c93d5eca..5b8fad492b 100644 --- a/src/backend/utils/adt/datum.c +++ b/src/backend/utils/adt/datum.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.10 1998/06/15 19:29:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.11 1998/09/01 03:25:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -91,7 +91,7 @@ datumGetSize(Datum value, Oid type, bool byVal, Size len) } } - return (size); + return size; } /*------------------------------------------------------------------------- @@ -118,7 +118,7 @@ datumCopy(Datum value, Oid type, bool byVal, Size len) else { if (value == 0) - return ((Datum) NULL); + return (Datum) NULL; realSize = datumGetSize(value, type, byVal, len); /* @@ -131,7 +131,7 @@ datumCopy(Datum value, Oid type, bool byVal, Size len) memmove(s, DatumGetPointer(value), realSize); res = (Datum) s; } - return (res); + return res; } /*------------------------------------------------------------------------- @@ -196,9 +196,9 @@ datumIsEqual(Datum value1, Datum value2, Oid type, bool byVal, Size len) * are aligned inside the "Datum". */ if (value1 == value2) - return (true); + return true; else - return (false); + return false; } else { @@ -210,12 +210,12 @@ datumIsEqual(Datum value1, Datum value2, Oid type, bool byVal, Size len) size1 = datumGetSize(value1, type, byVal, len); size2 = datumGetSize(value2, type, byVal, len); if (size1 != size2) - return (false); + return false; s1 = (char *) DatumGetPointer(value1); s2 = (char *) DatumGetPointer(value2); if (!memcmp(s1, s2, size1)) - return (true); + return true; else - return (false); + return false; } } diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c index 89f92e2e0f..fa6854fdc9 100644 --- a/src/backend/utils/adt/dt.c +++ b/src/backend/utils/adt/dt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.55 1998/06/15 19:29:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.56 1998/09/01 03:25:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -157,7 +157,7 @@ datetime_in(char *str) elog(ERROR, "Internal coding error, can't input datetime '%s'", str); } - return (result); + return result; } /* datetime_in() */ /* datetime_out() @@ -175,7 +175,7 @@ datetime_out(DateTime *dt) char buf[MAXDATELEN + 1]; if (!PointerIsValid(dt)) - return (NULL); + return NULL; if (DATETIME_IS_RESERVED(*dt)) { @@ -194,7 +194,7 @@ datetime_out(DateTime *dt) strcpy(result, buf); - return (result); + return result; } /* datetime_out() */ @@ -251,7 +251,7 @@ timespan_in(char *str) elog(ERROR, "Internal coding error, can't input timespan '%s'", str); } - return (span); + return span; } /* timespan_in() */ /* timespan_out() @@ -268,10 +268,10 @@ timespan_out(TimeSpan *span) char buf[MAXDATELEN + 1]; if (!PointerIsValid(span)) - return (NULL); + return NULL; if (timespan2tm(*span, tm, &fsec) != 0) - return (NULL); + return NULL; if (EncodeTimeSpan(tm, fsec, DateStyle, buf) != 0) elog(ERROR, "Unable to format timespan", NULL); @@ -279,7 +279,7 @@ timespan_out(TimeSpan *span) result = palloc(strlen(buf) + 1); strcpy(result, buf); - return (result); + return result; } /* timespan_out() */ @@ -294,7 +294,7 @@ datetime_finite(DateTime *datetime) if (!PointerIsValid(datetime)) return FALSE; - return (!DATETIME_NOT_FINITE(*datetime)); + return !DATETIME_NOT_FINITE(*datetime); } /* datetime_finite() */ bool @@ -303,7 +303,7 @@ timespan_finite(TimeSpan *timespan) if (!PointerIsValid(timespan)) return FALSE; - return (!TIMESPAN_NOT_FINITE(*timespan)); + return !TIMESPAN_NOT_FINITE(*timespan); } /* timespan_finite() */ @@ -362,7 +362,7 @@ SetDateTime(DateTime dt) #endif } - return (dt); + return dt; } /* SetDateTime() */ /* datetime_relop - is datetime1 relop datetime2 @@ -387,7 +387,7 @@ datetime_eq(DateTime *datetime1, DateTime *datetime2) if (DATETIME_IS_RELATIVE(dt2)) dt2 = SetDateTime(dt2); - return (dt1 == dt2); + return dt1 == dt2; } /* datetime_eq() */ bool @@ -410,7 +410,7 @@ datetime_ne(DateTime *datetime1, DateTime *datetime2) if (DATETIME_IS_RELATIVE(dt2)) dt2 = SetDateTime(dt2); - return (dt1 != dt2); + return dt1 != dt2; } /* datetime_ne() */ bool @@ -433,7 +433,7 @@ datetime_lt(DateTime *datetime1, DateTime *datetime2) if (DATETIME_IS_RELATIVE(dt2)) dt2 = SetDateTime(dt2); - return (dt1 < dt2); + return dt1 < dt2; } /* datetime_lt() */ bool @@ -459,7 +459,7 @@ datetime_gt(DateTime *datetime1, DateTime *datetime2) #ifdef DATEDEBUG printf("datetime_gt- %f %s greater than %f\n", dt1, ((dt1 > dt2) ? "is" : "is not"), dt2); #endif - return (dt1 > dt2); + return dt1 > dt2; } /* datetime_gt() */ bool @@ -482,7 +482,7 @@ datetime_le(DateTime *datetime1, DateTime *datetime2) if (DATETIME_IS_RELATIVE(dt2)) dt2 = SetDateTime(dt2); - return (dt1 <= dt2); + return dt1 <= dt2; } /* datetime_le() */ bool @@ -505,7 +505,7 @@ datetime_ge(DateTime *datetime1, DateTime *datetime2) if (DATETIME_IS_RELATIVE(dt2)) dt2 = SetDateTime(dt2); - return (dt1 >= dt2); + return dt1 >= dt2; } /* datetime_ge() */ @@ -526,12 +526,12 @@ datetime_cmp(DateTime *datetime1, DateTime *datetime2) if (DATETIME_IS_INVALID(dt1)) { - return ((DATETIME_IS_INVALID(dt2) ? 0 : 1)); + return (DATETIME_IS_INVALID(dt2) ? 0 : 1); } else if (DATETIME_IS_INVALID(dt2)) { - return (-1); + return -1; } else @@ -542,7 +542,7 @@ datetime_cmp(DateTime *datetime1, DateTime *datetime2) dt2 = SetDateTime(dt2); } - return (((dt1 < dt2) ? -1 : ((dt1 > dt2) ? 1 : 0))); + return ((dt1 < dt2) ? -1 : ((dt1 > dt2) ? 1 : 0)); } /* datetime_cmp() */ @@ -593,7 +593,7 @@ timespan_lt(TimeSpan *timespan1, TimeSpan *timespan2) if (timespan2->month != 0) span2 += (timespan2->month * (30.0 * 86400)); - return (span1 < span2); + return span1 < span2; } /* timespan_lt() */ bool @@ -615,7 +615,7 @@ timespan_gt(TimeSpan *timespan1, TimeSpan *timespan2) if (timespan2->month != 0) span2 += (timespan2->month * (30.0 * 86400)); - return (span1 > span2); + return span1 > span2; } /* timespan_gt() */ bool @@ -637,7 +637,7 @@ timespan_le(TimeSpan *timespan1, TimeSpan *timespan2) if (timespan2->month != 0) span2 += (timespan2->month * (30.0 * 86400)); - return (span1 <= span2); + return span1 <= span2; } /* timespan_le() */ bool @@ -659,7 +659,7 @@ timespan_ge(TimeSpan *timespan1, TimeSpan *timespan2) if (timespan2->month != 0) span2 += (timespan2->month * (30.0 * 86400)); - return (span1 >= span2); + return span1 >= span2; } /* timespan_ge() */ @@ -676,11 +676,11 @@ timespan_cmp(TimeSpan *timespan1, TimeSpan *timespan2) if (TIMESPAN_IS_INVALID(*timespan1)) { - return (TIMESPAN_IS_INVALID(*timespan2) ? 0 : 1); + return TIMESPAN_IS_INVALID(*timespan2) ? 0 : 1; } else if (TIMESPAN_IS_INVALID(*timespan2)) - return (-1); + return -1; span1 = timespan1->time; if (timespan1->month != 0) @@ -689,7 +689,7 @@ timespan_cmp(TimeSpan *timespan1, TimeSpan *timespan2) if (timespan2->month != 0) span2 += (timespan2->month * (30.0 * 86400)); - return ((span1 < span2) ? -1 : (span1 > span2) ? 1 : 0); + return (span1 < span2) ? -1 : (span1 > span2) ? 1 : 0; } /* timespan_cmp() */ @@ -729,7 +729,7 @@ datetime_smaller(DateTime *datetime1, DateTime *datetime2) else *result = ((dt2 < dt1) ? dt2 : dt1); - return (result); + return result; } /* datetime_smaller() */ DateTime * @@ -760,7 +760,7 @@ datetime_larger(DateTime *datetime1, DateTime *datetime2) else *result = ((dt2 > dt1) ? dt2 : dt1); - return (result); + return result; } /* datetime_larger() */ @@ -799,7 +799,7 @@ datetime_mi(DateTime *datetime1, DateTime *datetime2) result->time = JROUND(dt1 - dt2); result->month = 0; - return (result); + return result; } /* datetime_mi() */ @@ -896,7 +896,7 @@ datetime_pl_span(DateTime *datetime, TimeSpan *span) *result = dt; } - return (result); + return result; } /* datetime_pl_span() */ DateTime * @@ -913,7 +913,7 @@ datetime_mi_span(DateTime *datetime, TimeSpan *span) result = datetime_pl_span(datetime, &tspan); - return (result); + return result; } /* datetime_mi_span() */ @@ -930,7 +930,7 @@ timespan_um(TimeSpan *timespan) result->time = -(timespan->time); result->month = -(timespan->month); - return (result); + return result; } /* timespan_um() */ @@ -986,7 +986,7 @@ timespan_smaller(TimeSpan *timespan1, TimeSpan *timespan2) } } - return (result); + return result; } /* timespan_smaller() */ TimeSpan * @@ -1041,7 +1041,7 @@ timespan_larger(TimeSpan *timespan1, TimeSpan *timespan2) } } - return (result); + return result; } /* timespan_larger() */ @@ -1058,7 +1058,7 @@ timespan_pl(TimeSpan *span1, TimeSpan *span2) result->month = (span1->month + span2->month); result->time = JROUND(span1->time + span2->time); - return (result); + return result; } /* timespan_pl() */ TimeSpan * @@ -1074,7 +1074,7 @@ timespan_mi(TimeSpan *span1, TimeSpan *span2) result->month = (span1->month - span2->month); result->time = JROUND(span1->time - span2->time); - return (result); + return result; } /* timespan_mi() */ TimeSpan * @@ -1094,7 +1094,7 @@ timespan_div(TimeSpan *span1, float8 *arg2) result->month = rint(span1->month / *arg2); result->time = JROUND(span1->time / *arg2); - return (result); + return result; } /* timespan_div() */ /* datetime_age() @@ -1223,7 +1223,7 @@ datetime_age(DateTime *datetime1, DateTime *datetime2) else elog(ERROR, "Unable to decode datetime", NULL); - return (result); + return result; } /* datetime_age() */ @@ -1259,7 +1259,7 @@ datetime_text(DateTime *datetime) pfree(str); - return (result); + return result; } /* datetime_text() */ @@ -1288,7 +1288,7 @@ text_datetime(text *str) result = datetime_in(dstr); - return (result); + return result; } /* text_datetime() */ @@ -1319,7 +1319,7 @@ timespan_text(TimeSpan *timespan) pfree(str); - return (result); + return result; } /* timespan_text() */ @@ -1348,7 +1348,7 @@ text_timespan(text *str) result = timespan_in(dstr); - return (result); + return result; } /* text_timespan() */ /* datetime_trunc() @@ -1490,7 +1490,7 @@ datetime_trunc(text *units, DateTime *datetime) } } - return (result); + return result; } /* datetime_trunc() */ /* timespan_trunc() @@ -1609,7 +1609,7 @@ timespan_trunc(text *units, TimeSpan *timespan) result = NULL; } - return (result); + return result; } /* timespan_trunc() */ @@ -1778,7 +1778,7 @@ datetime_part(text *units, DateTime *datetime) } } - return (result); + return result; } /* datetime_part() */ @@ -1913,7 +1913,7 @@ timespan_part(text *units, TimeSpan *timespan) *result = 0; } - return (result); + return result; } /* timespan_part() */ @@ -2003,7 +2003,7 @@ datetime_zone(text *zone, DateTime *datetime) result = NULL; } - return (result); + return result; } /* datetime_zone() */ @@ -2339,7 +2339,7 @@ j2day(int date) day = (date + 1) % 7; - return (day); + return day; } /* j2day() */ @@ -2513,7 +2513,7 @@ tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *result) /* Julian day routines are not correct for negative Julian days */ if (!IS_VALID_JULIAN(tm->tm_year, tm->tm_mon, tm->tm_mday)) - return (-1); + return -1; date = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(2000, 1, 1); time = time2t(tm->tm_hour, tm->tm_min, (tm->tm_sec + fsec)); @@ -2590,13 +2590,13 @@ dt2local(DateTime dt, int tz) { dt -= tz; dt = JROUND(dt); - return (dt); + return dt; } /* dt2local() */ double time2t(const int hour, const int min, const double sec) { - return ((((hour * 60) + min) * 60) + sec); + return (((hour * 60) + min) * 60) + sec; } /* time2t() */ static void @@ -2627,7 +2627,7 @@ dt2time(DateTime jd, int *hour, int *min, double *sec) */ int ParseDateTime(char *timestr, char *lowstr, - char *field[], int ftype[], int maxfields, int *numfields) + char **field, int *ftype, int maxfields, int *numfields) { int nf = 0; char *cp = timestr; @@ -2776,7 +2776,7 @@ ParseDateTime(char *timestr, char *lowstr, * then assume GMT time zone. - tgl 97/05/27 */ int -DecodeDateTime(char *field[], int ftype[], int nf, +DecodeDateTime(char **field, int *ftype, int nf, int *dtype, struct tm * tm, double *fsec, int *tzp) { int fmask = 0, @@ -3010,7 +3010,7 @@ DecodeDateTime(char *field[], int ftype[], int nf, #endif if ((*dtype == DTK_DATE) && ((fmask & DTK_DATE_M) != DTK_DATE_M)) - return (((fmask & DTK_TIME_M) == DTK_TIME_M) ? 1 : -1); + return ((fmask & DTK_TIME_M) == DTK_TIME_M) ? 1 : -1; /* timezone not specified? then find local timezone if possible */ if ((*dtype == DTK_DATE) && ((fmask & DTK_DATE_M) == DTK_DATE_M) @@ -3060,7 +3060,7 @@ DecodeDateTime(char *field[], int ftype[], int nf, * Interpret parsed string as time fields only. */ int -DecodeTimeOnly(char *field[], int ftype[], int nf, int *dtype, struct tm * tm, double *fsec) +DecodeTimeOnly(char **field, int *ftype, int nf, int *dtype, struct tm * tm, double *fsec) { int fmask, tmask, @@ -3584,7 +3584,7 @@ DecodeTimezone(char *str, int *tzp) tz = -tz; *tzp = -tz; - return (*cp != '\0'); + return *cp != '\0'; } /* DecodeTimezone() */ @@ -3633,7 +3633,7 @@ DecodeSpecial(int field, char *lowtoken, int *val) } } - return (type); + return type; } /* DecodeSpecial() */ @@ -3648,7 +3648,7 @@ DecodeSpecial(int field, char *lowtoken, int *val) * preceeding an hh:mm:ss field. - thomas 1998-04-30 */ int -DecodeDateDelta(char *field[], int ftype[], int nf, int *dtype, struct tm * tm, double *fsec) +DecodeDateDelta(char **field, int *ftype, int nf, int *dtype, struct tm * tm, double *fsec) { int is_before = FALSE; @@ -3867,7 +3867,7 @@ DecodeDateDelta(char *field[], int ftype[], int nf, int *dtype, struct tm * tm, #endif /* ensure that at least one time field has been found */ - return ((fmask != 0) ? 0 : -1); + return (fmask != 0) ? 0 : -1; } /* DecodeDateDelta() */ @@ -3907,7 +3907,7 @@ DecodeUnits(int field, char *lowtoken, int *val) *val = tp->value; } - return (type); + return type; } /* DecodeUnits() */ @@ -3981,10 +3981,10 @@ EncodeSpecialDateTime(DateTime dt, char *str) #endif strcpy(str, INVALID); } - return (TRUE); + return TRUE; } - return (FALSE); + return FALSE; } /* EncodeSpecialDateTime() */ @@ -4048,7 +4048,7 @@ EncodeDateOnly(struct tm * tm, int style, char *str) printf("EncodeDateOnly- date result is %s\n", str); #endif - return (TRUE); + return TRUE; } /* EncodeDateOnly() */ @@ -4072,7 +4072,7 @@ EncodeTimeOnly(struct tm * tm, double fsec, int style, char *str) printf("EncodeTimeOnly- time result is %s\n", str); #endif - return (TRUE); + return TRUE; } /* EncodeTimeOnly() */ @@ -4249,7 +4249,7 @@ EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, cha printf("EncodeDateTime- date result is %s\n", str); #endif - return (TRUE); + return TRUE; } /* EncodeDateTime() */ @@ -4420,7 +4420,7 @@ datetime_is_epoch(double j) u.c[0] = 0x80; /* sign bit */ u.c[1] = 0x10; /* DBL_MIN */ - return (j == u.epoch); + return j == u.epoch; } int datetime_is_current(double j) @@ -4433,7 +4433,7 @@ datetime_is_current(double j) u.c[1] = 0x10; /* DBL_MIN */ - return (j == u.current); + return j == u.current; } #endif diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c index b1fc58f9fb..3f40ece5e5 100644 --- a/src/backend/utils/adt/filename.c +++ b/src/backend/utils/adt/filename.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.15 1998/06/15 19:29:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.16 1998/09/01 03:25:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -116,7 +116,7 @@ filename_in(char *file) else ind = 0; strcat(str, file + ind); - return (str); + return str; } char * @@ -125,9 +125,9 @@ filename_out(char *s) char *ret; if (!s) - return ((char *) NULL); + return (char *) NULL; ret = (char *) palloc(strlen(s) + 1); if (!ret) elog(ERROR, "filename_out: palloc failed"); - return (strcpy(ret, s)); + return strcpy(ret, s); } diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index b5c79d304b..69cd1a4201 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.31 1998/04/27 14:43:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.32 1998/09/01 03:25:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -229,7 +229,7 @@ float4out(float32 num) return strcpy(ascii, "(null)"); sprintf(ascii, "%.*g", FLT_DIG, *num); - return (ascii); + return ascii; } @@ -254,7 +254,7 @@ float8in(char *num) CheckFloat8Val(val); *result = val; - return (result); + return result; } @@ -276,7 +276,7 @@ float8out(float64 num) return strcpy(ascii, "Infinity"); sprintf(ascii, "%.*g", DBL_DIG, *num); - return (ascii); + return ascii; } /* ========== PUBLIC ROUTINES ========== */ @@ -306,7 +306,7 @@ float4abs(float32 arg1) result = (float32) palloc(sizeof(float32data)); *result = val; - return (result); + return result; } /* @@ -326,7 +326,7 @@ float4um(float32 arg1) result = (float32) palloc(sizeof(float32data)); *result = val; - return (result); + return result; } float32 @@ -380,7 +380,7 @@ float8abs(float64 arg1) val = fabs(*arg1); CheckFloat8Val(val); *result = val; - return (result); + return result; } @@ -401,7 +401,7 @@ float8um(float64 arg1) CheckFloat8Val(val); result = (float64) palloc(sizeof(float64data)); *result = val; - return (result); + return result; } float64 @@ -461,7 +461,7 @@ float4pl(float32 arg1, float32 arg2) result = (float32) palloc(sizeof(float32data)); *result = val; - return (result); + return result; } float32 @@ -478,7 +478,7 @@ float4mi(float32 arg1, float32 arg2) CheckFloat4Val(val); result = (float32) palloc(sizeof(float32data)); *result = val; - return (result); + return result; } float32 @@ -495,7 +495,7 @@ float4mul(float32 arg1, float32 arg2) CheckFloat4Val(val); result = (float32) palloc(sizeof(float32data)); *result = val; - return (result); + return result; } float32 @@ -515,7 +515,7 @@ float4div(float32 arg1, float32 arg2) CheckFloat4Val(val); result = (float32) palloc(sizeof(float32data)); *result = *arg1 / *arg2; - return (result); + return result; } float32 @@ -553,7 +553,7 @@ float8pl(float64 arg1, float64 arg2) val = *arg1 + *arg2; CheckFloat8Val(val); *result = val; - return (result); + return result; } float64 @@ -570,7 +570,7 @@ float8mi(float64 arg1, float64 arg2) val = *arg1 - *arg2; CheckFloat8Val(val); *result = val; - return (result); + return result; } float64 @@ -587,7 +587,7 @@ float8mul(float64 arg1, float64 arg2) val = *arg1 * *arg2; CheckFloat8Val(val); *result = val; - return (result); + return result; } float64 @@ -607,7 +607,7 @@ float8div(float64 arg1, float64 arg2) val = *arg1 / *arg2; CheckFloat8Val(val); *result = val; - return (result); + return result; } float64 @@ -621,7 +621,7 @@ float8inc(float64 arg1) val = *arg1 + (float64data) 1.0; CheckFloat8Val(val); *arg1 = val; - return (arg1); + return arg1; } @@ -640,7 +640,7 @@ float4eq(float32 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 == *arg2); + return *arg1 == *arg2; } bool @@ -649,7 +649,7 @@ float4ne(float32 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 != *arg2); + return *arg1 != *arg2; } bool @@ -658,7 +658,7 @@ float4lt(float32 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 < *arg2); + return *arg1 < *arg2; } bool @@ -667,7 +667,7 @@ float4le(float32 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 <= *arg2); + return *arg1 <= *arg2; } bool @@ -676,7 +676,7 @@ float4gt(float32 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 > *arg2); + return *arg1 > *arg2; } bool @@ -685,7 +685,7 @@ float4ge(float32 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 >= *arg2); + return *arg1 >= *arg2; } /* @@ -697,7 +697,7 @@ float8eq(float64 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 == *arg2); + return *arg1 == *arg2; } bool @@ -706,7 +706,7 @@ float8ne(float64 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 != *arg2); + return *arg1 != *arg2; } bool @@ -715,7 +715,7 @@ float8lt(float64 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 < *arg2); + return *arg1 < *arg2; } bool @@ -724,7 +724,7 @@ float8le(float64 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 <= *arg2); + return *arg1 <= *arg2; } bool @@ -733,7 +733,7 @@ float8gt(float64 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 > *arg2); + return *arg1 > *arg2; } bool @@ -742,7 +742,7 @@ float8ge(float64 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 >= *arg2); + return *arg1 >= *arg2; } @@ -766,7 +766,7 @@ ftod(float32 num) result = (float64) palloc(sizeof(float64data)); *result = *num; - return (result); + return result; } @@ -786,7 +786,7 @@ dtof(float64 num) result = (float32) palloc(sizeof(float32data)); *result = *num; - return (result); + return result; } @@ -805,7 +805,7 @@ dtoi4(float64 num) elog(ERROR, "dtoi4: integer out of range", NULL); result = rint(*num); - return (result); + return result; } @@ -824,7 +824,7 @@ dtoi2(float64 num) elog(ERROR, "dtoi2: integer out of range", NULL); result = rint(*num); - return (result); + return result; } @@ -839,7 +839,7 @@ i4tod(int32 num) result = (float64) palloc(sizeof(float64data)); *result = num; - return (result); + return result; } @@ -854,7 +854,7 @@ i2tod(int16 num) result = (float64) palloc(sizeof(float64data)); *result = num; - return (result); + return result; } @@ -873,7 +873,7 @@ ftoi4(float32 num) elog(ERROR, "ftoi4: integer out of range", NULL); result = rint(*num); - return (result); + return result; } @@ -892,7 +892,7 @@ ftoi2(float32 num) elog(ERROR, "ftoi2: integer out of range", NULL); result = rint(*num); - return (result); + return result; } @@ -907,7 +907,7 @@ i4tof(int32 num) result = (float32) palloc(sizeof(float32data)); *result = num; - return (result); + return result; } @@ -922,7 +922,7 @@ i2tof(int16 num) result = (float32) palloc(sizeof(float32data)); *result = num; - return (result); + return result; } @@ -948,7 +948,7 @@ dround(float64 arg1) tmp = *arg1; *result = (float64data) rint(tmp); - return (result); + return result; } @@ -975,7 +975,7 @@ dtrunc(float64 arg1) *result = (float64data) floor(tmp); else *result = (float64data) -(floor(-tmp)); - return (result); + return result; } @@ -995,7 +995,7 @@ dsqrt(float64 arg1) tmp = *arg1; *result = (float64data) sqrt(tmp); - return (result); + return result; } @@ -1015,7 +1015,7 @@ dcbrt(float64 arg1) tmp = *arg1; *result = (float64data) cbrt(tmp); - return (result); + return result; } @@ -1048,7 +1048,7 @@ dpow(float64 arg1, float64 arg2) elog(ERROR, "pow() result is out of range"); CheckFloat8Val(*result); - return (result); + return result; } @@ -1079,7 +1079,7 @@ dexp(float64 arg1) elog(ERROR, "exp() result is out of range"); CheckFloat8Val(*result); - return (result); + return result; } @@ -1106,7 +1106,7 @@ dlog1(float64 arg1) *result = (float64data) log(tmp); CheckFloat8Val(*result); - return (result); + return result; } @@ -1134,7 +1134,7 @@ float48pl(float32 arg1, float64 arg2) *result = *arg1 + *arg2; CheckFloat8Val(*result); - return (result); + return result; } float64 @@ -1149,7 +1149,7 @@ float48mi(float32 arg1, float64 arg2) *result = *arg1 - *arg2; CheckFloat8Val(*result); - return (result); + return result; } float64 @@ -1164,7 +1164,7 @@ float48mul(float32 arg1, float64 arg2) *result = *arg1 * *arg2; CheckFloat8Val(*result); - return (result); + return result; } float64 @@ -1182,7 +1182,7 @@ float48div(float32 arg1, float64 arg2) *result = *arg1 / *arg2; CheckFloat8Val(*result); - return (result); + return result; } /* @@ -1203,7 +1203,7 @@ float84pl(float64 arg1, float32 arg2) *result = *arg1 + *arg2; CheckFloat8Val(*result); - return (result); + return result; } float64 @@ -1218,7 +1218,7 @@ float84mi(float64 arg1, float32 arg2) *result = *arg1 - *arg2; CheckFloat8Val(*result); - return (result); + return result; } float64 @@ -1234,7 +1234,7 @@ float84mul(float64 arg1, float32 arg2) *result = *arg1 * *arg2; CheckFloat8Val(*result); - return (result); + return result; } float64 @@ -1252,7 +1252,7 @@ float84div(float64 arg1, float32 arg2) *result = *arg1 / *arg2; CheckFloat8Val(*result); - return (result); + return result; } /* @@ -1270,7 +1270,7 @@ float48eq(float32 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 == (float) *arg2); + return *arg1 == (float) *arg2; } bool @@ -1279,7 +1279,7 @@ float48ne(float32 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 != (float) *arg2); + return *arg1 != (float) *arg2; } bool @@ -1288,7 +1288,7 @@ float48lt(float32 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 < (float) *arg2); + return *arg1 < (float) *arg2; } bool @@ -1297,7 +1297,7 @@ float48le(float32 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 <= (float) *arg2); + return *arg1 <= (float) *arg2; } bool @@ -1306,7 +1306,7 @@ float48gt(float32 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 > (float) *arg2); + return *arg1 > (float) *arg2; } bool @@ -1315,7 +1315,7 @@ float48ge(float32 arg1, float64 arg2) if (!arg1 || !arg2) return 0; - return (*arg1 >= (float) *arg2); + return *arg1 >= (float) *arg2; } /* @@ -1327,7 +1327,7 @@ float84eq(float64 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return ((float) *arg1 == *arg2); + return (float) *arg1 == *arg2; } bool @@ -1336,7 +1336,7 @@ float84ne(float64 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return ((float) *arg1 != *arg2); + return (float) *arg1 != *arg2; } bool @@ -1345,7 +1345,7 @@ float84lt(float64 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return ((float) *arg1 < *arg2); + return (float) *arg1 < *arg2; } bool @@ -1354,7 +1354,7 @@ float84le(float64 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return ((float) *arg1 <= *arg2); + return (float) *arg1 <= *arg2; } bool @@ -1363,7 +1363,7 @@ float84gt(float64 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return ((float) *arg1 > *arg2); + return (float) *arg1 > *arg2; } bool @@ -1372,7 +1372,7 @@ float84ge(float64 arg1, float32 arg2) if (!arg1 || !arg2) return 0; - return ((float) *arg1 >= *arg2); + return (float) *arg1 >= *arg2; } /* ========== PRIVATE ROUTINES ========== */ @@ -1503,7 +1503,7 @@ double x; int isneg = (x < 0.0); double tmpres = pow(fabs(x), (double) 1.0 / (double) 3.0); - return (isneg ? -tmpres : tmpres); + return isneg ? -tmpres : tmpres; } #endif /* !HAVE_CBRT */ diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index 48d358b9c7..2775f6b5fc 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.35 1998/08/16 04:06:55 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.36 1998/09/01 03:26:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ * Internal routines */ -static int point_inside(Point *p, int npts, Point plist[]); +static int point_inside(Point *p, int npts, Point *plist); static int lseg_crossing(double x, double y, double px, double py); static BOX *box_construct(double x1, double x2, double y1, double y2); static BOX *box_copy(BOX *box); @@ -45,7 +45,7 @@ static LINE *line_construct_pm(Point *pt, double m); static double lseg_dt(LSEG *l1, LSEG *l2); static void make_bound_box(POLYGON *poly); static PATH *path_copy(PATH *path); -static bool plist_same(int npts, Point p1[], Point p2[]); +static bool plist_same(int npts, Point *p1, Point *p2); static Point *point_construct(double x, double y); static Point *point_copy(Point *pt); static int single_decode(char *str, float8 *x, char **ss); @@ -112,7 +112,7 @@ single_decode(char *str, float8 *x, char **s) char *cp; if (!PointerIsValid(str)) - return (FALSE); + return FALSE; while (isspace(*str)) str++; @@ -121,21 +121,21 @@ single_decode(char *str, float8 *x, char **s) fprintf(stderr, "single_decode- (%x) try decoding %s to %g\n", (cp - str), str, *x); #endif if (cp <= str) - return (FALSE); + return FALSE; while (isspace(*cp)) cp++; if (s != NULL) *s = cp; - return (TRUE); + return TRUE; } /* single_decode() */ static int single_encode(float8 x, char *str) { sprintf(str, "%.*g", digits8, x); - return (TRUE); + return TRUE; } /* single_encode() */ static int @@ -145,7 +145,7 @@ pair_decode(char *str, float8 *x, float8 *y, char **s) char *cp; if (!PointerIsValid(str)) - return (FALSE); + return FALSE; while (isspace(*str)) str++; @@ -156,22 +156,22 @@ pair_decode(char *str, float8 *x, float8 *y, char **s) str++; *x = strtod(str, &cp); if (cp <= str) - return (FALSE); + return FALSE; while (isspace(*cp)) cp++; if (*cp++ != DELIM) - return (FALSE); + return FALSE; while (isspace(*cp)) cp++; *y = strtod(cp, &str); if (str <= cp) - return (FALSE); + return FALSE; while (isspace(*str)) str++; if (has_delim) { if (*str != RDELIM) - return (FALSE); + return FALSE; str++; while (isspace(*str)) str++; @@ -179,14 +179,14 @@ pair_decode(char *str, float8 *x, float8 *y, char **s) if (s != NULL) *s = str; - return (TRUE); + return TRUE; } static int pair_encode(float8 x, float8 y, char *str) { sprintf(str, "%.*g,%.*g", digits8, x, digits8, y); - return (TRUE); + return TRUE; } static int @@ -204,7 +204,7 @@ path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p) { /* no open delimiter allowed? */ if (!opentype) - return (FALSE); + return FALSE; depth++; s++; while (isspace(*s)) @@ -221,7 +221,7 @@ path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p) #if FALSE /* nested delimiters with only one point? */ if (npts <= 1) - return (FALSE); + return FALSE; #endif depth++; s = cp; @@ -236,7 +236,7 @@ path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p) for (i = 0; i < npts; i++) { if (!pair_decode(s, &(p->x), &(p->y), &s)) - return (FALSE); + return FALSE; if (*s == DELIM) s++; @@ -254,11 +254,11 @@ path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p) s++; } else - return (FALSE); + return FALSE; } *ss = s; - return (TRUE); + return TRUE; } /* path_decode() */ static char * @@ -306,7 +306,7 @@ path_encode(bool closed, int npts, Point *pt) } *cp = '\0'; - return (result); + return result; } /* path_encode() */ /*------------------------------------------------------------- @@ -326,7 +326,7 @@ pair_count(char *s, char delim) ndelim++; s++; } - return ((ndelim % 2) ? ((ndelim + 1) / 2) : -1); + return (ndelim % 2) ? ((ndelim + 1) / 2) : -1; } /*********************************************************************** @@ -376,7 +376,7 @@ box_in(char *str) box->low.y = y; } - return (box); + return box; } /* box_in() */ /* box_out - convert a box to external form. @@ -385,9 +385,9 @@ char * box_out(BOX *box) { if (!PointerIsValid(box)) - return (NULL); + return NULL; - return (path_encode(-1, 2, (Point *) &(box->high))); + return path_encode(-1, 2, (Point *) &(box->high)); } /* box_out() */ @@ -398,7 +398,7 @@ box_construct(double x1, double x2, double y1, double y2) { BOX *result = palloc(sizeof(BOX)); - return (box_fill(result, x1, x2, y1, y2)); + return box_fill(result, x1, x2, y1, y2); } @@ -428,7 +428,7 @@ box_fill(BOX *result, double x1, double x2, double y1, double y2) result->low.y = y1; } - return (result); + return result; } @@ -441,7 +441,7 @@ box_copy(BOX *box) memmove((char *) result, (char *) box, sizeof(BOX)); - return (result); + return result; } @@ -479,7 +479,7 @@ box_overlap(BOX *box1, BOX *box2) bool box_overleft(BOX *box1, BOX *box2) { - return (FPle(box1->high.x, box2->high.x)); + return FPle(box1->high.x, box2->high.x); } /* box_left - is box1 strictly left of box2? @@ -487,7 +487,7 @@ box_overleft(BOX *box1, BOX *box2) bool box_left(BOX *box1, BOX *box2) { - return (FPlt(box1->high.x, box2->low.x)); + return FPlt(box1->high.x, box2->low.x); } /* box_right - is box1 strictly right of box2? @@ -495,7 +495,7 @@ box_left(BOX *box1, BOX *box2) bool box_right(BOX *box1, BOX *box2) { - return (FPgt(box1->low.x, box2->high.x)); + return FPgt(box1->low.x, box2->high.x); } /* box_overright - is the left edge of box1 to the right of @@ -507,7 +507,7 @@ box_right(BOX *box1, BOX *box2) bool box_overright(BOX *box1, BOX *box2) { - return (box1->low.x >= box2->low.x); + return box1->low.x >= box2->low.x; } /* box_contained - is box1 contained by box2? @@ -535,13 +535,13 @@ box_contain(BOX *box1, BOX *box2) bool box_below(BOX *box1, BOX *box2) { - return (FPle(box1->high.y, box2->low.y)); + return FPle(box1->high.y, box2->low.y); } bool box_above(BOX *box1, BOX *box2) { - return (FPge(box1->low.y, box2->high.y)); + return FPge(box1->low.y, box2->high.y); } @@ -551,31 +551,31 @@ box_above(BOX *box1, BOX *box2) bool box_lt(BOX *box1, BOX *box2) { - return (FPlt(box_ar(box1), box_ar(box2))); + return FPlt(box_ar(box1), box_ar(box2)); } bool box_gt(BOX *box1, BOX *box2) { - return (FPgt(box_ar(box1), box_ar(box2))); + return FPgt(box_ar(box1), box_ar(box2)); } bool box_eq(BOX *box1, BOX *box2) { - return (FPeq(box_ar(box1), box_ar(box2))); + return FPeq(box_ar(box1), box_ar(box2)); } bool box_le(BOX *box1, BOX *box2) { - return (FPle(box_ar(box1), box_ar(box2))); + return FPle(box_ar(box1), box_ar(box2)); } bool box_ge(BOX *box1, BOX *box2) { - return (FPge(box_ar(box1), box_ar(box2))); + return FPge(box_ar(box1), box_ar(box2)); } @@ -597,7 +597,7 @@ box_area(BOX *box) *result = box_wd(box) * box_ht(box); - return (result); + return result; } @@ -611,7 +611,7 @@ box_width(BOX *box) *result = box->high.x - box->low.x; - return (result); + return result; } /* box_width() */ @@ -625,7 +625,7 @@ box_height(BOX *box) *result = box->high.y - box->low.y; - return (result); + return result; } @@ -645,7 +645,7 @@ box_distance(BOX *box1, BOX *box2) pfree(a); pfree(b); - return (result); + return result; } @@ -659,7 +659,7 @@ box_center(BOX *box) result->x = (box->high.x + box->low.x) / 2.0; result->y = (box->high.y + box->low.y) / 2.0; - return (result); + return result; } @@ -668,7 +668,7 @@ box_center(BOX *box) static double box_ar(BOX *box) { - return (box_wd(box) * box_ht(box)); + return box_wd(box) * box_ht(box); } @@ -678,7 +678,7 @@ box_ar(BOX *box) static double box_wd(BOX *box) { - return (box->high.x - box->low.x); + return box->high.x - box->low.x; } @@ -688,7 +688,7 @@ box_wd(BOX *box) static double box_ht(BOX *box) { - return (box->high.y - box->low.y); + return box->high.y - box->low.y; } @@ -709,7 +709,7 @@ box_dt(BOX *box1, BOX *box2) pfree(a); pfree(b); - return (result); + return result; } #endif @@ -728,7 +728,7 @@ box_intersect(BOX *box1, BOX *box2) BOX *result; if (!box_overlap(box1, box2)) - return (NULL); + return NULL; result = palloc(sizeof(BOX)); @@ -737,7 +737,7 @@ box_intersect(BOX *box1, BOX *box2) result->high.y = Min(box1->high.y, box2->high.y); result->low.y = Max(box1->low.y, box2->low.y); - return (result); + return result; } @@ -756,7 +756,7 @@ box_diagonal(BOX *box) p1.y = box->high.y; p2.x = box->low.x; p2.y = box->low.y; - return (lseg_construct(&p1, &p2)); + return lseg_construct(&p1, &p2); } /*********************************************************************** @@ -793,7 +793,7 @@ line_in(char *str) line = NULL; #endif - return (line); + return line; } /* line_in() */ @@ -806,7 +806,7 @@ line_out(LINE *line) #endif if (!PointerIsValid(line)) - return (NULL); + return NULL; #ifdef ENABLE_LINE_TYPE if (FPzero(line->B)) @@ -851,13 +851,13 @@ line_out(LINE *line) { } - return (path_encode(TRUE, 2, (Point *) &(ls->p[0]))); + return path_encode(TRUE, 2, (Point *) &(ls->p[0])); #else elog(ERROR, "line not yet implemented"); result = NULL; #endif - return (result); + return result; } /* line_out() */ @@ -883,7 +883,7 @@ line_construct_pm(Point *pt, double m) result->m = m; #endif - return (result); + return result; } /* line_construct_pm() */ @@ -940,7 +940,7 @@ line_construct_pp(Point *pt1, Point *pt2) result->m = result->A; #endif } - return (result); + return result; } /* line_construct_pp() */ @@ -951,19 +951,19 @@ line_construct_pp(Point *pt1, Point *pt2) bool line_intersect(LINE *l1, LINE *l2) { - return (!line_parallel(l1, l2)); + return !line_parallel(l1, l2); } bool line_parallel(LINE *l1, LINE *l2) { #if FALSE - return (FPeq(l1->m, l2->m)); + return FPeq(l1->m, l2->m); #endif if (FPzero(l1->B)) - return (FPzero(l2->B)); + return FPzero(l2->B); - return (FPeq(l2->A, l1->A * (l2->B / l1->B))); + return FPeq(l2->A, l1->A * (l2->B / l1->B)); } /* line_parallel() */ bool @@ -971,34 +971,34 @@ line_perp(LINE *l1, LINE *l2) { #if FALSE if (l1->m) - return (FPeq(l2->m / l1->m, -1.0)); + return FPeq(l2->m / l1->m, -1.0); else if (l2->m) - return (FPeq(l1->m / l2->m, -1.0)); + return FPeq(l1->m / l2->m, -1.0); #endif if (FPzero(l1->A)) - return (FPzero(l2->B)); + return FPzero(l2->B); else if (FPzero(l1->B)) - return (FPzero(l2->A)); + return FPzero(l2->A); - return (FPeq(((l1->A * l2->B) / (l1->B * l2->A)), -1.0)); + return FPeq(((l1->A * l2->B) / (l1->B * l2->A)), -1.0); } /* line_perp() */ bool line_vertical(LINE *line) { #if FALSE - return (FPeq(line->A, -1.0) && FPzero(line->B)); + return FPeq(line->A, -1.0) && FPzero(line->B); #endif - return (FPzero(line->B)); + return FPzero(line->B); } /* line_vertical() */ bool line_horizontal(LINE *line) { #if FALSE - return (FPzero(line->m)); + return FPzero(line->m); #endif - return (FPzero(line->A)); + return FPzero(line->A); } /* line_horizontal() */ bool @@ -1037,7 +1037,7 @@ line_distance(LINE *l1, LINE *l2) if (line_intersect(l1, l2)) { *result = 0.0; - return (result); + return result; } if (line_vertical(l1)) *result = fabs(l1->C - l2->C); @@ -1047,7 +1047,7 @@ line_distance(LINE *l1, LINE *l2) result = dist_pl(tmp, l2); pfree(tmp); } - return (result); + return result; } /* line_interpt() @@ -1061,7 +1061,7 @@ line_interpt(LINE *l1, LINE *l2) y; if (line_parallel(l1, l2)) - return (NULL); + return NULL; #if FALSE if (line_vertical(l1)) result = point_construct(l2->m * l1->C + l2->C, l1->C); @@ -1110,7 +1110,7 @@ line_interpt(LINE *l1, LINE *l2) digits8, l1->A, digits8, l1->B, digits8, l1->C, digits8, l2->A, digits8, l2->B, digits8, l2->C); printf("line_interpt- lines intersect at (%.*g,%.*g)\n", digits8, x, digits8, y); #endif - return (result); + return result; } /* line_interpt() */ @@ -1176,7 +1176,7 @@ path_in(char *str) path->closed = (!isopen); - return (path); + return path; } /* path_in() */ @@ -1186,7 +1186,7 @@ path_out(PATH *path) if (!PointerIsValid(path)) return NULL; - return (path_encode(path->closed, path->npts, (Point *) &(path->p[0]))); + return path_encode(path->closed, path->npts, (Point *) &(path->p[0])); } /* path_out() */ @@ -1201,31 +1201,31 @@ path_out(PATH *path) bool path_n_lt(PATH *p1, PATH *p2) { - return ((p1->npts < p2->npts)); + return (p1->npts < p2->npts); } bool path_n_gt(PATH *p1, PATH *p2) { - return ((p1->npts > p2->npts)); + return (p1->npts > p2->npts); } bool path_n_eq(PATH *p1, PATH *p2) { - return ((p1->npts == p2->npts)); + return (p1->npts == p2->npts); } bool path_n_le(PATH *p1, PATH *p2) { - return ((p1->npts <= p2->npts)); + return (p1->npts <= p2->npts); } bool path_n_ge(PATH *p1, PATH *p2) { - return ((p1->npts >= p2->npts)); + return (p1->npts >= p2->npts); } @@ -1239,7 +1239,7 @@ path_isclosed(PATH *path) if (!PointerIsValid(path)) return FALSE; - return (path->closed); + return path->closed; } /* path_isclosed() */ bool @@ -1248,7 +1248,7 @@ path_isopen(PATH *path) if (!PointerIsValid(path)) return FALSE; - return (!path->closed); + return !path->closed; } /* path_isopen() */ @@ -1258,7 +1258,7 @@ path_npoints(PATH *path) if (!PointerIsValid(path)) return 0; - return (path->npts); + return path->npts; } /* path_npoints() */ PATH * @@ -1267,12 +1267,12 @@ path_close(PATH *path) PATH *result; if (!PointerIsValid(path)) - return (NULL); + return NULL; result = path_copy(path); result->closed = TRUE; - return (result); + return result; } /* path_close() */ @@ -1282,12 +1282,12 @@ path_open(PATH *path) PATH *result; if (!PointerIsValid(path)) - return (NULL); + return NULL; result = path_copy(path); result->closed = FALSE; - return (result); + return result; } /* path_open() */ @@ -1301,7 +1301,7 @@ path_copy(PATH *path) result = palloc(size); memmove((char *) result, (char *) path, size); - return (result); + return result; } /* path_copy() */ @@ -1339,7 +1339,7 @@ path_inter(PATH *p1, PATH *p2) b2.low.y = Min(p2->p[i].y, b2.low.y); } if (!box_overlap(&b1, &b2)) - return (FALSE); + return FALSE; /* pairwise check lseg intersections */ for (i = 0; i < p1->npts - 1; i++) @@ -1349,12 +1349,12 @@ path_inter(PATH *p1, PATH *p2) statlseg_construct(&seg1, &p1->p[i], &p1->p[i + 1]); statlseg_construct(&seg2, &p2->p[j], &p2->p[j + 1]); if (lseg_intersect(&seg1, &seg2)) - return (TRUE); + return TRUE; } } /* if we dropped through, no two segs intersected */ - return (FALSE); + return FALSE; } /* path_inter() */ /* path_distance() @@ -1394,7 +1394,7 @@ path_distance(PATH *p1, PATH *p2) pfree(tmp); } - return (min); + return min; } /* path_distance() */ @@ -1414,7 +1414,7 @@ path_length(PATH *path) for (i = 0; i < (path->npts - 1); i++) *result += point_dt(&path->p[i], &path->p[i + 1]); - return (result); + return result; } /* path_length() */ @@ -1429,7 +1429,7 @@ path_ln(PATH *path) for (i = 0; i < (path->npts - 1); i++) result += point_dt(&path->p[i], &path->p[i + 1]); - return (result); + return result; } /* path_ln() */ #endif @@ -1467,16 +1467,16 @@ point_in(char *str) point->x = x; point->y = y; - return (point); + return point; } /* point_in() */ char * point_out(Point *pt) { if (!PointerIsValid(pt)) - return (NULL); + return NULL; - return (path_encode(-1, 1, pt)); + return path_encode(-1, 1, pt); } /* point_out() */ @@ -1487,7 +1487,7 @@ point_construct(double x, double y) result->x = x; result->y = y; - return (result); + return result; } @@ -1497,13 +1497,13 @@ point_copy(Point *pt) Point *result; if (!PointerIsValid(pt)) - return (NULL); + return NULL; result = palloc(sizeof(Point)); result->x = pt->x; result->y = pt->y; - return (result); + return result; } @@ -1519,49 +1519,49 @@ point_copy(Point *pt) bool point_left(Point *pt1, Point *pt2) { - return (FPlt(pt1->x, pt2->x)); + return FPlt(pt1->x, pt2->x); } bool point_right(Point *pt1, Point *pt2) { - return (FPgt(pt1->x, pt2->x)); + return FPgt(pt1->x, pt2->x); } bool point_above(Point *pt1, Point *pt2) { - return (FPgt(pt1->y, pt2->y)); + return FPgt(pt1->y, pt2->y); } bool point_below(Point *pt1, Point *pt2) { - return (FPlt(pt1->y, pt2->y)); + return FPlt(pt1->y, pt2->y); } bool point_vert(Point *pt1, Point *pt2) { - return (FPeq(pt1->x, pt2->x)); + return FPeq(pt1->x, pt2->x); } bool point_horiz(Point *pt1, Point *pt2) { - return (FPeq(pt1->y, pt2->y)); + return FPeq(pt1->y, pt2->y); } bool point_eq(Point *pt1, Point *pt2) { - return (point_horiz(pt1, pt2) && point_vert(pt1, pt2)); + return point_horiz(pt1, pt2) && point_vert(pt1, pt2); } bool point_ne(Point *pt1, Point *pt2) { - return (!point_eq(pt1, pt2)); + return !point_eq(pt1, pt2); } /*---------------------------------------------------------- @@ -1574,7 +1574,7 @@ pointdist(Point *p1, Point *p2) int32 result; result = point_dt(p1, p2); - return (result); + return result; } double * @@ -1583,7 +1583,7 @@ point_distance(Point *pt1, Point *pt2) double *result = palloc(sizeof(double)); *result = HYPOT(pt1->x - pt2->x, pt1->y - pt2->y); - return (result); + return result; } @@ -1594,7 +1594,7 @@ point_dt(Point *pt1, Point *pt2) printf("point_dt- segment (%f,%f),(%f,%f) length is %f\n", pt1->x, pt1->y, pt2->x, pt2->y, HYPOT(pt1->x - pt2->x, pt1->y - pt2->y)); #endif - return (HYPOT(pt1->x - pt2->x, pt1->y - pt2->y)); + return HYPOT(pt1->x - pt2->x, pt1->y - pt2->y); } double * @@ -1606,7 +1606,7 @@ point_slope(Point *pt1, Point *pt2) *result = (double) DBL_MAX; else *result = (pt1->y - pt2->y) / (pt1->x - pt1->x); - return (result); + return result; } @@ -1655,7 +1655,7 @@ lseg_in(char *str) lseg->m = point_sl(&lseg->p[0], &lseg->p[1]); #endif - return (lseg); + return lseg; } /* lseg_in() */ @@ -1663,9 +1663,9 @@ char * lseg_out(LSEG *ls) { if (!PointerIsValid(ls)) - return (NULL); + return NULL; - return (path_encode(FALSE, 2, (Point *) &(ls->p[0]))); + return path_encode(FALSE, 2, (Point *) &(ls->p[0])); } /* lseg_out() */ @@ -1686,7 +1686,7 @@ lseg_construct(Point *pt1, Point *pt2) result->m = point_sl(pt1, pt2); #endif - return (result); + return result; } /* like lseg_construct, but assume space already allocated */ @@ -1709,11 +1709,11 @@ lseg_length(LSEG *lseg) double *result; if (!PointerIsValid(lseg)) - return (NULL); + return NULL; result = point_distance(&lseg->p[0], &lseg->p[1]); - return (result); + return result; } /* lseg_length() */ /*---------------------------------------------------------- @@ -1741,14 +1741,14 @@ lseg_intersect(LSEG *l1, LSEG *l2) if (interpt != NULL) pfree(interpt); pfree(ln); - return (retval); + return retval; } bool lseg_parallel(LSEG *l1, LSEG *l2) { #if FALSE - return (FPeq(l1->m, l2->m)); + return FPeq(l1->m, l2->m); #endif return (FPeq(point_sl(&(l1->p[0]), &(l1->p[1])), point_sl(&(l2->p[0]), &(l2->p[1])))); @@ -1776,23 +1776,23 @@ lseg_perp(LSEG *l1, LSEG *l2) printf("lseg_perp- slopes are %g and %g\n", m1, m2); #endif if (FPzero(m1)) - return (FPeq(m2, DBL_MAX)); + return FPeq(m2, DBL_MAX); else if (FPzero(m2)) - return (FPeq(m1, DBL_MAX)); + return FPeq(m1, DBL_MAX); - return (FPeq(m1 / m2, -1.0)); + return FPeq(m1 / m2, -1.0); } /* lseg_perp() */ bool lseg_vertical(LSEG *lseg) { - return (FPeq(lseg->p[0].x, lseg->p[1].x)); + return FPeq(lseg->p[0].x, lseg->p[1].x); } bool lseg_horizontal(LSEG *lseg) { - return (FPeq(lseg->p[0].y, lseg->p[1].y)); + return FPeq(lseg->p[0].y, lseg->p[1].y); } @@ -1817,25 +1817,25 @@ lseg_ne(LSEG *l1, LSEG *l2) bool lseg_lt(LSEG *l1, LSEG *l2) { - return (FPlt(point_dt(&l1->p[0], &l1->p[1]), point_dt(&l2->p[0], &l2->p[1]))); + return FPlt(point_dt(&l1->p[0], &l1->p[1]), point_dt(&l2->p[0], &l2->p[1])); } /* lseg_lt() */ bool lseg_le(LSEG *l1, LSEG *l2) { - return (FPle(point_dt(&l1->p[0], &l1->p[1]), point_dt(&l2->p[0], &l2->p[1]))); + return FPle(point_dt(&l1->p[0], &l1->p[1]), point_dt(&l2->p[0], &l2->p[1])); } /* lseg_le() */ bool lseg_gt(LSEG *l1, LSEG *l2) { - return (FPgt(point_dt(&l1->p[0], &l1->p[1]), point_dt(&l2->p[0], &l2->p[1]))); + return FPgt(point_dt(&l1->p[0], &l1->p[1]), point_dt(&l2->p[0], &l2->p[1])); } /* lseg_gt() */ bool lseg_ge(LSEG *l1, LSEG *l2) { - return (FPge(point_dt(&l1->p[0], &l1->p[1]), point_dt(&l2->p[0], &l2->p[1]))); + return FPge(point_dt(&l1->p[0], &l1->p[1]), point_dt(&l2->p[0], &l2->p[1])); } /* lseg_ge() */ @@ -1855,7 +1855,7 @@ lseg_distance(LSEG *l1, LSEG *l2) *result = lseg_dt(l1, l2); - return (result); + return result; } /* lseg_dt() @@ -1870,7 +1870,7 @@ lseg_dt(LSEG *l1, LSEG *l2) result; if (lseg_intersect(l1, l2)) - return (0.0); + return 0.0; d = dist_ps(&l1->p[0], l2); result = *d; @@ -1885,7 +1885,7 @@ lseg_dt(LSEG *l1, LSEG *l2) result = Min(result, *d); pfree(d); - return (result); + return result; } /* lseg_dt() */ @@ -1895,14 +1895,14 @@ lseg_center(LSEG *lseg) Point *result; if (!PointerIsValid(lseg)) - return (NULL); + return NULL; result = palloc(sizeof(Point)); result->x = (lseg->p[0].x - lseg->p[1].x) / 2; result->y = (lseg->p[0].y - lseg->p[1].y) / 2; - return (result); + return result; } /* lseg_center() */ @@ -1923,7 +1923,7 @@ lseg_interpt(LSEG *l1, LSEG *l2) *tmp2; if (!PointerIsValid(l1) || !PointerIsValid(l2)) - return (NULL); + return NULL; tmp1 = line_construct_pp(&l1->p[0], &l1->p[1]); tmp2 = line_construct_pp(&l2->p[0], &l2->p[1]); @@ -1955,7 +1955,7 @@ lseg_interpt(LSEG *l1, LSEG *l2) pfree(tmp1); pfree(tmp2); - return (result); + return result; } /* lseg_interpt() */ /*********************************************************************** @@ -1983,7 +1983,7 @@ dist_pl(Point *pt, LINE *line) *result = (line->A * pt->x + line->B * pt->y + line->C) / HYPOT(line->A, line->B); - return (result); + return result; } double * @@ -2048,7 +2048,7 @@ dist_ps(Point *pt, LSEG *lseg) if (ip != NULL) pfree(ip); pfree(ln); - return (result); + return result; } @@ -2092,7 +2092,7 @@ dist_ppath(Point *pt, PATH *path) } break; } - return (result); + return result; } double * @@ -2105,7 +2105,7 @@ dist_pb(Point *pt, BOX *box) result = point_distance(tmp, pt); pfree(tmp); - return (result); + return result; } @@ -2134,7 +2134,7 @@ dist_sl(LSEG *lseg, LINE *line) pfree(d2); } - return (result); + return result; } @@ -2156,7 +2156,7 @@ dist_sb(LSEG *lseg, BOX *box) pfree(tmp); } - return (result); + return result; } @@ -2178,7 +2178,7 @@ dist_lb(LINE *line, BOX *box) pfree(tmp); } - return (result); + return result; } @@ -2201,7 +2201,7 @@ dist_cpoly(CIRCLE *circle, POLYGON *poly) result = palloc(sizeof(double)); *result = 0; - return (result); + return result; } /* initialize distance with segment between first and last points */ @@ -2234,7 +2234,7 @@ dist_cpoly(CIRCLE *circle, POLYGON *poly) if (*result < 0) *result = 0; - return (result); + return result; } /* dist_cpoly() */ @@ -2279,7 +2279,7 @@ interpt_sl(LSEG *lseg, LINE *line) } pfree(tmp); - return (p); + return p; } @@ -2309,7 +2309,7 @@ close_pl(Point *pt, LINE *line) { result->x = line->C; result->y = pt->y; - return (result); + return result; #if FALSE } @@ -2321,7 +2321,7 @@ close_pl(Point *pt, LINE *line) { result->x = pt->x; result->y = line->C; - return (result); + return result; } /* drop a perpendicular and find the intersection point */ #if FALSE @@ -2331,7 +2331,7 @@ close_pl(Point *pt, LINE *line) invm = line->B / line->A; tmp = line_construct_pm(pt, invm); result = line_interpt(tmp, line); - return (result); + return result; } /* close_pl() */ @@ -2376,14 +2376,14 @@ close_ps(Point *pt, LSEG *lseg) else if (pt->y > lseg->p[yh].y) result = point_copy(&lseg->p[yh]); /* above the lseg */ if (result != NULL) - return (result); + return result; /* point lines along (to left or right) of the vertical lseg. */ result = palloc(sizeof(*result)); result->x = lseg->p[0].x; result->y = pt->y; - return (result); + return result; } else if (lseg_horizontal(lseg)) { @@ -2396,13 +2396,13 @@ close_ps(Point *pt, LSEG *lseg) else if (pt->x > lseg->p[xh].x) result = point_copy(&lseg->p[xh]); /* right of the lseg */ if (result != NULL) - return (result); + return result; /* point lines along (at top or below) the horiz. lseg. */ result = palloc(sizeof(*result)); result->x = pt->x; result->y = lseg->p[0].y; - return (result); + return result; } /* vert. and horiz. cases are down, now check if the closest @@ -2430,7 +2430,7 @@ close_ps(Point *pt, LSEG *lseg) /* fprintf(stderr,"tmp A %f B %f C %f m %f\n",tmp->A,tmp->B,tmp->C, tmp->m); */ result = interpt_sl(lseg, tmp); /* fprintf(stderr,"result.x %f result.y %f\n", result->x, result->y); */ - return (result); + return result; } /* close_ps() */ @@ -2484,7 +2484,7 @@ close_lseg(LSEG *l1, LSEG *l2) memcpy(result, &point, sizeof(*result)); } - return (result); + return result; } /* close_lseg() */ /* close_pb() @@ -2500,7 +2500,7 @@ close_pb(Point *pt, BOX *box) *d; if (on_pb(pt, box)) - return (pt); + return pt; /* pairwise check lseg distances */ point.x = box->low.x; @@ -2535,7 +2535,7 @@ close_pb(Point *pt, BOX *box) } pfree(d); - return (close_ps(pt, &lseg)); + return close_ps(pt, &lseg); } /* close_pb() */ /* close_sl() @@ -2556,7 +2556,7 @@ close_sl(LSEG *lseg, LINE *line) result = interpt_sl(lseg, line); if (result) - return (result); + return result; d1 = dist_pl(&lseg->p[0], line); d2 = dist_pl(&lseg->p[1], line); @@ -2567,7 +2567,7 @@ close_sl(LSEG *lseg, LINE *line) pfree(d1); pfree(d2); - return (result); + return result; } /* close_ls() @@ -2582,7 +2582,7 @@ close_ls(LINE *line, LSEG *lseg) result = interpt_sl(lseg, line); if (result) - return (result); + return result; d1 = dist_pl(&lseg->p[0], line); d2 = dist_pl(&lseg->p[1], line); @@ -2593,7 +2593,7 @@ close_ls(LINE *line, LSEG *lseg) pfree(d1); pfree(d2); - return (result); + return result; } /* close_ls() */ /* close_sb() @@ -2617,7 +2617,7 @@ close_sb(LSEG *lseg, BOX *box) pt = box_center(box); result = close_ps(pt, lseg); pfree(pt); - return (result); + return result; } /* pairwise check lseg distances */ @@ -2650,7 +2650,7 @@ close_sb(LSEG *lseg, BOX *box) } /* OK, we now have the closest line segment on the box boundary */ - return (close_lseg(lseg, &bseg)); + return close_lseg(lseg, &bseg); } /* close_sb() */ Point * @@ -2659,7 +2659,7 @@ close_lb(LINE *line, BOX *box) /* think about this one for a while */ elog(ERROR, "close_lb not implemented", NULL); - return (NULL); + return NULL; } /*--------------------------------------------------------------------- @@ -2674,9 +2674,9 @@ bool on_pl(Point *pt, LINE *line) { if (!PointerIsValid(pt) || !PointerIsValid(line)) - return (FALSE); + return FALSE; - return (FPzero(line->A * pt->x + line->B * pt->y + line->C)); + return FPzero(line->A * pt->x + line->B * pt->y + line->C); } @@ -2688,7 +2688,7 @@ bool on_ps(Point *pt, LSEG *lseg) { if (!PointerIsValid(pt) || !PointerIsValid(lseg)) - return (FALSE); + return FALSE; return (FPeq(point_dt(pt, &lseg->p[0]) + point_dt(pt, &lseg->p[1]), point_dt(&lseg->p[0], &lseg->p[1]))); @@ -2698,7 +2698,7 @@ bool on_pb(Point *pt, BOX *box) { if (!PointerIsValid(pt) || !PointerIsValid(box)) - return (FALSE); + return FALSE; return (pt->x <= box->high.x && pt->x >= box->low.x && pt->y <= box->high.y && pt->y >= box->low.y); @@ -2738,7 +2738,7 @@ on_ppath(Point *pt, PATH *path) b; if (!PointerIsValid(pt) || !PointerIsValid(path)) - return (FALSE); + return FALSE; if (!path->closed) { /*-- OPEN --*/ @@ -2749,13 +2749,13 @@ on_ppath(Point *pt, PATH *path) b = point_dt(pt, &path->p[i + 1]); if (FPeq(a + b, point_dt(&path->p[i], &path->p[i + 1]))) - return (TRUE); + return TRUE; a = b; } - return (FALSE); + return FALSE; } - return (point_inside(pt, path->npts, path->p)); + return point_inside(pt, path->npts, path->p); #if FALSE inter = 0; /*-- CLOSED --*/ above = FPgt(path->p[0].y, pt->y) ? ABOVE : @@ -2779,7 +2779,7 @@ on_ppath(Point *pt, PATH *path) if (FPeq(yh, yl)) /* horizontal seg? */ if (FPge(pt->x, xl) && FPle(pt->x, xh) && FPeq(pt->y, yh)) - return (TRUE); /* pt lies on seg */ + return TRUE; /* pt lies on seg */ else continue; /* skip other hz segs */ if (FPlt(yh, pt->y) || /* pt is strictly below seg */ @@ -2795,7 +2795,7 @@ on_ppath(Point *pt, PATH *path) &path->p[NEXT(i)]) + path->p[i].x; if (FPeq(x, pt->x)) /* pt lies on this seg */ - return (TRUE); + return TRUE; /* does the seg actually cross the ray? */ @@ -2814,18 +2814,18 @@ bool on_sl(LSEG *lseg, LINE *line) { if (!PointerIsValid(lseg) || !PointerIsValid(line)) - return (FALSE); + return FALSE; - return (on_pl(&lseg->p[0], line) && on_pl(&lseg->p[1], line)); + return on_pl(&lseg->p[0], line) && on_pl(&lseg->p[1], line); } /* on_sl() */ bool on_sb(LSEG *lseg, BOX *box) { if (!PointerIsValid(lseg) || !PointerIsValid(box)) - return (FALSE); + return FALSE; - return (on_pb(&lseg->p[0], box) && on_pb(&lseg->p[1], box)); + return on_pb(&lseg->p[0], box) && on_pb(&lseg->p[1], box); } /* on_sb() */ /*--------------------------------------------------------------------- @@ -2839,15 +2839,15 @@ inter_sl(LSEG *lseg, LINE *line) Point *tmp; if (!PointerIsValid(lseg) || !PointerIsValid(line)) - return (FALSE); + return FALSE; tmp = interpt_sl(lseg, line); if (tmp) { pfree(tmp); - return (TRUE); + return TRUE; } - return (FALSE); + return FALSE; } /* inter_sb() @@ -2868,7 +2868,7 @@ inter_sb(LSEG *lseg, BOX *box) Point point; if (!PointerIsValid(lseg) || !PointerIsValid(box)) - return (FALSE); + return FALSE; lbox.low.x = Min(lseg->p[0].x, lseg->p[1].x); lbox.low.y = Min(lseg->p[0].y, lseg->p[1].y); @@ -2877,35 +2877,35 @@ inter_sb(LSEG *lseg, BOX *box) /* nothing close to overlap? then not going to intersect */ if (!box_overlap(&lbox, box)) - return (FALSE); + return FALSE; /* an endpoint of segment is inside box? then clearly intersects */ if (on_pb(&lseg->p[0], box) || on_pb(&lseg->p[1], box)) - return (TRUE); + return TRUE; /* pairwise check lseg intersections */ point.x = box->low.x; point.y = box->high.y; statlseg_construct(&bseg, &box->low, &point); if (lseg_intersect(&bseg, lseg)) - return (TRUE); + return TRUE; statlseg_construct(&bseg, &box->high, &point); if (lseg_intersect(&bseg, lseg)) - return (TRUE); + return TRUE; point.x = box->high.x; point.y = box->low.y; statlseg_construct(&bseg, &box->low, &point); if (lseg_intersect(&bseg, lseg)) - return (TRUE); + return TRUE; statlseg_construct(&bseg, &box->high, &point); if (lseg_intersect(&bseg, lseg)) - return (TRUE); + return TRUE; /* if we dropped through, no two segs intersected */ - return (FALSE); + return FALSE; } /* inter_sb() */ /* inter_lb() @@ -2919,7 +2919,7 @@ inter_lb(LINE *line, BOX *box) p2; if (!PointerIsValid(line) || !PointerIsValid(box)) - return (FALSE); + return FALSE; /* pairwise check lseg intersections */ p1.x = box->low.x; @@ -2928,25 +2928,25 @@ inter_lb(LINE *line, BOX *box) p2.y = box->high.y; statlseg_construct(&bseg, &p1, &p2); if (inter_sl(&bseg, line)) - return (TRUE); + return TRUE; p1.x = box->high.x; p1.y = box->high.y; statlseg_construct(&bseg, &p1, &p2); if (inter_sl(&bseg, line)) - return (TRUE); + return TRUE; p2.x = box->high.x; p2.y = box->low.y; statlseg_construct(&bseg, &p1, &p2); if (inter_sl(&bseg, line)) - return (TRUE); + return TRUE; p1.x = box->low.x; p1.y = box->low.y; statlseg_construct(&bseg, &p1, &p2); if (inter_sl(&bseg, line)) - return (TRUE); + return TRUE; /* if we dropped through, no intersection */ - return (FALSE); + return FALSE; } /*------------------------------------------------------------------ @@ -3027,7 +3027,7 @@ poly_in(char *str) make_bound_box(poly); - return (poly); + return poly; } /* poly_in() */ /*--------------------------------------------------------------- @@ -3041,7 +3041,7 @@ poly_out(POLYGON *poly) if (!PointerIsValid(poly)) return NULL; - return (path_encode(TRUE, poly->npts, &(poly->p[0]))); + return path_encode(TRUE, poly->npts, &(poly->p[0])); } /* poly_out() */ @@ -3053,7 +3053,7 @@ poly_out(POLYGON *poly) bool poly_left(POLYGON *polya, POLYGON *polyb) { - return (polya->boundbox.high.x < polyb->boundbox.low.x); + return polya->boundbox.high.x < polyb->boundbox.low.x; } /*------------------------------------------------------- @@ -3064,7 +3064,7 @@ poly_left(POLYGON *polya, POLYGON *polyb) bool poly_overleft(POLYGON *polya, POLYGON *polyb) { - return (polya->boundbox.low.x <= polyb->boundbox.high.x); + return polya->boundbox.low.x <= polyb->boundbox.high.x; } /*------------------------------------------------------- @@ -3075,7 +3075,7 @@ poly_overleft(POLYGON *polya, POLYGON *polyb) bool poly_right(POLYGON *polya, POLYGON *polyb) { - return (polya->boundbox.low.x > polyb->boundbox.high.x); + return polya->boundbox.low.x > polyb->boundbox.high.x; } /*------------------------------------------------------- @@ -3086,7 +3086,7 @@ poly_right(POLYGON *polya, POLYGON *polyb) bool poly_overright(POLYGON *polya, POLYGON *polyb) { - return (polya->boundbox.high.x > polyb->boundbox.low.x); + return polya->boundbox.high.x > polyb->boundbox.low.x; } /*------------------------------------------------------- @@ -3105,7 +3105,7 @@ poly_same(POLYGON *polya, POLYGON *polyb) if (polya->npts != polyb->npts) return FALSE; - return (plist_same(polya->npts, polya->p, polyb->p)); + return plist_same(polya->npts, polya->p, polyb->p); #if FALSE for (i = 0; i < polya->npts; i++) @@ -3148,7 +3148,7 @@ poly_contain(POLYGON *polya, POLYGON *polyb) int i; if (!PointerIsValid(polya) || !PointerIsValid(polyb)) - return (FALSE); + return FALSE; if (box_contain(&(polya->boundbox), &(polyb->boundbox))) { @@ -3159,7 +3159,7 @@ poly_contain(POLYGON *polya, POLYGON *polyb) #if GEODEBUG printf("poly_contain- point (%f,%f) not in polygon\n", polyb->p[i].x, polyb->p[i].y); #endif - return (FALSE); + return FALSE; } } for (i = 0; i < polya->npts; i++) @@ -3169,17 +3169,17 @@ poly_contain(POLYGON *polya, POLYGON *polyb) #if GEODEBUG printf("poly_contain- point (%f,%f) in polygon\n", polya->p[i].x, polya->p[i].y); #endif - return (FALSE); + return FALSE; } } - return (TRUE); + return TRUE; } #if GEODEBUG printf("poly_contain- bound box ((%f,%f),(%f,%f)) not inside ((%f,%f),(%f,%f))\n", polyb->boundbox.low.x, polyb->boundbox.low.y, polyb->boundbox.high.x, polyb->boundbox.high.y, polya->boundbox.low.x, polya->boundbox.low.y, polya->boundbox.high.x, polya->boundbox.high.y); #endif - return (FALSE); + return FALSE; } /* poly_contain() */ @@ -3191,7 +3191,7 @@ poly_contain(POLYGON *polya, POLYGON *polyb) bool poly_contained(POLYGON *polya, POLYGON *polyb) { - return (box_contained(&(polya->boundbox), &(polyb->boundbox))); + return box_contained(&(polya->boundbox), &(polyb->boundbox)); } #endif @@ -3199,7 +3199,7 @@ poly_contained(POLYGON *polya, POLYGON *polyb) bool poly_contained(POLYGON *polya, POLYGON *polyb) { - return (poly_contain(polyb, polya)); + return poly_contain(polyb, polya); } /* poly_contained() */ @@ -3217,18 +3217,18 @@ bool poly_contain_pt(POLYGON *poly, Point *p) { if (!PointerIsValid(poly) || !PointerIsValid(p)) - return (FALSE); + return FALSE; - return (point_inside(p, poly->npts, &(poly->p[0])) != 0); + return point_inside(p, poly->npts, &(poly->p[0])) != 0; } /* poly_contain_pt() */ bool pt_contained_poly(Point *p, POLYGON *poly) { if (!PointerIsValid(p) || !PointerIsValid(poly)) - return (FALSE); + return FALSE; - return (poly_contain_pt(poly, p)); + return poly_contain_pt(poly, p); } /* pt_contained_poly() */ @@ -3238,13 +3238,13 @@ poly_distance(POLYGON *polya, POLYGON *polyb) double *result; if (!PointerIsValid(polya) || !PointerIsValid(polyb)) - return (NULL); + return NULL; result = palloc(sizeof(double)); *result = 0; - return (result); + return result; } /* poly_distance() */ @@ -3258,9 +3258,9 @@ Point * point(float8 *x, float8 *y) { if (!(PointerIsValid(x) && PointerIsValid(y))) - return (NULL); + return NULL; - return (point_construct(*x, *y)); + return point_construct(*x, *y); } /* point() */ @@ -3270,14 +3270,14 @@ point_add(Point *p1, Point *p2) Point *result; if (!(PointerIsValid(p1) && PointerIsValid(p2))) - return (NULL); + return NULL; result = palloc(sizeof(Point)); result->x = (p1->x + p2->x); result->y = (p1->y + p2->y); - return (result); + return result; } /* point_add() */ Point * @@ -3286,14 +3286,14 @@ point_sub(Point *p1, Point *p2) Point *result; if (!(PointerIsValid(p1) && PointerIsValid(p2))) - return (NULL); + return NULL; result = palloc(sizeof(Point)); result->x = (p1->x - p2->x); result->y = (p1->y - p2->y); - return (result); + return result; } /* point_sub() */ Point * @@ -3302,14 +3302,14 @@ point_mul(Point *p1, Point *p2) Point *result; if (!(PointerIsValid(p1) && PointerIsValid(p2))) - return (NULL); + return NULL; result = palloc(sizeof(Point)); result->x = (p1->x * p2->x) - (p1->y * p2->y); result->y = (p1->x * p2->y) + (p1->y * p2->x); - return (result); + return result; } /* point_mul() */ Point * @@ -3319,7 +3319,7 @@ point_div(Point *p1, Point *p2) double div; if (!(PointerIsValid(p1) && PointerIsValid(p2))) - return (NULL); + return NULL; result = palloc(sizeof(Point)); @@ -3331,7 +3331,7 @@ point_div(Point *p1, Point *p2) result->x = ((p1->x * p2->x) + (p1->y * p2->y)) / div; result->y = ((p2->x * p1->y) - (p2->y * p1->x)) / div; - return (result); + return result; } /* point_div() */ @@ -3347,11 +3347,11 @@ box(Point *p1, Point *p2) BOX *result; if (!(PointerIsValid(p1) && PointerIsValid(p2))) - return (NULL); + return NULL; result = box_construct(p1->x, p2->x, p1->y, p2->y); - return (result); + return result; } /* box() */ BOX * @@ -3360,12 +3360,12 @@ box_add(BOX *box, Point *p) BOX *result; if (!(PointerIsValid(box) && PointerIsValid(p))) - return (NULL); + return NULL; result = box_construct((box->high.x + p->x), (box->low.x + p->x), (box->high.y + p->y), (box->low.y + p->y)); - return (result); + return result; } /* box_add() */ BOX * @@ -3374,12 +3374,12 @@ box_sub(BOX *box, Point *p) BOX *result; if (!(PointerIsValid(box) && PointerIsValid(p))) - return (NULL); + return NULL; result = box_construct((box->high.x - p->x), (box->low.x - p->x), (box->high.y - p->y), (box->low.y - p->y)); - return (result); + return result; } /* box_sub() */ BOX * @@ -3390,7 +3390,7 @@ box_mul(BOX *box, Point *p) *low; if (!(PointerIsValid(box) && PointerIsValid(p))) - return (NULL); + return NULL; high = point_mul(&box->high, p); low = point_mul(&box->low, p); @@ -3399,7 +3399,7 @@ box_mul(BOX *box, Point *p) pfree(high); pfree(low); - return (result); + return result; } /* box_mul() */ BOX * @@ -3410,7 +3410,7 @@ box_div(BOX *box, Point *p) *low; if (!(PointerIsValid(box) && PointerIsValid(p))) - return (NULL); + return NULL; high = point_div(&box->high, p); low = point_div(&box->low, p); @@ -3419,7 +3419,7 @@ box_div(BOX *box, Point *p) pfree(high); pfree(low); - return (result); + return result; } /* box_div() */ @@ -3441,7 +3441,7 @@ path_add(PATH *p1, PATH *p2) if (!(PointerIsValid(p1) && PointerIsValid(p2)) || p1->closed || p2->closed) - return (NULL); + return NULL; size = offsetof(PATH, p[0]) +(sizeof(p1->p[0]) * (p1->npts + p2->npts)); result = palloc(size); @@ -3461,7 +3461,7 @@ path_add(PATH *p1, PATH *p2) result->p[i + p1->npts].y = p2->p[i].y; } - return (result); + return result; } /* path_add() */ /* path_add_pt() @@ -3474,7 +3474,7 @@ path_add_pt(PATH *path, Point *point) int i; if ((!PointerIsValid(path)) || (!PointerIsValid(point))) - return (NULL); + return NULL; result = path_copy(path); @@ -3484,7 +3484,7 @@ path_add_pt(PATH *path, Point *point) result->p[i].y += point->y; } - return (result); + return result; } /* path_add_pt() */ PATH * @@ -3494,7 +3494,7 @@ path_sub_pt(PATH *path, Point *point) int i; if ((!PointerIsValid(path)) || (!PointerIsValid(point))) - return (NULL); + return NULL; result = path_copy(path); @@ -3504,7 +3504,7 @@ path_sub_pt(PATH *path, Point *point) result->p[i].y -= point->y; } - return (result); + return result; } /* path_sub_pt() */ @@ -3519,7 +3519,7 @@ path_mul_pt(PATH *path, Point *point) int i; if ((!PointerIsValid(path)) || (!PointerIsValid(point))) - return (NULL); + return NULL; result = path_copy(path); @@ -3531,7 +3531,7 @@ path_mul_pt(PATH *path, Point *point) pfree(p); } - return (result); + return result; } /* path_mul_pt() */ PATH * @@ -3542,7 +3542,7 @@ path_div_pt(PATH *path, Point *point) int i; if ((!PointerIsValid(path)) || (!PointerIsValid(point))) - return (NULL); + return NULL; result = path_copy(path); @@ -3554,7 +3554,7 @@ path_div_pt(PATH *path, Point *point) pfree(p); } - return (result); + return result; } /* path_div_pt() */ @@ -3562,18 +3562,18 @@ bool path_contain_pt(PATH *path, Point *p) { if (!PointerIsValid(path) || !PointerIsValid(p)) - return (FALSE); + return FALSE; - return ((path->closed ? (point_inside(p, path->npts, &(path->p[0])) != 0) : FALSE)); + return (path->closed ? (point_inside(p, path->npts, &(path->p[0])) != 0) : FALSE); } /* path_contain_pt() */ bool pt_contained_path(Point *p, PATH *path) { if (!PointerIsValid(p) || !PointerIsValid(path)) - return (FALSE); + return FALSE; - return (path_contain_pt(path, p)); + return path_contain_pt(path, p); } /* pt_contained_path() */ @@ -3583,14 +3583,14 @@ path_center(PATH *path) Point *result; if (!PointerIsValid(path)) - return (NULL); + return NULL; elog(ERROR, "path_center not implemented", NULL); result = palloc(sizeof(Point)); result = NULL; - return (result); + return result; } /* path_center() */ POLYGON * @@ -3601,7 +3601,7 @@ path_poly(PATH *path) int i; if (!PointerIsValid(path)) - return (NULL); + return NULL; if (!path->closed) elog(ERROR, "Open path cannot be converted to polygon", NULL); @@ -3620,7 +3620,7 @@ path_poly(PATH *path) make_bound_box(poly); - return (poly); + return poly; } /* path_polygon() */ @@ -3640,7 +3640,7 @@ upgradepath(PATH *path) int i; if (!PointerIsValid(path) || (path->npts < 2)) - return (NULL); + return NULL; if (!isoldpath(path)) elog(ERROR, "upgradepath: path already upgraded?", NULL); @@ -3660,16 +3660,16 @@ upgradepath(PATH *path) result->p[i].y = path->p[i + 1].y; } - return (result); + return result; } /* upgradepath() */ bool isoldpath(PATH *path) { if (!PointerIsValid(path) || (path->npts < 2)) - return (FALSE); + return FALSE; - return (path->npts == (path->p[0].y + 1)); + return path->npts == (path->p[0].y + 1); } /* isoldpath() */ @@ -3683,9 +3683,9 @@ int4 poly_npoints(POLYGON *poly) { if (!PointerIsValid(poly)) - return (FALSE); + return FALSE; - return (poly->npts); + return poly->npts; } /* poly_npoints() */ @@ -3696,7 +3696,7 @@ poly_center(POLYGON *poly) CIRCLE *circle; if (!PointerIsValid(poly)) - return (NULL); + return NULL; if (PointerIsValid(circle = poly_circle(poly))) { @@ -3707,7 +3707,7 @@ poly_center(POLYGON *poly) else result = NULL; - return (result); + return result; } /* poly_center() */ @@ -3717,11 +3717,11 @@ poly_box(POLYGON *poly) BOX *box; if (!PointerIsValid(poly) || (poly->npts < 1)) - return (NULL); + return NULL; box = box_copy(&poly->boundbox); - return (box); + return box; } /* poly_box() */ @@ -3735,7 +3735,7 @@ box_poly(BOX *box) int size; if (!PointerIsValid(box)) - return (NULL); + return NULL; /* map four corners of the box to a polygon */ size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * 4); @@ -3755,7 +3755,7 @@ box_poly(BOX *box) box_fill(&poly->boundbox, box->high.x, box->low.x, box->high.y, box->low.y); - return (poly); + return poly; } /* box_poly() */ @@ -3767,7 +3767,7 @@ poly_path(POLYGON *poly) int i; if (!PointerIsValid(poly) || (poly->npts < 0)) - return (NULL); + return NULL; size = offsetof(PATH, p[0]) +(sizeof(path->p[0]) * poly->npts); path = palloc(size); @@ -3782,7 +3782,7 @@ poly_path(POLYGON *poly) path->p[i].y = poly->p[i].y; } - return (path); + return path; } /* poly_path() */ @@ -3801,7 +3801,7 @@ upgradepoly(POLYGON *poly) ii; if (!PointerIsValid(poly) || (poly->npts < 1)) - return (NULL); + return NULL; size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * poly->npts); result = palloc(size); @@ -3831,7 +3831,7 @@ upgradepoly(POLYGON *poly) result->p[2 * i + ii + 1].y = poly->p[i + n2 + ii].y; /* odd (+offset) indices */ } - return (result); + return result; } /* upgradepoly() */ /* revertpoly() @@ -3847,7 +3847,7 @@ revertpoly(POLYGON *poly) ii; if (!PointerIsValid(poly) || (poly->npts < 1)) - return (NULL); + return NULL; size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * poly->npts); result = palloc(size); @@ -3877,7 +3877,7 @@ revertpoly(POLYGON *poly) result->p[i + n2 + ii].y = poly->p[2 * i + ii + 1].y; /* odd (+offset) indices */ } - return (result); + return result; } /* revertpoly() */ @@ -3952,7 +3952,7 @@ circle_in(char *str) if (*s != '\0') elog(ERROR, "Bad circle external representation '%s'", str); - return (circle); + return circle; } /* circle_in() */ /* circle_out - convert a circle to external form. @@ -3964,7 +3964,7 @@ circle_out(CIRCLE *circle) char *cp; if (!PointerIsValid(circle)) - return (NULL); + return NULL; result = palloc(3 * (P_MAXLEN + 1) + 3); @@ -3984,7 +3984,7 @@ circle_out(CIRCLE *circle) *cp++ = RDELIM_C; *cp = '\0'; - return (result); + return result; } /* circle_out() */ @@ -4008,7 +4008,7 @@ circle_same(CIRCLE *circle1, CIRCLE *circle2) bool circle_overlap(CIRCLE *circle1, CIRCLE *circle2) { - return (FPle(point_dt(&circle1->center, &circle2->center), (circle1->radius + circle2->radius))); + return FPle(point_dt(&circle1->center, &circle2->center), (circle1->radius + circle2->radius)); } /* circle_overleft - is the right edge of circle1 to the left of @@ -4017,7 +4017,7 @@ circle_overlap(CIRCLE *circle1, CIRCLE *circle2) bool circle_overleft(CIRCLE *circle1, CIRCLE *circle2) { - return (FPle((circle1->center.x + circle1->radius), (circle2->center.x + circle2->radius))); + return FPle((circle1->center.x + circle1->radius), (circle2->center.x + circle2->radius)); } /* circle_left - is circle1 strictly left of circle2? @@ -4025,7 +4025,7 @@ circle_overleft(CIRCLE *circle1, CIRCLE *circle2) bool circle_left(CIRCLE *circle1, CIRCLE *circle2) { - return (FPle((circle1->center.x + circle1->radius), (circle2->center.x - circle2->radius))); + return FPle((circle1->center.x + circle1->radius), (circle2->center.x - circle2->radius)); } /* circle_right - is circle1 strictly right of circle2? @@ -4033,7 +4033,7 @@ circle_left(CIRCLE *circle1, CIRCLE *circle2) bool circle_right(CIRCLE *circle1, CIRCLE *circle2) { - return (FPge((circle1->center.x - circle1->radius), (circle2->center.x + circle2->radius))); + return FPge((circle1->center.x - circle1->radius), (circle2->center.x + circle2->radius)); } /* circle_overright - is the left edge of circle1 to the right of @@ -4042,7 +4042,7 @@ circle_right(CIRCLE *circle1, CIRCLE *circle2) bool circle_overright(CIRCLE *circle1, CIRCLE *circle2) { - return (FPge((circle1->center.x - circle1->radius), (circle2->center.x - circle2->radius))); + return FPge((circle1->center.x - circle1->radius), (circle2->center.x - circle2->radius)); } /* circle_contained - is circle1 contained by circle2? @@ -4050,7 +4050,7 @@ circle_overright(CIRCLE *circle1, CIRCLE *circle2) bool circle_contained(CIRCLE *circle1, CIRCLE *circle2) { - return (FPle((point_dt(&circle1->center, &circle2->center) + circle1->radius), circle2->radius)); + return FPle((point_dt(&circle1->center, &circle2->center) + circle1->radius), circle2->radius); } /* circle_contain - does circle1 contain circle2? @@ -4058,7 +4058,7 @@ circle_contained(CIRCLE *circle1, CIRCLE *circle2) bool circle_contain(CIRCLE *circle1, CIRCLE *circle2) { - return (FPle((point_dt(&circle1->center, &circle2->center) + circle2->radius), circle1->radius)); + return FPle((point_dt(&circle1->center, &circle2->center) + circle2->radius), circle1->radius); } @@ -4068,13 +4068,13 @@ circle_contain(CIRCLE *circle1, CIRCLE *circle2) bool circle_below(CIRCLE *circle1, CIRCLE *circle2) { - return (FPle((circle1->center.y + circle1->radius), (circle2->center.y - circle2->radius))); + return FPle((circle1->center.y + circle1->radius), (circle2->center.y - circle2->radius)); } bool circle_above(CIRCLE *circle1, CIRCLE *circle2) { - return (FPge((circle1->center.y - circle1->radius), (circle2->center.y + circle2->radius))); + return FPge((circle1->center.y - circle1->radius), (circle2->center.y + circle2->radius)); } @@ -4084,37 +4084,37 @@ circle_above(CIRCLE *circle1, CIRCLE *circle2) bool circle_eq(CIRCLE *circle1, CIRCLE *circle2) { - return (FPeq(circle_ar(circle1), circle_ar(circle2))); + return FPeq(circle_ar(circle1), circle_ar(circle2)); } /* circle_eq() */ bool circle_ne(CIRCLE *circle1, CIRCLE *circle2) { - return (!circle_eq(circle1, circle2)); + return !circle_eq(circle1, circle2); } /* circle_ne() */ bool circle_lt(CIRCLE *circle1, CIRCLE *circle2) { - return (FPlt(circle_ar(circle1), circle_ar(circle2))); + return FPlt(circle_ar(circle1), circle_ar(circle2)); } /* circle_lt() */ bool circle_gt(CIRCLE *circle1, CIRCLE *circle2) { - return (FPgt(circle_ar(circle1), circle_ar(circle2))); + return FPgt(circle_ar(circle1), circle_ar(circle2)); } /* circle_gt() */ bool circle_le(CIRCLE *circle1, CIRCLE *circle2) { - return (FPle(circle_ar(circle1), circle_ar(circle2))); + return FPle(circle_ar(circle1), circle_ar(circle2)); } /* circle_le() */ bool circle_ge(CIRCLE *circle1, CIRCLE *circle2) { - return (FPge(circle_ar(circle1), circle_ar(circle2))); + return FPge(circle_ar(circle1), circle_ar(circle2)); } /* circle_ge() */ @@ -4137,7 +4137,7 @@ circle_copy(CIRCLE *circle) result = palloc(sizeof(CIRCLE)); memmove((char *) result, (char *) circle, sizeof(CIRCLE)); - return (result); + return result; } /* circle_copy() */ @@ -4150,14 +4150,14 @@ circle_add_pt(CIRCLE *circle, Point *point) CIRCLE *result; if (!PointerIsValid(circle) || !PointerIsValid(point)) - return (NULL); + return NULL; result = circle_copy(circle); result->center.x += point->x; result->center.y += point->y; - return (result); + return result; } /* circle_add_pt() */ CIRCLE * @@ -4166,14 +4166,14 @@ circle_sub_pt(CIRCLE *circle, Point *point) CIRCLE *result; if (!PointerIsValid(circle) || !PointerIsValid(point)) - return (NULL); + return NULL; result = circle_copy(circle); result->center.x -= point->x; result->center.y -= point->y; - return (result); + return result; } /* circle_sub_pt() */ @@ -4187,7 +4187,7 @@ circle_mul_pt(CIRCLE *circle, Point *point) Point *p; if (!PointerIsValid(circle) || !PointerIsValid(point)) - return (NULL); + return NULL; result = circle_copy(circle); @@ -4197,7 +4197,7 @@ circle_mul_pt(CIRCLE *circle, Point *point) pfree(p); result->radius *= HYPOT(point->x, point->y); - return (result); + return result; } /* circle_mul_pt() */ CIRCLE * @@ -4207,7 +4207,7 @@ circle_div_pt(CIRCLE *circle, Point *point) Point *p; if (!PointerIsValid(circle) || !PointerIsValid(point)) - return (NULL); + return NULL; result = circle_copy(circle); @@ -4217,7 +4217,7 @@ circle_div_pt(CIRCLE *circle, Point *point) pfree(p); result->radius /= HYPOT(point->x, point->y); - return (result); + return result; } /* circle_div_pt() */ @@ -4231,7 +4231,7 @@ circle_area(CIRCLE *circle) result = palloc(sizeof(double)); *result = circle_ar(circle); - return (result); + return result; } @@ -4245,7 +4245,7 @@ circle_diameter(CIRCLE *circle) result = palloc(sizeof(double)); *result = (2 * circle->radius); - return (result); + return result; } @@ -4259,7 +4259,7 @@ circle_radius(CIRCLE *circle) result = palloc(sizeof(double)); *result = circle->radius; - return (result); + return result; } @@ -4277,7 +4277,7 @@ circle_distance(CIRCLE *circle1, CIRCLE *circle2) if (*result < 0) *result = 0; - return (result); + return result; } /* circle_distance() */ @@ -4288,20 +4288,20 @@ circle_contain_pt(CIRCLE *circle, Point *point) double *d; if (!PointerIsValid(circle) || !PointerIsValid(point)) - return (FALSE); + return FALSE; d = point_distance(&(circle->center), point); within = (*d <= circle->radius); pfree(d); - return (within); + return within; } /* circle_contain_pt() */ bool pt_contained_circle(Point *point, CIRCLE *circle) { - return (circle_contain_pt(circle, point)); + return circle_contain_pt(circle, point); } /* circle_contain_pt() */ @@ -4319,7 +4319,7 @@ dist_pc(Point *point, CIRCLE *circle) if (*result < 0) *result = 0; - return (result); + return result; } /* dist_pc() */ @@ -4334,7 +4334,7 @@ circle_center(CIRCLE *circle) result->x = circle->center.x; result->y = circle->center.y; - return (result); + return result; } @@ -4343,7 +4343,7 @@ circle_center(CIRCLE *circle) static double circle_ar(CIRCLE *circle) { - return (PI * (circle->radius * circle->radius)); + return PI * (circle->radius * circle->radius); } @@ -4358,7 +4358,7 @@ circle_dt(CIRCLE *circle1, CIRCLE *circle2) result = point_dt(&circle1->center, &circle2->center); - return (result); + return result; } #endif @@ -4373,7 +4373,7 @@ circle(Point *center, float8 *radius) CIRCLE *result; if (!(PointerIsValid(center) && PointerIsValid(radius))) - return (NULL); + return NULL; result = palloc(sizeof(CIRCLE)); @@ -4381,7 +4381,7 @@ circle(Point *center, float8 *radius) result->center.y = center->y; result->radius = *radius; - return (result); + return result; } @@ -4392,7 +4392,7 @@ circle_box(CIRCLE *circle) double delta; if (!PointerIsValid(circle)) - return (NULL); + return NULL; box = palloc(sizeof(BOX)); @@ -4403,7 +4403,7 @@ circle_box(CIRCLE *circle) box->high.y = circle->center.y + delta; box->low.y = circle->center.y - delta; - return (box); + return box; } /* circle_box() */ /* box_circle() @@ -4415,7 +4415,7 @@ box_circle(BOX *box) CIRCLE *circle; if (!PointerIsValid(box)) - return (NULL); + return NULL; circle = palloc(sizeof(CIRCLE)); @@ -4424,7 +4424,7 @@ box_circle(BOX *box) circle->radius = point_dt(&circle->center, &box->high); - return (circle); + return circle; } /* box_circle() */ @@ -4437,7 +4437,7 @@ circle_poly(int npts, CIRCLE *circle) double angle; if (!PointerIsValid(circle)) - return (NULL); + return NULL; if (FPzero(circle->radius) || (npts < 2)) elog(ERROR, "Unable to convert circle to polygon", NULL); @@ -4458,7 +4458,7 @@ circle_poly(int npts, CIRCLE *circle) make_bound_box(poly); - return (poly); + return poly; } /* poly_circle - convert polygon to circle @@ -4473,7 +4473,7 @@ poly_circle(POLYGON *poly) int i; if (!PointerIsValid(poly)) - return (NULL); + return NULL; if (poly->npts < 2) elog(ERROR, "Unable to convert polygon to circle", NULL); @@ -4499,7 +4499,7 @@ poly_circle(POLYGON *poly) if (FPzero(circle->radius)) elog(ERROR, "Unable to convert polygon to circle", NULL); - return (circle); + return circle; } /* poly_circle() */ @@ -4512,7 +4512,7 @@ poly_circle(POLYGON *poly) #define HIT_IT INT_MAX static int -point_inside(Point *p, int npts, Point plist[]) +point_inside(Point *p, int npts, Point *plist) { double x0, y0; @@ -4585,51 +4585,51 @@ lseg_crossing(double x, double y, double px, double py) { if (FPzero(x)) { - return (HIT_IT); + return HIT_IT; } else if (FPgt(x, 0)) { if (FPzero(py)) - return (FPgt(px, 0) ? 0 : HIT_IT); - return (FPlt(py, 0) ? 1 : -1); + return FPgt(px, 0) ? 0 : HIT_IT; + return FPlt(py, 0) ? 1 : -1; } else { /* x < 0 */ if (FPzero(py)) - return (FPlt(px, 0) ? 0 : HIT_IT); - return (0); + return FPlt(px, 0) ? 0 : HIT_IT; + return 0; } } /* Now we know y != 0; set sgn to sign of y */ sgn = (FPgt(y, 0) ? 1 : -1); if (FPzero(py)) - return (FPlt(px, 0) ? 0 : sgn); + return FPlt(px, 0) ? 0 : sgn; if (FPgt((sgn * py), 0)) { /* y and py have same sign */ - return (0); + return 0; } else { /* y and py have opposite signs */ if (FPge(x, 0) && FPgt(px, 0)) - return (2 * sgn); + return 2 * sgn; if (FPlt(x, 0) && FPle(px, 0)) - return (0); + return 0; z = (x - px) * y - (y - py) * x; if (FPzero(z)) - return (HIT_IT); - return (FPgt((sgn * z), 0) ? 0 : 2 * sgn); + return HIT_IT; + return FPgt((sgn * z), 0) ? 0 : 2 * sgn; } } /* lseg_crossing() */ static bool -plist_same(int npts, Point p1[], Point p2[]) +plist_same(int npts, Point *p1, Point *p2) { int i, ii, @@ -4660,7 +4660,7 @@ plist_same(int npts, Point p1[], Point p2[]) printf("plist_same- ii = %d/%d after forward match\n", ii, npts); #endif if (ii == npts) - return (TRUE); + return TRUE; /* match not found forwards? then look backwards */ for (ii = 1, j = i - 1; ii < npts; ii++, j--) @@ -4680,9 +4680,9 @@ plist_same(int npts, Point p1[], Point p2[]) printf("plist_same- ii = %d/%d after reverse match\n", ii, npts); #endif if (ii == npts) - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } /* plist_same() */ diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c index d07230e41f..9d011cdbb2 100644 --- a/src/backend/utils/adt/geo_selfuncs.c +++ b/src/backend/utils/adt/geo_selfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.5 1997/09/08 02:30:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.6 1998/09/01 03:26:02 momjian Exp $ * * XXX These are totally bogus. * @@ -32,7 +32,7 @@ areasel(Oid opid, result = (float64) palloc(sizeof(float64data)); *result = 1.0 / 4.0; - return (result); + return result; } float64 @@ -46,7 +46,7 @@ areajoinsel(Oid opid, result = (float64) palloc(sizeof(float64data)); *result = 1.0 / 4.0; - return (result); + return result; } /* @@ -77,7 +77,7 @@ leftsel(Oid opid, result = (float64) palloc(sizeof(float64data)); *result = 1.0 / 6.0; - return (result); + return result; } #endif @@ -94,7 +94,7 @@ leftjoinsel(Oid opid, result = (float64) palloc(sizeof(float64data)); *result = 1.0 / 6.0; - return (result); + return result; } #endif @@ -114,7 +114,7 @@ contsel(Oid opid, result = (float64) palloc(sizeof(float64data)); *result = 1.0 / 10.0; - return (result); + return result; } #endif @@ -131,7 +131,7 @@ contjoinsel(Oid opid, result = (float64) palloc(sizeof(float64data)); *result = 1.0 / 10.0; - return (result); + return result; } #endif diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index 2bf1fdf80f..d1e1a062dc 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.15 1998/02/26 04:37:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.16 1998/09/01 03:26:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,7 +55,7 @@ int32 int2in(char *num) { - return ((int32) pg_atoi(num, sizeof(int16), '\0')); + return (int32) pg_atoi(num, sizeof(int16), '\0'); } /* @@ -68,7 +68,7 @@ int2out(int16 sh) result = (char *) palloc(7);/* assumes sign, 5 digits, '\0' */ itoa((int) sh, result); - return (result); + return result; } /* @@ -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])); + return NULL; + result = (int16 **) palloc(sizeof(int16[8])); if ((nums = sscanf(shs, "%hd%hd%hd%hd%hd%hd%hd%hd", *result, *result + 1, @@ -100,14 +100,14 @@ int28in(char *shs) (*result)[nums++] = 0; while (nums < 8); } - return ((int16 *) result); + return (int16 *) result; } /* * int28out - converts internal form to "num num ..." */ char * -int28out(int16 (*shs)[]) +int28out(int16 **shs) { int num; int16 *sp; @@ -119,7 +119,7 @@ int28out(int16 (*shs)[]) result = (char *) palloc(2); result[0] = '-'; result[1] = '\0'; - return (result); + return result; } rp = result = (char *) palloc(8 * 7); /* assumes sign, 5 digits, * ' ' */ @@ -132,7 +132,7 @@ int28out(int16 (*shs)[]) *rp++ = ' '; } *--rp = '\0'; - return (result); + return result; } /* @@ -156,14 +156,14 @@ int44in(char *input_string) while (i < 4) foo[i++] = 0; - return (foo); + return foo; } /* * int28out - converts internal form to "num num ..." */ char * -int44out(int32 an_array[]) +int44out(int32 *an_array) { int temp = 4; char *output_string = NULL; @@ -185,7 +185,7 @@ int44out(int32 an_array[]) } *--walk = '\0'; } - return (output_string); + return output_string; } @@ -199,7 +199,7 @@ int44out(int32 an_array[]) int32 int4in(char *num) { - return (pg_atoi(num, sizeof(int32), '\0')); + return pg_atoi(num, sizeof(int32), '\0'); } /* @@ -212,7 +212,7 @@ int4out(int32 l) result = (char *) palloc(12); /* assumes sign, 10 digits, '\0' */ ltoa(l, result); - return (result); + return result; } @@ -225,7 +225,7 @@ int4out(int32 l) int32 i2toi4(int16 arg1) { - return ((int32) arg1); + return (int32) arg1; } int16 @@ -236,7 +236,7 @@ i4toi2(int32 arg1) if (arg1 > SHRT_MAX) elog(ERROR, "i4toi2: '%d' causes int2 overflow", arg1); - return ((int16) arg1); + return (int16) arg1; } text * @@ -257,7 +257,7 @@ int2_text(int16 arg1) pfree(str); - return (result); + return result; } /* int2_text() */ int16 @@ -277,7 +277,7 @@ text_int2(text *string) result = int2in(str); pfree(str); - return (result); + return result; } /* text_int2() */ text * @@ -298,7 +298,7 @@ int4_text(int32 arg1) pfree(str); - return (result); + return result; } /* int4_text() */ int32 @@ -318,7 +318,7 @@ text_int4(text *string) result = int4in(str); pfree(str); - return (result); + return result; } /* text_int4() */ @@ -339,152 +339,152 @@ text_int4(text *string) bool int4eq(int32 arg1, int32 arg2) { - return (arg1 == arg2); + return arg1 == arg2; } bool int4ne(int32 arg1, int32 arg2) { - return (arg1 != arg2); + return arg1 != arg2; } bool int4lt(int32 arg1, int32 arg2) { - return (arg1 < arg2); + return arg1 < arg2; } bool int4le(int32 arg1, int32 arg2) { - return (arg1 <= arg2); + return arg1 <= arg2; } bool int4gt(int32 arg1, int32 arg2) { - return (arg1 > arg2); + return arg1 > arg2; } bool int4ge(int32 arg1, int32 arg2) { - return (arg1 >= arg2); + return arg1 >= arg2; } bool int2eq(int16 arg1, int16 arg2) { - return (arg1 == arg2); + return arg1 == arg2; } bool int2ne(int16 arg1, int16 arg2) { - return (arg1 != arg2); + return arg1 != arg2; } bool int2lt(int16 arg1, int16 arg2) { - return (arg1 < arg2); + return arg1 < arg2; } bool int2le(int16 arg1, int16 arg2) { - return (arg1 <= arg2); + return arg1 <= arg2; } bool int2gt(int16 arg1, int16 arg2) { - return (arg1 > arg2); + return arg1 > arg2; } bool int2ge(int16 arg1, int16 arg2) { - return (arg1 >= arg2); + return arg1 >= arg2; } bool int24eq(int32 arg1, int32 arg2) { - return (arg1 == arg2); + return arg1 == arg2; } bool int24ne(int32 arg1, int32 arg2) { - return (arg1 != arg2); + return arg1 != arg2; } bool int24lt(int32 arg1, int32 arg2) { - return (arg1 < arg2); + return arg1 < arg2; } bool int24le(int32 arg1, int32 arg2) { - return (arg1 <= arg2); + return arg1 <= arg2; } bool int24gt(int32 arg1, int32 arg2) { - return (arg1 > arg2); + return arg1 > arg2; } bool int24ge(int32 arg1, int32 arg2) { - return (arg1 >= arg2); + return arg1 >= arg2; } bool int42eq(int32 arg1, int32 arg2) { - return (arg1 == arg2); + return arg1 == arg2; } bool int42ne(int32 arg1, int32 arg2) { - return (arg1 != arg2); + return arg1 != arg2; } bool int42lt(int32 arg1, int32 arg2) { - return (arg1 < arg2); + return arg1 < arg2; } bool int42le(int32 arg1, int32 arg2) { - return (arg1 <= arg2); + return arg1 <= arg2; } bool int42gt(int32 arg1, int32 arg2) { - return (arg1 > arg2); + return arg1 > arg2; } bool int42ge(int32 arg1, int32 arg2) { - return (arg1 >= arg2); + return arg1 >= arg2; } bool keyfirsteq(int16 *arg1, int16 arg2) { - return (*arg1 == arg2); + return *arg1 == arg2; } /* @@ -496,121 +496,121 @@ keyfirsteq(int16 *arg1, int16 arg2) int32 int4um(int32 arg) { - return (-arg); + return -arg; } int32 int4pl(int32 arg1, int32 arg2) { - return (arg1 + arg2); + return arg1 + arg2; } int32 int4mi(int32 arg1, int32 arg2) { - return (arg1 - arg2); + return arg1 - arg2; } int32 int4mul(int32 arg1, int32 arg2) { - return (arg1 * arg2); + return arg1 * arg2; } int32 int4div(int32 arg1, int32 arg2) { - return (arg1 / arg2); + return arg1 / arg2; } int32 int4inc(int32 arg) { - return (arg + (int32) 1); + return arg + (int32) 1; } int16 int2um(int16 arg) { - return (-arg); + return -arg; } int16 int2pl(int16 arg1, int16 arg2) { - return (arg1 + arg2); + return arg1 + arg2; } int16 int2mi(int16 arg1, int16 arg2) { - return (arg1 - arg2); + return arg1 - arg2; } int16 int2mul(int16 arg1, int16 arg2) { - return (arg1 * arg2); + return arg1 * arg2; } int16 int2div(int16 arg1, int16 arg2) { - return (arg1 / arg2); + return arg1 / arg2; } int16 int2inc(int16 arg) { - return (arg + (int16) 1); + return arg + (int16) 1; } int32 int24pl(int32 arg1, int32 arg2) { - return (arg1 + arg2); + return arg1 + arg2; } int32 int24mi(int32 arg1, int32 arg2) { - return (arg1 - arg2); + return arg1 - arg2; } int32 int24mul(int32 arg1, int32 arg2) { - return (arg1 * arg2); + return arg1 * arg2; } int32 int24div(int32 arg1, int32 arg2) { - return (arg1 / arg2); + return arg1 / arg2; } int32 int42pl(int32 arg1, int32 arg2) { - return (arg1 + arg2); + return arg1 + arg2; } int32 int42mi(int32 arg1, int32 arg2) { - return (arg1 - arg2); + return arg1 - arg2; } int32 int42mul(int32 arg1, int32 arg2) { - return (arg1 * arg2); + return arg1 * arg2; } int32 int42div(int32 arg1, int32 arg2) { - return (arg1 / arg2); + return arg1 / arg2; } /* @@ -619,25 +619,25 @@ int42div(int32 arg1, int32 arg2) int32 int4mod(int32 arg1, int32 arg2) { - return (arg1 % arg2); + return arg1 % arg2; } int32 int2mod(int16 arg1, int16 arg2) { - return (arg1 % arg2); + return arg1 % arg2; } int32 int24mod(int32 arg1, int32 arg2) { - return (arg1 % arg2); + return arg1 % arg2; } int32 int42mod(int32 arg1, int32 arg2) { - return (arg1 % arg2); + return arg1 % arg2; } /* @@ -653,7 +653,7 @@ int4fac(int32 arg1) else for (result = 1; arg1 > 0; --arg1) result *= arg1; - return (result); + return result; } int32 @@ -666,29 +666,29 @@ int2fac(int16 arg1) else for (result = 1; arg1 > 0; --arg1) result *= arg1; - return (result); + return result; } int16 int2larger(int16 arg1, int16 arg2) { - return ((arg1 > arg2) ? arg1 : arg2); + return (arg1 > arg2) ? arg1 : arg2; } int16 int2smaller(int16 arg1, int16 arg2) { - return ((arg1 < arg2) ? arg1 : arg2); + return (arg1 < arg2) ? arg1 : arg2; } int32 int4larger(int32 arg1, int32 arg2) { - return ((arg1 > arg2) ? arg1 : arg2); + return (arg1 > arg2) ? arg1 : arg2; } int32 int4smaller(int32 arg1, int32 arg2) { - return ((arg1 < arg2) ? arg1 : arg2); + return (arg1 < arg2) ? arg1 : arg2; } diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 1e0cc5f648..f2ebad62a6 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -49,7 +49,7 @@ int8in(char *str) result = NULL; #endif - return (result); + return result; } /* int8in() */ @@ -64,7 +64,7 @@ int8out(int64 * val) char buf[MAXINT8LEN + 1]; if (!PointerIsValid(val)) - return (NULL); + return NULL; if ((len = snprintf(buf, MAXINT8LEN, INT64_FORMAT, *val)) < 0) elog(ERROR, "Unable to format int8", NULL); @@ -73,7 +73,7 @@ int8out(int64 * val) strcpy(result, buf); - return (result); + return result; } /* int8out() */ @@ -87,37 +87,37 @@ int8out(int64 * val) bool int8eq(int64 * val1, int64 * val2) { - return (*val1 == *val2); + return *val1 == *val2; } /* int8eq() */ bool int8ne(int64 * val1, int64 * val2) { - return (*val1 != *val2); + return *val1 != *val2; } /* int8ne() */ bool int8lt(int64 * val1, int64 * val2) { - return (*val1 < *val2); + return *val1 < *val2; } /* int8lt() */ bool int8gt(int64 * val1, int64 * val2) { - return (*val1 > *val2); + return *val1 > *val2; } /* int8gt() */ bool int8le(int64 * val1, int64 * val2) { - return (*val1 <= *val2); + return *val1 <= *val2; } /* int8le() */ bool int8ge(int64 * val1, int64 * val2) { - return (*val1 >= *val2); + return *val1 >= *val2; } /* int8ge() */ @@ -127,37 +127,37 @@ int8ge(int64 * val1, int64 * val2) bool int84eq(int64 * val1, int32 val2) { - return (*val1 == val2); + return *val1 == val2; } /* int84eq() */ bool int84ne(int64 * val1, int32 val2) { - return (*val1 != val2); + return *val1 != val2; } /* int84ne() */ bool int84lt(int64 * val1, int32 val2) { - return (*val1 < val2); + return *val1 < val2; } /* int84lt() */ bool int84gt(int64 * val1, int32 val2) { - return (*val1 > val2); + return *val1 > val2; } /* int84gt() */ bool int84le(int64 * val1, int32 val2) { - return (*val1 <= val2); + return *val1 <= val2; } /* int84le() */ bool int84ge(int64 * val1, int32 val2) { - return (*val1 >= val2); + return *val1 >= val2; } /* int84ge() */ @@ -167,37 +167,37 @@ int84ge(int64 * val1, int32 val2) bool int48eq(int32 val1, int64 * val2) { - return (val1 == *val2); + return val1 == *val2; } /* int48eq() */ bool int48ne(int32 val1, int64 * val2) { - return (val1 != *val2); + return val1 != *val2; } /* int48ne() */ bool int48lt(int32 val1, int64 * val2) { - return (val1 < *val2); + return val1 < *val2; } /* int48lt() */ bool int48gt(int32 val1, int64 * val2) { - return (val1 > *val2); + return val1 > *val2; } /* int48gt() */ bool int48le(int32 val1, int64 * val2) { - return (val1 <= *val2); + return val1 <= *val2; } /* int48le() */ bool int48ge(int32 val1, int64 * val2) { - return (val1 >= *val2); + return val1 >= *val2; } /* int48ge() */ @@ -220,7 +220,7 @@ int8um(int64 * val) result = int8mi(&temp, val); #endif - return (result); + return result; } /* int8um() */ @@ -234,7 +234,7 @@ int8pl(int64 * val1, int64 * val2) *result = *val1 + *val2; - return (result); + return result; } /* int8pl() */ int64 * @@ -247,7 +247,7 @@ int8mi(int64 * val1, int64 * val2) *result = *val1 - *val2; - return (result); + return result; } /* int8mi() */ int64 * @@ -260,7 +260,7 @@ int8mul(int64 * val1, int64 * val2) *result = *val1 * *val2; - return (result); + return result; } /* int8mul() */ int64 * @@ -273,7 +273,7 @@ int8div(int64 * val1, int64 * val2) *result = *val1 / *val2; - return (result); + return result; } /* int8div() */ int64 * @@ -289,9 +289,9 @@ int8larger(int64 * val1, int64 * val2) #if FALSE *result = ((*val1 > *val2)? *val1: *val2); - return (result); + return result; #endif - return ((*val1 > *val2)? val1: val2); + return (*val1 > *val2)? val1: val2; } /* int8larger() */ int64 * @@ -307,9 +307,9 @@ int8smaller(int64 * val1, int64 * val2) #if FALSE *result = ((*val1 < *val2)? *val1: *val2); - return (result); + return result; #endif - return ((*val1 < *val2)? val1: val2); + return (*val1 < *val2)? val1: val2; } /* int8smaller() */ @@ -323,7 +323,7 @@ int84pl(int64 * val1, int32 val2) *result = *val1 + (int64) val2; - return (result); + return result; } /* int84pl() */ int64 * @@ -336,7 +336,7 @@ int84mi(int64 * val1, int32 val2) *result = *val1 - (int64) val2; - return (result); + return result; } /* int84mi() */ int64 * @@ -349,7 +349,7 @@ int84mul(int64 * val1, int32 val2) *result = *val1 * (int64) val2; - return (result); + return result; } /* int84mul() */ int64 * @@ -362,7 +362,7 @@ int84div(int64 * val1, int32 val2) *result = *val1 / (int64) val2; - return (result); + return result; } /* int84div() */ @@ -376,7 +376,7 @@ int48pl(int32 val1, int64 * val2) *result = (int64) val1 + *val2; - return (result); + return result; } /* int48pl() */ int64 * @@ -389,7 +389,7 @@ int48mi(int32 val1, int64 * val2) *result = (int64) val1 - *val2; - return (result); + return result; } /* int48mi() */ int64 * @@ -402,7 +402,7 @@ int48mul(int32 val1, int64 * val2) *result = (int64) val1 * *val2; - return (result); + return result; } /* int48mul() */ int64 * @@ -415,7 +415,7 @@ int48div(int32 val1, int64 * val2) *result = (int64) val1 / *val2; - return (result); + return result; } /* int48div() */ @@ -430,7 +430,7 @@ int48(int32 val) *result = val; - return (result); + return result; } /* int48() */ int32 @@ -453,7 +453,7 @@ int84(int64 * val) result = *val; - return (result); + return result; } /* int84() */ #if FALSE @@ -466,7 +466,7 @@ int28 (int16 val) *result = val; - return (result); + return result; } /* int28() */ int16 @@ -482,7 +482,7 @@ int82(int64 * val) result = *val; - return (result); + return result; } /* int82() */ #endif @@ -494,7 +494,7 @@ i8tod(int64 * val) *result = *val; - return (result); + return result; } /* i8tod() */ /* dtoi8() @@ -517,5 +517,5 @@ dtoi8(float64 val) *result = *val; - return (result); + return result; } /* dtoi8() */ diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 0cfaff9edf..bae7ae062e 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -79,7 +79,7 @@ fixedlen_like(char *s, struct varlena * p, int charlen) pfree(sterm); pfree(pterm); - return ((bool) result); + return (bool) result; } bool @@ -87,13 +87,13 @@ namelike(NameData *n, struct varlena * p) { if (!n) return FALSE; - return (fixedlen_like(n->data, p, NAMEDATALEN)); + return fixedlen_like(n->data, p, NAMEDATALEN); } bool namenlike(NameData *s, struct varlena * p) { - return (!namelike(s, p)); + return !namelike(s, p); } bool @@ -101,17 +101,17 @@ textlike(struct varlena * s, struct varlena * p) { if (!s) return FALSE; - return (fixedlen_like(VARDATA(s), p, VARSIZE(s) - VARHDRSZ)); + return fixedlen_like(VARDATA(s), p, VARSIZE(s) - VARHDRSZ); } bool textnlike(struct varlena * s, struct varlena * p) { - return (!textlike(s, p)); + return !textlike(s, p); } -/* $Revision: 1.18 $ +/* $Revision: 1.19 $ ** "like.c" A first attempt at a LIKE operator for Postgres95. ** ** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986. @@ -193,5 +193,5 @@ like(pg_wchar *text, pg_wchar *p) { if (p[0] == '%' && p[1] == '\0') return TRUE; - return (DoMatch(text, p) == LIKE_TRUE); + return DoMatch(text, p) == LIKE_TRUE; } diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index d91ea44e95..83632d70ca 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.13 1998/06/09 19:20:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.14 1998/09/01 03:26:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,9 +28,9 @@ nullvalue(Datum value, bool *isNull) if (*isNull) { *isNull = false; - return (true); + return true; } - return (false); + return false; } @@ -43,9 +43,9 @@ nonnullvalue(Datum value, bool *isNull) if (*isNull) { *isNull = false; - return (false); + return false; } - return (true); + return true; } @@ -105,5 +105,5 @@ oidsrand(int32 X) int32 userfntest(int i) { - return (i); + return i; } diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 56cd519f55..e5dd3c0316 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.44 1998/07/19 10:08:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.45 1998/09/01 03:26:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -96,7 +96,7 @@ GetCurrentAbsoluteTime(void) CTZName, CTimeZone); #endif - return ((AbsoluteTime) now); + return (AbsoluteTime) now; } /* GetCurrentAbsoluteTime() */ @@ -202,13 +202,13 @@ tm2abstime(struct tm * tm, int tz) || tm->tm_hour < 0 || tm->tm_hour >= 24 || tm->tm_min < 0 || tm->tm_min > 59 || tm->tm_sec < 0 || tm->tm_sec > 59) - return (INVALID_ABSTIME); + return INVALID_ABSTIME; day = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(1970, 1, 1)); /* check for time out of range */ if ((day < MIN_DAYNUM) || (day > MAX_DAYNUM)) - return (INVALID_ABSTIME); + return INVALID_ABSTIME; /* convert to seconds */ sec = tm->tm_sec + tz + (tm->tm_min + (day * 24 + tm->tm_hour) * 60) * 60; @@ -216,13 +216,13 @@ tm2abstime(struct tm * tm, int tz) /* check for overflow */ if ((day == MAX_DAYNUM && sec < 0) || (day == MIN_DAYNUM && sec > 0)) - return (INVALID_ABSTIME); + return INVALID_ABSTIME; /* check for reserved values (e.g. "current" on edge of usual range */ if (!AbsoluteTimeIsReal(sec)) - return (INVALID_ABSTIME); + return INVALID_ABSTIME; - return (sec); + return sec; } /* tm2abstime() */ @@ -338,7 +338,7 @@ nabstimeout(AbsoluteTime time) result = palloc(strlen(buf) + 1); strcpy(result, buf); - return (result); + return result; } /* nabstimeout() */ @@ -358,7 +358,7 @@ AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2) if (time2 == CURRENT_ABSTIME) time2 = GetCurrentTransactionStartTime(); - return (time1 < time2); + return time1 < time2; } bool @@ -373,7 +373,7 @@ AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2) if (time2 == CURRENT_ABSTIME) time2 = GetCurrentTransactionStartTime(); - return (time1 > time2); + return time1 > time2; } @@ -399,78 +399,78 @@ bool abstimeeq(AbsoluteTime t1, AbsoluteTime t2) { if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return (FALSE); + return FALSE; if (t1 == CURRENT_ABSTIME) t1 = GetCurrentTransactionStartTime(); if (t2 == CURRENT_ABSTIME) t2 = GetCurrentTransactionStartTime(); - return (t1 == t2); + return t1 == t2; } bool abstimene(AbsoluteTime t1, AbsoluteTime t2) { if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return (FALSE); + return FALSE; if (t1 == CURRENT_ABSTIME) t1 = GetCurrentTransactionStartTime(); if (t2 == CURRENT_ABSTIME) t2 = GetCurrentTransactionStartTime(); - return (t1 != t2); + return t1 != t2; } bool abstimelt(AbsoluteTime t1, AbsoluteTime t2) { if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return (FALSE); + return FALSE; if (t1 == CURRENT_ABSTIME) t1 = GetCurrentTransactionStartTime(); if (t2 == CURRENT_ABSTIME) t2 = GetCurrentTransactionStartTime(); - return (t1 < t2); + return t1 < t2; } bool abstimegt(AbsoluteTime t1, AbsoluteTime t2) { if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return (FALSE); + return FALSE; if (t1 == CURRENT_ABSTIME) t1 = GetCurrentTransactionStartTime(); if (t2 == CURRENT_ABSTIME) t2 = GetCurrentTransactionStartTime(); - return (t1 > t2); + return t1 > t2; } bool abstimele(AbsoluteTime t1, AbsoluteTime t2) { if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return (FALSE); + return FALSE; if (t1 == CURRENT_ABSTIME) t1 = GetCurrentTransactionStartTime(); if (t2 == CURRENT_ABSTIME) t2 = GetCurrentTransactionStartTime(); - return (t1 <= t2); + return t1 <= t2; } bool abstimege(AbsoluteTime t1, AbsoluteTime t2) { if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return (FALSE); + return FALSE; if (t1 == CURRENT_ABSTIME) t1 = GetCurrentTransactionStartTime(); if (t2 == CURRENT_ABSTIME) t2 = GetCurrentTransactionStartTime(); - return (t1 >= t2); + return t1 >= t2; } @@ -525,7 +525,7 @@ datetime_abstime(DateTime *datetime) }; }; - return (result); + return result; } /* datetime_abstime() */ /* abstime_datetime() @@ -566,5 +566,5 @@ abstime_datetime(AbsoluteTime abstime) break; }; - return (result); + return result; } /* abstime_datetime() */ diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index 679dadbe45..ad37559bd0 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.13 1998/06/15 19:29:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.14 1998/09/01 03:26:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ namein(char *s) int len; if (s == NULL) - return (NULL); + return NULL; result = (NameData *) palloc(NAMEDATALEN); /* always keep it null-padded */ StrNCpy(result->data, s, NAMEDATALEN); @@ -49,7 +49,7 @@ namein(char *s) *(result->data + len) = '\0'; len++; } - return (result); + return result; } /* @@ -89,49 +89,49 @@ nameeq(NameData *arg1, NameData *arg2) if (!arg1 || !arg2) return 0; else - return ((bool) strncmp(arg1->data, arg2->data, NAMEDATALEN) == 0); + return (bool) strncmp(arg1->data, arg2->data, NAMEDATALEN) == 0; } bool namene(NameData *arg1, NameData *arg2) { if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); - return ((bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) != 0)); + return (bool) 0; + return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) != 0); } bool namelt(NameData *arg1, NameData *arg2) { if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); - return ((bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) < 0)); + return (bool) 0; + return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) < 0); } bool namele(NameData *arg1, NameData *arg2) { if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); - return ((bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) <= 0)); + return (bool) 0; + return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) <= 0); } bool namegt(NameData *arg1, NameData *arg2) { if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; - return ((bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) > 0)); + return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) > 0); } bool namege(NameData *arg1, NameData *arg2) { if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; - return ((bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) >= 0)); + return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) >= 0); } @@ -141,16 +141,16 @@ int namecpy(Name n1, Name n2) { if (!n1 || !n2) - return (-1); + return -1; strncpy(n1->data, n2->data, NAMEDATALEN); - return (0); + return 0; } #ifdef NOT_USED int namecat(Name n1, Name n2) { - return (namestrcat(n1, n2->data)); /* n2 can't be any longer than n1 */ + return namestrcat(n1, n2->data); /* n2 can't be any longer than n1 */ } #endif @@ -158,16 +158,16 @@ namecat(Name n1, Name n2) int namecmp(Name n1, Name n2) { - return (strncmp(n1->data, n2->data, NAMEDATALEN)); + return strncmp(n1->data, n2->data, NAMEDATALEN); } int namestrcpy(Name name, char *str) { if (!name || !str) - return (-1); + return -1; StrNCpy(name->data, str, NAMEDATALEN); - return (0); + return 0; } #ifdef NOT_USED @@ -179,7 +179,7 @@ namestrcat(Name name, char *str) *q; if (!name || !str) - return (-1); + return -1; for (i = 0, p = name->data; i < NAMEDATALEN && *p; ++i, ++p) ; for (q = str; i < NAMEDATALEN; ++i, ++p, ++q) @@ -188,7 +188,7 @@ namestrcat(Name name, char *str) if (!*q) break; } - return (0); + return 0; } #endif @@ -197,12 +197,12 @@ int namestrcmp(Name name, char *str) { if (!name && !str) - return (0); + return 0; if (!name) - return (-1); /* NULL < anything */ + return -1; /* NULL < anything */ if (!str) - return (1); /* NULL < anything */ - return (strncmp(name->data, str, NAMEDATALEN)); + return 1; /* NULL < anything */ + return strncmp(name->data, str, NAMEDATALEN); } /***************************************************************************** diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c index 4658d29b49..0bb9412e0e 100644 --- a/src/backend/utils/adt/not_in.c +++ b/src/backend/utils/adt/not_in.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.11 1998/08/19 02:02:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.12 1998/09/01 03:26:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,7 +83,7 @@ int4notin(int16 not_in_arg, char *relation_and_attr) { value = heap_getattr(current_tuple, (AttrNumber) attrid, - RelationGetTupleDescriptor(relation_to_scan), + RelationGetDescr(relation_to_scan), &dummy); integer_value = DatumGetInt16(value); @@ -93,7 +93,7 @@ int4notin(int16 not_in_arg, char *relation_and_attr) /* close the relation */ heap_close(relation_to_scan); - return (retval); + return retval; } bool @@ -101,7 +101,7 @@ oidnotin(Oid the_oid, char *compare) { if (the_oid == InvalidOid) return false; - return (int4notin(the_oid, compare)); + return int4notin(the_oid, compare); } /* @@ -117,7 +117,7 @@ my_varattno(Relation rd, char *a) for (i = 0; i < rd->rd_rel->relnatts; i++) { if (!namestrcmp(&rd->rd_att->attrs[i]->attname, a)) - return (i + 1); + return i + 1; } - return (-1); + return -1; } diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 5a60a67079..86a999709f 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.24 1998/06/15 19:29:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.25 1998/09/01 03:26:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,7 +106,7 @@ pg_atoi(char *s, int size, int c) default: elog(ERROR, "pg_atoi: invalid result size: %d", size); } - return ((int32) l); + return (int32) l; } /* @@ -177,10 +177,10 @@ ftoa(double value, char *ascii, int width, int prec1, char format) { MemSet(ascii, '*', width - 2); ascii[width] = 0; - return (0); + return 0; } strcpy(ascii, out); - return (ret); + return ret; #else auto int expon; auto int sign; @@ -271,7 +271,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format) for (avail = width; avail > 0; avail--) *a++ = '*'; *a = 0; - return (0); + return 0; } /* it fits; output the number */ @@ -330,7 +330,7 @@ frac_out: /* finally, we can return */ *a = 0; avail = a - ascii; - return (avail); + return avail; #endif } @@ -455,14 +455,14 @@ atof1(char *str, double *val) { /* if no exponent, then nothing */ if (c != 0) - return (-1); + return -1; } /* store the result and exit */ if (minus) v = -v; *val = v; - return (0); + return 0; } #endif diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index 3e1097f0e0..153e80854a 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.16 1998/08/19 02:02:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.17 1998/09/01 03:26:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,12 +31,12 @@ Oid * oid8in(char *oidString) { - Oid (*result)[]; + Oid **result; int nums; if (oidString == NULL) - return (NULL); - result = (Oid (*)[]) palloc(sizeof(Oid[8])); + return NULL; + result = (Oid **) palloc(sizeof(Oid[8])); if ((nums = sscanf(oidString, "%d%d%d%d%d%d%d%d", &(*result)[0], &(*result)[1], @@ -51,14 +51,14 @@ oid8in(char *oidString) (*result)[nums++] = 0; while (nums < 8); } - return ((Oid *) result); + return (Oid *) result; } /* * oid8out - converts internal form to "num num ..." */ char * -oid8out(Oid (*oidArray)[]) +oid8out(Oid **oidArray) { int num; Oid *sp; @@ -70,7 +70,7 @@ oid8out(Oid (*oidArray)[]) result = (char *) palloc(2); result[0] = '-'; result[1] = '\0'; - return (result); + return result; } /* assumes sign, 10 digits, ' ' */ @@ -84,19 +84,19 @@ oid8out(Oid (*oidArray)[]) *rp++ = ' '; } *--rp = '\0'; - return (result); + return result; } Oid oidin(char *s) { - return (int4in(s)); + return int4in(s); } char * oidout(Oid o) { - return (int4out(o)); + return int4out(o); } /***************************************************************************** @@ -110,23 +110,23 @@ oidout(Oid o) bool oideq(Oid arg1, Oid arg2) { - return (arg1 == arg2); + return arg1 == arg2; } bool oidne(Oid arg1, Oid arg2) { - return (arg1 != arg2); + return arg1 != arg2; } bool -oid8eq(Oid arg1[], Oid arg2[]) +oid8eq(Oid *arg1, Oid *arg2) { return (bool) (memcmp(arg1, arg2, 8 * sizeof(Oid)) == 0); } bool -oid8lt(Oid arg1[], Oid arg2[]) +oid8lt(Oid *arg1, Oid *arg2) { int i; for (i=0; i < 8; i++) @@ -136,7 +136,7 @@ oid8lt(Oid arg1[], Oid arg2[]) } bool -oid8le(Oid arg1[], Oid arg2[]) +oid8le(Oid *arg1, Oid *arg2) { int i; for (i=0; i < 8; i++) @@ -146,7 +146,7 @@ oid8le(Oid arg1[], Oid arg2[]) } bool -oid8ge(Oid arg1[], Oid arg2[]) +oid8ge(Oid *arg1, Oid *arg2) { int i; for (i=0; i < 8; i++) @@ -156,7 +156,7 @@ oid8ge(Oid arg1[], Oid arg2[]) } bool -oid8gt(Oid arg1[], Oid arg2[]) +oid8gt(Oid *arg1, Oid *arg2) { int i; for (i=0; i < 8; i++) @@ -169,14 +169,14 @@ bool oideqint4(Oid arg1, int32 arg2) { /* oid is unsigned, but int4 is signed */ - return (arg2 >= 0 && arg1 == arg2); + return arg2 >= 0 && arg1 == arg2; } bool int4eqoid(int32 arg1, Oid arg2) { /* oid is unsigned, but int4 is signed */ - return (arg1 >= 0 && arg1 == arg2); + return arg1 >= 0 && arg1 == arg2; } text * @@ -196,7 +196,7 @@ oid_text(Oid oid) memmove(VARDATA(result), str, (len - VARHDRSZ)); pfree(str); - return (result); + return result; } /* oid_text() */ Oid @@ -216,5 +216,5 @@ text_oid(text *string) result = oidin(str); pfree(str); - return (result); + return result; } /* oid_text() */ diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index abf6cfb608..377c3285d9 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.18 1998/06/15 19:29:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.19 1998/09/01 03:26:14 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -155,7 +155,7 @@ RE_compile_and_execute(struct varlena * text_re, char *text, int cflags) } /* not reached */ - return (0); + return 0; } @@ -189,7 +189,7 @@ fixedlen_regexeq(char *s, struct varlena * p, int charlen, int cflags) pfree(sterm); - return ((bool) result); + return (bool) result; } @@ -202,27 +202,27 @@ nameregexeq(NameData *n, struct varlena * p) { if (!n) return FALSE; - return (fixedlen_regexeq(n->data, p, NAMEDATALEN, REG_EXTENDED)); + return fixedlen_regexeq(n->data, p, NAMEDATALEN, REG_EXTENDED); } bool nameregexne(NameData *s, struct varlena * p) { - return (!nameregexeq(s, p)); + return !nameregexeq(s, p); } bool textregexeq(struct varlena * s, struct varlena * p) { if (!s) - return (FALSE); - return (fixedlen_regexeq(VARDATA(s), p, VARSIZE(s) - VARHDRSZ, REG_EXTENDED)); + return FALSE; + return fixedlen_regexeq(VARDATA(s), p, VARSIZE(s) - VARHDRSZ, REG_EXTENDED); } bool textregexne(struct varlena * s, struct varlena * p) { - return (!textregexeq(s, p)); + return !textregexeq(s, p); } @@ -242,7 +242,7 @@ texticregexeq(struct varlena * s, struct varlena * p) bool texticregexne(struct varlena * s, struct varlena * p) { - return (!texticregexeq(s, p)); + return !texticregexeq(s, p); } bool @@ -257,5 +257,5 @@ nameicregexeq(NameData *n, struct varlena * p) bool nameicregexne(NameData *s, struct varlena * p) { - return (!nameicregexeq(s, p)); + return !nameicregexeq(s, p); } diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 6000d2a6a3..4a9f1a0bc0 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.24 1998/08/31 07:55:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.25 1998/09/01 03:26:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,7 @@ regprocin(char *pro_name_and_oid) RegProcedure result = (Oid) 0; if (pro_name_and_oid == NULL) - return (0); + return 0; if (!IsBootstrapProcessingMode()) @@ -80,7 +80,7 @@ regprocin(char *pro_name_and_oid) { elog(ERROR, "regprocin: could not open %s", ProcedureRelationName); - return (0); + return 0; } ScanKeyEntryInitialize(&key, (bits16) 0, @@ -94,14 +94,14 @@ regprocin(char *pro_name_and_oid) heap_close(proc); elog(ERROR, "regprocin: could not being scan of %s", ProcedureRelationName); - return (0); + return 0; } proctup = heap_getnext(procscan, 0); if (HeapTupleIsValid(proctup)) { result = (RegProcedure) heap_getattr(proctup, ObjectIdAttributeNumber, - RelationGetTupleDescriptor(proc), + RelationGetDescr(proc), &isnull); if (isnull) elog(FATAL, "regprocin: null procedure %s", pro_name_and_oid); @@ -160,7 +160,7 @@ regprocout(RegProcedure proid) { elog(ERROR, "regprocout: could not open %s", ProcedureRelationName); - return (0); + return 0; } ScanKeyEntryInitialize(&key, (bits16) 0, @@ -174,7 +174,7 @@ regprocout(RegProcedure proid) heap_close(proc); elog(ERROR, "regprocout: could not being scan of %s", ProcedureRelationName); - return (0); + return 0; } proctup = heap_getnext(procscan, 0); if (HeapTupleIsValid(proctup)) @@ -183,7 +183,7 @@ regprocout(RegProcedure proid) bool isnull; s = (char *) heap_getattr(proctup, 1, - RelationGetTupleDescriptor(proc), &isnull); + RelationGetDescr(proc), &isnull); if (!isnull) StrNCpy(result, s, NAMEDATALEN); else @@ -196,20 +196,20 @@ regprocout(RegProcedure proid) } heap_endscan(procscan); heap_close(proc); - return (result); + return result; } #ifdef EBUG elog(DEBUG, "regprocout: no such procedure %d", proid); #endif /* defined(EBUG) */ - return (result); + return result; } /* * int8typeout - converts int8 type oids to "typname" list */ text * -oid8types(Oid (*oidArray)[]) +oid8types(Oid **oidArray) { HeapTuple typetup; text *result; @@ -220,7 +220,7 @@ oid8types(Oid (*oidArray)[]) { result = (text *) palloc(VARHDRSZ); VARSIZE(result) = 0; - return (result); + return result; } result = (text *) palloc(NAMEDATALEN * 8 + 8 + VARHDRSZ); @@ -238,7 +238,7 @@ oid8types(Oid (*oidArray)[]) { char *s; - s = ((TypeTupleForm) GETSTRUCT(typetup))->typname.data; + s = ((Form_pg_type) GETSTRUCT(typetup))->typname.data; StrNCpy(VARDATA(result) + strlen(VARDATA(result)), s, NAMEDATALEN); strcat(VARDATA(result), " "); @@ -246,7 +246,7 @@ oid8types(Oid (*oidArray)[]) } } VARSIZE(result) = strlen(VARDATA(result)) + VARHDRSZ; - return (result); + return result; } diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 3b7c3e98fa..593d670d37 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * out of it's tuple * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.1 1998/08/24 01:38:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.2 1998/09/01 03:26:17 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -1213,7 +1213,7 @@ char * get_const_expr(Const *constval) { HeapTuple typetup; - TypeTupleForm typeStruct; + Form_pg_type typeStruct; FmgrInfo finfo_output; char *extval; bool isnull = FALSE; @@ -1227,7 +1227,7 @@ get_const_expr(Const *constval) if (!HeapTupleIsValid(typetup)) elog(ERROR, "cache lookup of type %d failed", constval->consttype); - typeStruct = (TypeTupleForm) GETSTRUCT(typetup); + typeStruct = (Form_pg_type) GETSTRUCT(typetup); fmgr_info(typeStruct->typoutput, &finfo_output); extval = (char *)(*fmgr_faddr(&finfo_output))(constval->constvalue, @@ -1267,7 +1267,7 @@ static char * get_attribute_name(Oid relid, int2 attnum) { HeapTuple atttup; - AttributeTupleForm attStruct; + Form_pg_attribute attStruct; atttup = SearchSysCacheTuple(ATTNUM, ObjectIdGetDatum(relid), (Datum)attnum, 0, 0); @@ -1275,7 +1275,7 @@ get_attribute_name(Oid relid, int2 attnum) elog(ERROR, "cache lookup of attribute %d in relation %d failed", attnum, relid); - attStruct = (AttributeTupleForm) GETSTRUCT(atttup); + attStruct = (Form_pg_attribute) GETSTRUCT(atttup); return nameout(&(attStruct->attname)); } @@ -1329,7 +1329,7 @@ check_if_rte_used(int rt_index, Node *node, int sup) case T_Var: { Var *var = (Var *)node; - return (var->varno == rt_index && var->varlevelsup == sup); + return var->varno == rt_index && var->varlevelsup == sup; } break; diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index a5a0b86e4a..6389dc4b0d 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.21 1998/08/19 02:03:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.22 1998/09/01 03:26:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,7 +63,7 @@ eqsel(Oid opid, *result = 0.1; else *result = (float64data) getattdisbursion(relid, (int) attno); - return (result); + return result; } /* @@ -80,7 +80,7 @@ neqsel(Oid opid, result = eqsel(opid, relid, attno, value, flag); *result = 1.0 - *result; - return (result); + return result; } /* @@ -114,7 +114,7 @@ intltsel(Oid opid, if (*highchar == 'n' || *lowchar == 'n') { *result = 1.0 / 3.0; - return (result); + return result; } high = atol(highchar); low = atol(lowchar); @@ -152,7 +152,7 @@ intltsel(Oid opid, } } } - return (result); + return result; } /* @@ -174,7 +174,7 @@ intgtsel(Oid opid, else notflag = flag | SEL_RIGHT; result = intltsel(opid, relid, attno, value, (int32) notflag); - return (result); + return result; } /* @@ -206,7 +206,7 @@ eqjoinsel(Oid opid, else *result = (float64data) max; } - return (result); + return result; } /* @@ -223,7 +223,7 @@ neqjoinsel(Oid opid, result = eqjoinsel(opid, relid1, attno1, relid2, attno2); *result = 1.0 - *result; - return (result); + return result; } /* @@ -240,7 +240,7 @@ intltjoinsel(Oid opid, result = (float64) palloc(sizeof(float64data)); *result = 1.0 / 3.0; - return (result); + return result; } /* @@ -257,7 +257,7 @@ intgtjoinsel(Oid opid, result = (float64) palloc(sizeof(float64data)); *result = 1.0 / 3.0; - return (result); + return result; } /* @@ -289,11 +289,11 @@ getattdisbursion(Oid relid, AttrNumber attnum) { elog(ERROR, "getattdisbursion: no attribute tuple %d %d", relid, attnum); - return (0); + return 0; } - nvals = ((AttributeTupleForm) GETSTRUCT(atp))->attdisbursion; + nvals = ((Form_pg_attribute) GETSTRUCT(atp))->attdisbursion; if (nvals > 0) - return (nvals); + return nvals; atp = SearchSysCacheTuple(RELOID, ObjectIdGetDatum(relid), @@ -306,14 +306,14 @@ getattdisbursion(Oid relid, AttrNumber attnum) if (!HeapTupleIsValid(atp)) { elog(ERROR, "getattdisbursion: no relation tuple %d", relid); - return (0); + return 0; } ntuples = ((Form_pg_class) GETSTRUCT(atp))->reltuples; /* Look above how nvals is used. - vadim 04/09/97 */ if (ntuples > 0) nvals = 1.0 / ntuples; - return (nvals); + return nvals; } /* @@ -366,14 +366,14 @@ gethilokey(Oid relid, *high = textout((struct varlena *) heap_getattr(tuple, Anum_pg_statistic_stahikey, - RelationGetTupleDescriptor(rel), + RelationGetDescr(rel), &isnull)); if (isnull) elog(DEBUG, "gethilokey: high key is null"); *low = textout((struct varlena *) heap_getattr(tuple, Anum_pg_statistic_stalokey, - RelationGetTupleDescriptor(rel), + RelationGetDescr(rel), &isnull)); if (isnull) elog(DEBUG, "gethilokey: low key is null"); @@ -420,7 +420,7 @@ btreesel(Oid operatorObjectId, if (*result < 0.0 || *result > 1.0) elog(ERROR, "Btree Selectivity: bad value %lf", *result); - return (result); + return result; } float64 @@ -465,13 +465,13 @@ btreenpage(Oid operatorObjectId, if (!HeapTupleIsValid(atp)) { elog(ERROR, "btreenpage: no index tuple %d", indexrelid); - return (0); + return 0; } npage = ((Form_pg_class) GETSTRUCT(atp))->relpages; result = (float64) palloc(sizeof(float64data)); *result = *temp * npage; - return (result); + return result; } float64 @@ -504,7 +504,7 @@ hashsel(Oid operatorObjectId, if (!HeapTupleIsValid(atp)) { elog(ERROR, "hashsel: no index tuple %d", indexrelid); - return (0); + return 0; } ntuples = ((Form_pg_class) GETSTRUCT(atp))->reltuples; if (ntuples > 0) @@ -530,7 +530,7 @@ hashsel(Oid operatorObjectId, if (*result < 0.0 || *result > 1.0) elog(ERROR, "Hash Table Selectivity: bad value %lf", *result); - return (result); + return result; } @@ -557,7 +557,7 @@ hashnpage(Oid operatorObjectId, if (!HeapTupleIsValid(atp)) { elog(ERROR, "hashsel: no index tuple %d", indexrelid); - return (0); + return 0; } @@ -592,7 +592,7 @@ hashnpage(Oid operatorObjectId, npage = ((Form_pg_class) GETSTRUCT(atp))->relpages; result = (float64) palloc(sizeof(float64data)); *result = *temp * npage; - return (result); + return result; } diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c index 1d150805ce..588876dadd 100644 --- a/src/backend/utils/adt/sets.c +++ b/src/backend/utils/adt/sets.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.16 1998/08/19 02:03:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.17 1998/09/01 03:26:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -131,7 +131,7 @@ SetDefine(char *querystr, char *typename) else elog(ERROR, "setin: could not find new set oid tuple"); - if (RelationGetRelationTupleForm(procrel)->relhasindex) + if (RelationGetForm(procrel)->relhasindex) { Relation idescs[Num_pg_proc_indices]; diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 8d46876586..3c67ab854e 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -63,53 +63,53 @@ now(void) time_t sec; sec = GetCurrentTransactionStartTime(); - return (sec); + return sec; } bool timestampeq(time_t t1, time_t t2) { - return (abstimeeq(t1, t2)); + return abstimeeq(t1, t2); } bool timestampne(time_t t1, time_t t2) { - return (abstimene(t1, t2)); + return abstimene(t1, t2); } bool timestamplt(time_t t1, time_t t2) { - return (abstimelt(t1, t2)); + return abstimelt(t1, t2); } bool timestampgt(time_t t1, time_t t2) { - return (abstimegt(t1, t2)); + return abstimegt(t1, t2); } bool timestample(time_t t1, time_t t2) { - return (abstimele(t1, t2)); + return abstimele(t1, t2); } bool timestampge(time_t t1, time_t t2) { - return (abstimege(t1, t2)); + return abstimege(t1, t2); } DateTime * timestamp_datetime(time_t timestamp) { - return (abstime_datetime((AbsoluteTime) timestamp)); + return abstime_datetime((AbsoluteTime) timestamp); } /* timestamp_datetime() */ time_t datetime_timestamp(DateTime *datetime) { - return ((AbsoluteTime) datetime_abstime(datetime)); + return (AbsoluteTime) datetime_abstime(datetime); } /* datetime_timestamp() */ diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index bb64722176..9f76c7c61a 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.37 1998/07/24 03:31:42 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.38 1998/09/01 03:26:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,7 @@ bpcharin(char *s, int dummy, int32 atttypmod) int i; if (s == NULL) - return ((char *) NULL); + return (char *) NULL; if (atttypmod == -1) { @@ -99,7 +99,7 @@ bpcharin(char *s, int dummy, int32 atttypmod) /* blank pad the string if necessary */ for (; i < len; i++) *r++ = ' '; - return (result); + return result; } char * @@ -125,7 +125,7 @@ bpcharout(char *s) convertstr(result, len, 1); #endif - return (result); + return result; } /* bpchar() @@ -141,10 +141,10 @@ bpchar(char *s, int32 len) int i; if (s == NULL) - return ((char *) NULL); + return (char *) NULL; if ((len == -1) || (len == VARSIZE(s))) - return (s); + return s; rlen = len - VARHDRSZ; @@ -186,7 +186,7 @@ printf("'\n"); for (; i < rlen; i++) *r++ = ' '; - return (result); + return result; } /* bpchar() */ @@ -196,7 +196,7 @@ printf("'\n"); int32 bpchar_char(char *s) { - return ((int32) *VARDATA(s)); + return (int32) *VARDATA(s); } /* bpchar_char() */ /* char_bpchar() @@ -226,7 +226,7 @@ bpchar_name(char *s) int len; if (s == NULL) - return (NULL); + return NULL; len = VARSIZE(s) - VARHDRSZ; if (len > NAMEDATALEN) len = NAMEDATALEN; @@ -250,7 +250,7 @@ printf("bpchar- convert string length %d (%d) ->%d\n", len++; } - return (result); + return result; } /* bpchar_name() */ /* name_bpchar() @@ -263,7 +263,7 @@ name_bpchar(NameData *s) int len; if (s == NULL) - return (NULL); + return NULL; len = strlen(s->data); @@ -276,7 +276,7 @@ printf("bpchar- convert string length %d (%d) ->%d\n", strncpy(VARDATA(result), s->data, len); VARSIZE(result) = len + VARHDRSZ; - return (result); + return result; } /* name_bpchar() */ @@ -297,7 +297,7 @@ varcharin(char *s, int dummy, int32 atttypmod) int len; if (s == NULL) - return ((char *) NULL); + return (char *) NULL; len = strlen(s) + VARHDRSZ; if (atttypmod != -1 && len > atttypmod) @@ -314,7 +314,7 @@ varcharin(char *s, int dummy, int32 atttypmod) convertstr(result + VARHDRSZ, len, 0); #endif - return (result); + return result; } char * @@ -340,7 +340,7 @@ varcharout(char *s) convertstr(result, len, 1); #endif - return (result); + return result; } /* varchar() @@ -354,11 +354,11 @@ varchar(char *s, int32 slen) int len; if (s == NULL) - return ((char *) NULL); + return (char *) NULL; len = VARSIZE(s); if ((slen == -1) || (len <= slen)) - return ((char *) s); + return (char *) s; /* only reach here if we need to truncate string... */ @@ -371,7 +371,7 @@ varchar(char *s, int32 slen) VARSIZE(result) = slen; strncpy(VARDATA(result), VARDATA(s), len); - return (result); + return result; } /* varchar() */ @@ -392,7 +392,7 @@ bcTruelen(char *arg) if (s[i] != ' ') break; } - return (i + 1); + return i + 1; } int32 @@ -416,7 +416,7 @@ bpcharlen(char *arg) } return(len); #else - return (bcTruelen(arg)); + return bcTruelen(arg); #endif } @@ -426,7 +426,7 @@ bpcharoctetlen(char *arg) if (!PointerIsValid(arg)) elog(ERROR, "Bad (null) char() external representation", NULL); - return (bcTruelen(arg)); + return bcTruelen(arg); } bool @@ -436,14 +436,14 @@ bpchareq(char *arg1, char *arg2) len2; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = bcTruelen(arg1); len2 = bcTruelen(arg2); if (len1 != len2) return 0; - return (strncmp(VARDATA(arg1), VARDATA(arg2), len1) == 0); + return strncmp(VARDATA(arg1), VARDATA(arg2), len1) == 0; } bool @@ -453,14 +453,14 @@ bpcharne(char *arg1, char *arg2) len2; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = bcTruelen(arg1); len2 = bcTruelen(arg2); if (len1 != len2) return 1; - return (strncmp(VARDATA(arg1), VARDATA(arg2), len1) != 0); + return strncmp(VARDATA(arg1), VARDATA(arg2), len1) != 0; } bool @@ -471,15 +471,15 @@ bpcharlt(char *arg1, char *arg2) int cmp; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = bcTruelen(arg1); len2 = bcTruelen(arg2); cmp = varstr_cmp(VARDATA(arg1), len1, VARDATA(arg2), len2); if (cmp == 0) - return (len1 < len2); + return len1 < len2; else - return (cmp < 0); + return cmp < 0; } bool @@ -490,7 +490,7 @@ bpcharle(char *arg1, char *arg2) int cmp; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = bcTruelen(arg1); len2 = bcTruelen(arg2); @@ -509,15 +509,15 @@ bpchargt(char *arg1, char *arg2) int cmp; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = bcTruelen(arg1); len2 = bcTruelen(arg2); cmp = varstr_cmp(VARDATA(arg1), len1, VARDATA(arg2), len2); if (cmp == 0) - return (len1 > len2); + return len1 > len2; else - return (cmp > 0); + return cmp > 0; } bool @@ -528,7 +528,7 @@ bpcharge(char *arg1, char *arg2) int cmp; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = bcTruelen(arg1); len2 = bcTruelen(arg2); @@ -582,7 +582,7 @@ varcharlen(char *arg) } return(len); #else - return (VARSIZE(arg) - VARHDRSZ); + return VARSIZE(arg) - VARHDRSZ; #endif } @@ -591,7 +591,7 @@ varcharoctetlen(char *arg) { if (!PointerIsValid(arg)) elog(ERROR, "Bad (null) varchar() external representation", NULL); - return (VARSIZE(arg) - VARHDRSZ); + return VARSIZE(arg) - VARHDRSZ; } bool @@ -601,7 +601,7 @@ varchareq(char *arg1, char *arg2) len2; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = VARSIZE(arg1) - VARHDRSZ; len2 = VARSIZE(arg2) - VARHDRSZ; @@ -609,7 +609,7 @@ varchareq(char *arg1, char *arg2) if (len1 != len2) return 0; - return (strncmp(VARDATA(arg1), VARDATA(arg2), len1) == 0); + return strncmp(VARDATA(arg1), VARDATA(arg2), len1) == 0; } bool @@ -619,14 +619,14 @@ varcharne(char *arg1, char *arg2) len2; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = VARSIZE(arg1) - VARHDRSZ; len2 = VARSIZE(arg2) - VARHDRSZ; if (len1 != len2) return 1; - return (strncmp(VARDATA(arg1), VARDATA(arg2), len1) != 0); + return strncmp(VARDATA(arg1), VARDATA(arg2), len1) != 0; } bool @@ -637,15 +637,15 @@ varcharlt(char *arg1, char *arg2) int cmp; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = VARSIZE(arg1) - VARHDRSZ; len2 = VARSIZE(arg2) - VARHDRSZ; cmp = varstr_cmp(VARDATA(arg1), len1, VARDATA(arg2), len2); if (cmp == 0) - return (len1 < len2); + return len1 < len2; else - return (cmp < 0); + return cmp < 0; } bool @@ -656,7 +656,7 @@ varcharle(char *arg1, char *arg2) int cmp; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = VARSIZE(arg1) - VARHDRSZ; len2 = VARSIZE(arg2) - VARHDRSZ; @@ -675,15 +675,15 @@ varchargt(char *arg1, char *arg2) int cmp; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = VARSIZE(arg1) - VARHDRSZ; len2 = VARSIZE(arg2) - VARHDRSZ; cmp = varstr_cmp(VARDATA(arg1), len1, VARDATA(arg2), len2); if (cmp == 0) - return (len1 > len2); + return len1 > len2; else - return (cmp > 0); + return cmp > 0; } bool @@ -694,7 +694,7 @@ varcharge(char *arg1, char *arg2) int cmp; if (arg1 == NULL || arg2 == NULL) - return ((bool) 0); + return (bool) 0; len1 = VARSIZE(arg1) - VARHDRSZ; len2 = VARSIZE(arg2) - VARHDRSZ; @@ -767,7 +767,7 @@ hashbpchar(struct varlena * key) } while (--loop); } } - return (n); + return n; } uint32 @@ -811,5 +811,5 @@ hashvarchar(struct varlena * key) } while (--loop); } } - return (n); + return n; } diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index cbb50f7eb4..22e0e98124 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.40 1998/08/29 04:09:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.41 1998/09/01 03:26:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,7 +76,7 @@ byteain(char *inputText) byte <<= 3; *rp++ = byte + VAL(*tp++); } - return (result); + return result; } /* @@ -103,7 +103,7 @@ byteaout(text *vlena) result = (char *) palloc(2); result[0] = '-'; result[1] = '\0'; - return (result); + return result; } vp = vlena->vl_dat; len = 1; /* empty string has 1 char */ @@ -138,7 +138,7 @@ byteaout(text *vlena) rp += 3; } *rp = '\0'; - return (result); + return result; } @@ -152,7 +152,7 @@ textin(char *inputText) int len; if (inputText == NULL) - return (NULL); + return NULL; len = strlen(inputText) + VARHDRSZ; result = (text *) palloc(len); @@ -164,7 +164,7 @@ textin(char *inputText) convertstr(VARDATA(result), len - VARHDRSZ, 0); #endif - return (result); + return result; } /* @@ -181,7 +181,7 @@ textout(text *vlena) result = (char *) palloc(2); result[0] = '-'; result[1] = '\0'; - return (result); + return result; } len = VARSIZE(vlena) - VARHDRSZ; result = (char *) palloc(len + 1); @@ -192,7 +192,7 @@ textout(text *vlena) convertstr(result, len, 1); #endif - return (result); + return result; } @@ -226,7 +226,7 @@ textlen(text *t) } return(len); #else - return (VARSIZE(t) - VARHDRSZ); + return VARSIZE(t) - VARHDRSZ; #endif } /* textlen() */ @@ -242,7 +242,7 @@ textoctetlen(text *t) if (!PointerIsValid(t)) elog(ERROR, "Null input to textoctetlen"); - return (VARSIZE(t) - VARHDRSZ); + return VARSIZE(t) - VARHDRSZ; } /* textoctetlen() */ @@ -266,7 +266,7 @@ textcat(text *t1, text *t2) text *result; if (!PointerIsValid(t1) || !PointerIsValid(t2)) - return (NULL); + return NULL; len1 = (VARSIZE(t1) - VARHDRSZ); if (len1 < 0) @@ -293,7 +293,7 @@ textcat(text *t1, text *t2) if (len2 > 0) memcpy(ptr + len1, VARDATA(t2), len2); - return (result); + return result; } /* textcat() */ /* @@ -392,10 +392,10 @@ textpos(text *t1, text *t2) #endif if (!PointerIsValid(t1) || !PointerIsValid(t2)) - return (0); + return 0; if (VARSIZE(t2) <= 0) - return (1); + return 1; len1 = (VARSIZE(t1) - VARHDRSZ); len2 = (VARSIZE(t2) - VARHDRSZ); @@ -429,7 +429,7 @@ textpos(text *t1, text *t2) pfree(ps1); pfree(ps2); #endif - return (pos); + return pos; } /* textpos() */ /* @@ -444,9 +444,9 @@ texteq(text *arg1, text *arg2) *a2p; if (arg1 == NULL || arg2 == NULL) - return ((bool) NULL); + return (bool) NULL; if ((len = arg1->vl_len) != arg2->vl_len) - return ((bool) 0); + return (bool) 0; a1p = arg1->vl_dat; a2p = arg2->vl_dat; @@ -458,14 +458,14 @@ texteq(text *arg1, text *arg2) len -= VARHDRSZ; while (len-- != 0) if (*a1p++ != *a2p++) - return ((bool) 0); - return ((bool) 1); + return (bool) 0; + return (bool) 1; } /* texteq() */ bool textne(text *arg1, text *arg2) { - return ((bool) !texteq(arg1, arg2)); + return (bool) !texteq(arg1, arg2); } /* varstr_cmp() @@ -504,7 +504,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2) result = (len1 < len2) ? -1 : 1; #endif - return (result); + return result; } /* varstr_cmp() */ /* text_cmp() @@ -522,7 +522,7 @@ text_cmp(text *arg1, text *arg2) int len1, len2; if (arg1 == NULL || arg2 == NULL) - return ((bool) FALSE); + return (bool) FALSE; a1p = VARDATA(arg1); a2p = VARDATA(arg2); @@ -554,13 +554,13 @@ text_le(text *arg1, text *arg2) bool text_gt(text *arg1, text *arg2) { - return ((bool) !text_le(arg1, arg2)); + return (bool) !text_le(arg1, arg2); } bool text_ge(text *arg1, text *arg2) { - return ((bool) !text_lt(arg1, arg2)); + return (bool) !text_lt(arg1, arg2); } /*------------------------------------------------------------- @@ -576,7 +576,7 @@ byteaGetSize(text *v) len = v->vl_len - sizeof(v->vl_len); - return (len); + return len; } /*------------------------------------------------------------- @@ -603,7 +603,7 @@ byteaGetByte(text *v, int32 n) byte = (unsigned char) (v->vl_dat[n]); - return ((int32) byte); + return (int32) byte; } /*------------------------------------------------------------- @@ -628,9 +628,9 @@ byteaGetBit(text *v, int32 n) byte = byteaGetByte(v, byteNo); if (byte & (1 << bitNo)) - return ((int32) 1); + return (int32) 1; else - return ((int32) 0); + return (int32) 0; } /*------------------------------------------------------------- @@ -672,7 +672,7 @@ byteaSetByte(text *v, int32 n, int32 newByte) */ res->vl_dat[n] = newByte; - return (res); + return res; } /*------------------------------------------------------------- @@ -718,7 +718,7 @@ byteaSetBit(text *v, int32 n, int32 newBit) */ res = byteaSetByte(v, byteNo, newByte); - return (res); + return res; } @@ -732,7 +732,7 @@ text_name(text *s) int len; if (s == NULL) - return (NULL); + return NULL; len = VARSIZE(s) - VARHDRSZ; if (len > NAMEDATALEN) len = NAMEDATALEN; @@ -751,7 +751,7 @@ printf("text- convert string length %d (%d) ->%d\n", len++; } - return (result); + return result; } /* text_name() */ /* name_text() @@ -764,7 +764,7 @@ name_text(NameData *s) int len; if (s == NULL) - return (NULL); + return NULL; len = strlen(s->data); @@ -777,5 +777,5 @@ printf("text- convert string length %d (%d) ->%d\n", strncpy(VARDATA(result), s->data, len); VARSIZE(result) = len + VARHDRSZ; - return (result); + return result; } /* name_text() */ |