rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASSERT fixes.

This commit is contained in:
Bruce Momjian 1998-04-06 17:27:54 +00:00
parent d8077ab007
commit 2ffd727531
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/access/index/istrat.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.17 1998/02/26 04:29:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.18 1998/04/06 17:27:06 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -26,7 +26,7 @@
#include <access/istrat.h> #include <access/istrat.h>
#include <fmgr.h> #include <fmgr.h>
#ifndef NO_ASSERT_CHECKING #ifdef USE_ASSERT_CHECKING
static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation); static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation);
static bool static bool
StrategyExpressionIsValid(StrategyExpression expression, StrategyExpressionIsValid(StrategyExpression expression,
@ -113,7 +113,7 @@ AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
maxAttributeNumber * maxStrategyNumber * sizeof(ScanKeyData); maxAttributeNumber * maxStrategyNumber * sizeof(ScanKeyData);
} }
#ifndef NO_ASSERT_CHECKING #ifdef USE_ASSERT_CHECKING
/* /*
* StrategyTransformMapIsValid is now a macro in istrat.h -cim 4/27/91 * StrategyTransformMapIsValid is now a macro in istrat.h -cim 4/27/91
*/ */

4
src/backend/lib/fstack.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.6 1997/09/08 02:22:57 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.7 1998/04/06 17:27:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -84,7 +84,7 @@ FixedStackPush(FixedStack stack, Pointer pointer)
stack->top = item; stack->top = item;
} }
#ifndef NO_ASSERT_CHECKING #ifdef USE_ASSERT_CHECKING
/* /*
* FixedStackContains -- * FixedStackContains --
* True iff ordered stack contains given element. * True iff ordered stack contains given element.

4
src/backend/storage/ipc/shmem.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.17 1998/02/26 04:35:46 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.18 1998/04/06 17:27:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -511,7 +511,7 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
if (!BindingTable) if (!BindingTable)
{ {
/* Assert() is a macro now. substitutes inside quotes. */ /* Assert() is a macro now. substitutes inside quotes. */
#ifndef NO_ASSERT_CHECKING #ifdef USE_ASSERT_CHECKING
char *strname = "BindingTable"; char *strname = "BindingTable";
#endif #endif

16
src/configure vendored
View File

@ -13,21 +13,21 @@ ac_default_prefix=/usr/local
# Any additions from configure.in: # Any additions from configure.in:
ac_default_prefix=/usr/local/pgsql ac_default_prefix=/usr/local/pgsql
ac_help="$ac_help ac_help="$ac_help
--with-includes=DIR site header files for tk/tcl, etc in DIR" --with-includes=DIR site header files for tk/tcl, etc in DIR"
ac_help="$ac_help ac_help="$ac_help
--with-libraries=DIR site library directories for tk/tcl, etc in DIR" --with-libraries=DIR site library directories for tk/tcl, etc in DIR"
ac_help="$ac_help ac_help="$ac_help
--enable-locale enable locale support " --enable-locale enable locale support "
ac_help="$ac_help ac_help="$ac_help
--enable-recode enable cyrillic recode support " --enable-recode enable cyrillic recode support "
ac_help="$ac_help ac_help="$ac_help
--with-pgport=<portnum> change default startup port " --with-pgport=<portnum> change default startup port "
ac_help="$ac_help ac_help="$ac_help
--with-tcl use tcl " --with-tcl use tcl "
ac_help="$ac_help ac_help="$ac_help
--with-perl use perl " --with-perl use perl "
ac_help="$ac_help ac_help="$ac_help
--enable-cassert enable assertion checks (debugging) " --enable-cassert enable assertion checks (debugging) "
ac_help="$ac_help ac_help="$ac_help
--with-x use the X Window System" --with-x use the X Window System"
@ -877,7 +877,7 @@ echo "configure:876: checking setting ASSERT CHECKING" >&5
if test "${enable_cassert+set}" = set; then if test "${enable_cassert+set}" = set; then
enableval="$enable_cassert" enableval="$enable_cassert"
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define NO_ASSERT_CHECKING 1 #define USE_ASSERT_CHECKING 1
EOF EOF
echo "$ac_t""enabled" 1>&6 echo "$ac_t""enabled" 1>&6
else else

16
src/configure.in
View File

@ -142,7 +142,7 @@ LIBS=`grep '^LIBS:' $TEMPLATE | awk -F: '{print $2}'`
AC_ARG_WITH(includes, AC_ARG_WITH(includes,
[ --with-includes=DIR site header files for tk/tcl, etc in DIR], [ --with-includes=DIR site header files for tk/tcl, etc in DIR],
[ [
case "$withval" in case "$withval" in
"" | y | ye | yes | n | no) "" | y | ye | yes | n | no)
@ -163,7 +163,7 @@ if test "$INCLUDE_DIRS"; then
fi fi
AC_ARG_WITH(libraries, AC_ARG_WITH(libraries,
[ --with-libraries=DIR site library directories for tk/tcl, etc in DIR], [ --with-libraries=DIR site library directories for tk/tcl, etc in DIR],
[ [
case "$withval" in case "$withval" in
"" | y | ye | yes | n | no) "" | y | ye | yes | n | no)
@ -191,7 +191,7 @@ dnl It defaults to disabled
AC_MSG_CHECKING(setting USE_LOCALE) AC_MSG_CHECKING(setting USE_LOCALE)
AC_ARG_ENABLE( AC_ARG_ENABLE(
locale, locale,
[ --enable-locale enable locale support ], [ --enable-locale enable locale support ],
AC_DEFINE(USE_LOCALE) AC_MSG_RESULT(enabled), AC_DEFINE(USE_LOCALE) AC_MSG_RESULT(enabled),
AC_MSG_RESULT(disabled) AC_MSG_RESULT(disabled)
) )
@ -204,7 +204,7 @@ dnl It defaults to disabled
AC_MSG_CHECKING(setting CYR_RECODE) AC_MSG_CHECKING(setting CYR_RECODE)
AC_ARG_ENABLE( AC_ARG_ENABLE(
recode, recode,
[ --enable-recode enable cyrillic recode support ], [ --enable-recode enable cyrillic recode support ],
AC_DEFINE(CYR_RECODE) AC_MSG_RESULT(enabled), AC_DEFINE(CYR_RECODE) AC_MSG_RESULT(enabled),
AC_MSG_RESULT(disabled) AC_MSG_RESULT(disabled)
) )
@ -223,7 +223,7 @@ dnl We exclude tcl support unless we override it with --with-tcl
AC_MSG_CHECKING(setting USE_TCL) AC_MSG_CHECKING(setting USE_TCL)
AC_ARG_WITH( AC_ARG_WITH(
tcl, tcl,
[ --with-tcl use tcl ], [ --with-tcl use tcl ],
USE_TCL=true; AC_MSG_RESULT(enabled), USE_TCL=true; AC_MSG_RESULT(enabled),
USE_TCL=false; AC_MSG_RESULT(disabled) USE_TCL=false; AC_MSG_RESULT(disabled)
) )
@ -255,7 +255,7 @@ dnl We exclude perl support unless we override it with --with-perl
AC_MSG_CHECKING(setting USE_PERL) AC_MSG_CHECKING(setting USE_PERL)
AC_ARG_WITH( AC_ARG_WITH(
perl, perl,
[ --with-perl use perl ], [ --with-perl use perl ],
USE_PERL=true; AC_MSG_RESULT(enabled), USE_PERL=true; AC_MSG_RESULT(enabled),
USE_PERL=false; AC_MSG_RESULT(disabled) USE_PERL=false; AC_MSG_RESULT(disabled)
) )
@ -279,8 +279,8 @@ dnl We need some explanatory text here.
AC_MSG_CHECKING(setting ASSERT CHECKING) AC_MSG_CHECKING(setting ASSERT CHECKING)
AC_ARG_ENABLE( AC_ARG_ENABLE(
cassert, cassert,
[ --enable-cassert enable assertion checks (debugging) ], [ --enable-cassert enable assertion checks (debugging) ],
AC_DEFINE(NO_ASSERT_CHECKING) AC_MSG_RESULT(enabled), AC_DEFINE(USE_ASSERT_CHECKING) AC_MSG_RESULT(enabled),
AC_MSG_RESULT(disabled) AC_MSG_RESULT(disabled)
) )

14
src/include/c.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: c.h,v 1.38 1998/03/31 15:53:39 momjian Exp $ * $Id: c.h,v 1.39 1998/04/06 17:27:49 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -583,12 +583,12 @@ typedef struct Exception
} Exception; } Exception;
/* /*
* NO_ASSERT_CHECKING, if defined, turns off all the assertions. * USE_ASSERT_CHECKING, if defined, turns off all the assertions.
* - plai 9/5/90 * - plai 9/5/90
* *
* It should _NOT_ be undef'ed in releases or in benchmark copies * It should _NOT_ be undef'ed in releases or in benchmark copies
* *
* #undef NO_ASSERT_CHECKING * #undef USE_ASSERT_CHECKING
*/ */
/* /*
@ -614,7 +614,7 @@ typedef struct Exception
&(exception), \ &(exception), \
(char*) NULL, __FILE__, __LINE__)))) (char*) NULL, __FILE__, __LINE__))))
#ifdef NO_ASSERT_CHECKING #ifndef USE_ASSERT_CHECKING
#define Assert(condition) #define Assert(condition)
#define AssertMacro(condition) true #define AssertMacro(condition) true
#define AssertArg(condition) #define AssertArg(condition)
@ -632,7 +632,7 @@ typedef struct Exception
#define AssertState(condition) \ #define AssertState(condition) \
Trap(!(condition), BadState) Trap(!(condition), BadState)
#endif /* NO_ASSERT_CHECKING */ #endif /* USE_ASSERT_CHECKING */
/* /*
* LogTrap -- * LogTrap --
@ -655,7 +655,7 @@ typedef struct Exception
&(exception), \ &(exception), \
form printArgs, __FILE__, __LINE__)))) form printArgs, __FILE__, __LINE__))))
#ifdef NO_ASSERT_CHECKING #ifndef USE_ASSERT_CHECKING
#define LogAssert(condition, printArgs) #define LogAssert(condition, printArgs)
#define LogAssertMacro(condition, printArgs) true #define LogAssertMacro(condition, printArgs) true
#define LogAssertArg(condition, printArgs) #define LogAssertArg(condition, printArgs)
@ -673,7 +673,7 @@ typedef struct Exception
#define LogAssertState(condition, printArgs) \ #define LogAssertState(condition, printArgs) \
LogTrap(!(condition), BadState, printArgs) LogTrap(!(condition), BadState, printArgs)
#endif /* NO_ASSERT_CHECKING */ #endif /* USE_ASSERT_CHECKING */
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* Section 8: Min, Max, Abs macros * Section 8: Min, Max, Abs macros

2
src/include/config.h.in
View File

@ -208,7 +208,7 @@ extern void srandom(int seed);
#undef CYR_RECODE #undef CYR_RECODE
/* Set to 1 if you want to Disable ASSERT CHECKING */ /* Set to 1 if you want to Disable ASSERT CHECKING */
#undef NO_ASSERT_CHECKING #undef USE_ASSERT_CHECKING
/* /*
* Code below this point should not require changes * Code below this point should not require changes