open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASSERT fixes.

Browse Source
REL6_4
Bruce Momjian 28 years ago
parent d8077ab007
commit 2ffd727531
7 changed files with 31 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      src/backend/access/index/istrat.c
  2. 4
      src/backend/lib/fstack.c
  3. 4
      src/backend/storage/ipc/shmem.c
  4. 16
      src/configure
  5. 16
      src/configure.in
  6. 14
      src/include/c.h
  7. 2
      src/include/config.h.in

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

@ -8,7 +8,7 @@
*
*
* 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 <fmgr.h>
#ifndef NO_ASSERT_CHECKING
#ifdef USE_ASSERT_CHECKING
static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation);
static bool
StrategyExpressionIsValid(StrategyExpression expression,
@ -113,7 +113,7 @@ AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
maxAttributeNumber * maxStrategyNumber * sizeof(ScanKeyData);
}
#ifndef NO_ASSERT_CHECKING
#ifdef USE_ASSERT_CHECKING
/*
* StrategyTransformMapIsValid is now a macro in istrat.h -cim 4/27/91
*/

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

@ -7,7 +7,7 @@
*
*
* 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;
}
#ifndef NO_ASSERT_CHECKING
#ifdef USE_ASSERT_CHECKING
/*
* FixedStackContains --
* True iff ordered stack contains given element.

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

@ -7,7 +7,7 @@
*
*
* 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)
{
/* Assert() is a macro now. substitutes inside quotes. */
#ifndef NO_ASSERT_CHECKING
#ifdef USE_ASSERT_CHECKING
char *strname = "BindingTable";
#endif

16
src/configure vendored
Unescape View File

@ -13,21 +13,21 @@ ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_default_prefix=/usr/local/pgsql
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
--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
--enable-locale enable locale support "
--enable-locale enable locale support "
ac_help="$ac_help
--enable-recode enable cyrillic recode support "
--enable-recode enable cyrillic recode support "
ac_help="$ac_help
--with-pgport=<portnum> change default startup port "
ac_help="$ac_help
--with-tcl use tcl "
--with-tcl use tcl "
ac_help="$ac_help
--with-perl use perl "
--with-perl use perl "
ac_help="$ac_help
--enable-cassert enable assertion checks (debugging) "
--enable-cassert enable assertion checks (debugging) "
ac_help="$ac_help
--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
enableval="$enable_cassert"
cat >> confdefs.h <<\EOF
#define NO_ASSERT_CHECKING 1
#define USE_ASSERT_CHECKING 1
EOF
echo "$ac_t""enabled" 1>&6
else

16
src/configure.in
Unescape View File

@ -142,7 +142,7 @@ LIBS=`grep '^LIBS:' $TEMPLATE | awk -F: '{print $2}'`
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
"" | y | ye | yes | n | no)
@ -163,7 +163,7 @@ if test "$INCLUDE_DIRS"; then
fi
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
"" | y | ye | yes | n | no)
@ -191,7 +191,7 @@ dnl It defaults to disabled
AC_MSG_CHECKING(setting USE_LOCALE)
AC_ARG_ENABLE(
locale,
[ --enable-locale enable locale support ],
[ --enable-locale enable locale support ],
AC_DEFINE(USE_LOCALE) AC_MSG_RESULT(enabled),
AC_MSG_RESULT(disabled)
)
@ -204,7 +204,7 @@ dnl It defaults to disabled
AC_MSG_CHECKING(setting CYR_RECODE)
AC_ARG_ENABLE(
recode,
[ --enable-recode enable cyrillic recode support ],
[ --enable-recode enable cyrillic recode support ],
AC_DEFINE(CYR_RECODE) AC_MSG_RESULT(enabled),
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_ARG_WITH(
tcl,
[ --with-tcl use tcl ],
[ --with-tcl use tcl ],
USE_TCL=true; AC_MSG_RESULT(enabled),
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_ARG_WITH(
perl,
[ --with-perl use perl ],
[ --with-perl use perl ],
USE_PERL=true; AC_MSG_RESULT(enabled),
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_ARG_ENABLE(
cassert,
[ --enable-cassert enable assertion checks (debugging) ],
AC_DEFINE(NO_ASSERT_CHECKING) AC_MSG_RESULT(enabled),
[ --enable-cassert enable assertion checks (debugging) ],
AC_DEFINE(USE_ASSERT_CHECKING) AC_MSG_RESULT(enabled),
AC_MSG_RESULT(disabled)
)

14
src/include/c.h
Unescape View File

@ -7,7 +7,7 @@
*
* 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;
/*
* NO_ASSERT_CHECKING, if defined, turns off all the assertions.
* USE_ASSERT_CHECKING, if defined, turns off all the assertions.
* - plai 9/5/90
*
* 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), \
(char*) NULL, __FILE__, __LINE__))))
#ifdef NO_ASSERT_CHECKING
#ifndef USE_ASSERT_CHECKING
#define Assert(condition)
#define AssertMacro(condition) true
#define AssertArg(condition)
@ -632,7 +632,7 @@ typedef struct Exception
#define AssertState(condition) \
Trap(!(condition), BadState)
#endif /* NO_ASSERT_CHECKING */
#endif /* USE_ASSERT_CHECKING */
/*
* LogTrap --
@ -655,7 +655,7 @@ typedef struct Exception
&(exception), \
form printArgs, __FILE__, __LINE__))))
#ifdef NO_ASSERT_CHECKING
#ifndef USE_ASSERT_CHECKING
#define LogAssert(condition, printArgs)
#define LogAssertMacro(condition, printArgs) true
#define LogAssertArg(condition, printArgs)
@ -673,7 +673,7 @@ typedef struct Exception
#define LogAssertState(condition, printArgs) \
LogTrap(!(condition), BadState, printArgs)
#endif /* NO_ASSERT_CHECKING */
#endif /* USE_ASSERT_CHECKING */
/* ----------------------------------------------------------------
* Section 8: Min, Max, Abs macros

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

@ -208,7 +208,7 @@ extern void srandom(int seed);
#undef CYR_RECODE
/* 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

Write Preview
Loading…
Cancel
Save