mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid use of inline functions that are not declared static. Needed to

Browse Source 
conform to C99's brain-dead notion of how inline functions should work.
This commit is contained in:
Tom Lane 2002-10-31 19:11:48 +00:00
parent 2982b97f71
commit 5936055d46
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/dbase/dbf2pg.c
View File

@ -49,9 +49,10 @@ char *subarg = NULL;
char escape_buff[8192]; char escape_buff[8192];
void do_substitute(char *subarg, dbhead * dbh); void do_substitute(char *subarg, dbhead * dbh);
inline void strtoupper(char *string);
inline void strtolower(char *string); static inline void strtoupper(char *string);
static inline void strtolower(char *string);
void do_create(PGconn *, char *, dbhead *); void do_create(PGconn *, char *, dbhead *);
void do_inserts(PGconn *, char *, dbhead *); void do_inserts(PGconn *, char *, dbhead *);
int check_table(PGconn *, char *); int check_table(PGconn *, char *);
@ -88,7 +89,7 @@ isinteger(char *buff)
return 1; return 1;
} }
inline void static inline void
strtoupper(char *string) strtoupper(char *string)
{ {
while (*string != '\0') while (*string != '\0')
@ -98,7 +99,7 @@ strtoupper(char *string)
} }
} }
inline void static inline void
strtolower(char *string) strtolower(char *string)
{ {
while (*string != '\0') while (*string != '\0')

42
src/backend/utils/sort/tuplesort.c
View File

@ -78,7 +78,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.28 2002/10/04 17:19:55 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.29 2002/10/31 19:11:48 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1835,10 +1835,10 @@ myFunctionCall2(FmgrInfo *flinfo, Datum arg1, Datum arg2)
* and return a 3-way comparison result. This takes care of handling * and return a 3-way comparison result. This takes care of handling
* NULLs and sort ordering direction properly. * NULLs and sort ordering direction properly.
*/ */
inline int32 static inline int32
ApplySortFunction(FmgrInfo *sortFunction, SortFunctionKind kind, inlineApplySortFunction(FmgrInfo *sortFunction, SortFunctionKind kind,
Datum datum1, bool isNull1, Datum datum1, bool isNull1,
Datum datum2, bool isNull2) Datum datum2, bool isNull2)
{ {
switch (kind) switch (kind)
{ {
@ -1903,6 +1903,20 @@ ApplySortFunction(FmgrInfo *sortFunction, SortFunctionKind kind,
} }
} }
/*
* Non-inline ApplySortFunction() --- this is needed only to conform to
* C99's brain-dead notions about how to implement inline functions...
*/
int32
ApplySortFunction(FmgrInfo *sortFunction, SortFunctionKind kind,
Datum datum1, bool isNull1,
Datum datum2, bool isNull2)
{
return inlineApplySortFunction(sortFunction, kind,
datum1, isNull1,
datum2, isNull2);
}
/* /*
* Routines specialized for HeapTuple case * Routines specialized for HeapTuple case
@ -1929,9 +1943,10 @@ comparetup_heap(Tuplesortstate *state, const void *a, const void *b)
datum1 = heap_getattr(ltup, attno, tupDesc, &isnull1); datum1 = heap_getattr(ltup, attno, tupDesc, &isnull1);
datum2 = heap_getattr(rtup, attno, tupDesc, &isnull2); datum2 = heap_getattr(rtup, attno, tupDesc, &isnull2);
compare = ApplySortFunction(&scanKey->sk_func, compare = inlineApplySortFunction(&scanKey->sk_func,
state->sortFnKinds[nkey], state->sortFnKinds[nkey],
datum1, isnull1, datum2, isnull2); datum1, isnull1,
datum2, isnull2);
if (compare != 0) if (compare != 0)
{ {
/* dead code? SK_COMMUTE can't actually be set here, can it? */ /* dead code? SK_COMMUTE can't actually be set here, can it? */
@ -2043,8 +2058,9 @@ comparetup_index(Tuplesortstate *state, const void *a, const void *b)
/* see comments about NULLs handling in btbuild */ /* see comments about NULLs handling in btbuild */
/* the comparison function is always of CMP type */ /* the comparison function is always of CMP type */
compare = ApplySortFunction(&entry->sk_func, SORTFUNC_CMP, compare = inlineApplySortFunction(&entry->sk_func, SORTFUNC_CMP,
datum1, isnull1, datum2, isnull2); datum1, isnull1,
datum2, isnull2);
if (compare != 0) if (compare != 0)
return (int) compare; /* done when we find unequal return (int) compare; /* done when we find unequal
@ -2137,9 +2153,9 @@ comparetup_datum(Tuplesortstate *state, const void *a, const void *b)
DatumTuple *ltup = (DatumTuple *) a; DatumTuple *ltup = (DatumTuple *) a;
DatumTuple *rtup = (DatumTuple *) b; DatumTuple *rtup = (DatumTuple *) b;
return ApplySortFunction(&state->sortOpFn, state->sortFnKind, return inlineApplySortFunction(&state->sortOpFn, state->sortFnKind,
ltup->val, ltup->isNull, ltup->val, ltup->isNull,
rtup->val, rtup->isNull); rtup->val, rtup->isNull);
} }
static void * static void *