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

isn: Fix debug code 

The ISN_DEBUG code did not compile.  Fix that code, don't hide it behind
an #ifdef, make it run when building with asserts, and make it error out
instead of just logging if it fails.

Reviewed-by: David Steele <david@pgmasters.net>
This commit is contained in:
Peter Eisentraut 2017-08-11 21:04:04 -04:00
parent 98470fdfa7
commit 9b6cb4650b
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
contrib/isn/isn.c
View File

@ -26,6 +26,12 @@
PG_MODULE_MAGIC; PG_MODULE_MAGIC;
#ifdef USE_ASSERT_CHECKING
#define ISN_DEBUG 1
#else
#define ISN_DEBUG 0
#endif
#define MAXEAN13LEN 18 #define MAXEAN13LEN 18
enum isn_type enum isn_type
@ -36,7 +42,6 @@ enum isn_type
static const char *const isn_names[] = {"EAN13/UPC/ISxN", "EAN13/UPC/ISxN", "EAN13", "ISBN", "ISMN", "ISSN", "UPC"}; static const char *const isn_names[] = {"EAN13/UPC/ISxN", "EAN13/UPC/ISxN", "EAN13", "ISBN", "ISMN", "ISSN", "UPC"};
static bool g_weak = false; static bool g_weak = false;
static bool g_initialized = false;
/*********************************************************************** /***********************************************************************
@ -56,7 +61,7 @@ static bool g_initialized = false;
/* /*
* Check if the table and its index is correct (just for debugging) * Check if the table and its index is correct (just for debugging)
*/ */
#ifdef ISN_DEBUG pg_attribute_unused()
static bool static bool
check_table(const char *(*TABLE)[2], const unsigned TABLE_index[10][2]) check_table(const char *(*TABLE)[2], const unsigned TABLE_index[10][2])
{ {
@ -68,7 +73,6 @@ check_table(const char *(*TABLE)[2], const unsigned TABLE_index[10][2])
y = -1, y = -1,
i = 0, i = 0,
j, j,
cnt = 0,
init = 0; init = 0;
if (TABLE == NULL || TABLE_index == NULL) if (TABLE == NULL || TABLE_index == NULL)
@ -131,7 +135,6 @@ invalidindex:
elog(DEBUG1, "index %d is invalid", j); elog(DEBUG1, "index %d is invalid", j);
return false; return false;
} }
#endif /* ISN_DEBUG */
/*---------------------------------------------------------- /*----------------------------------------------------------
* Formatting and conversion routines. * Formatting and conversion routines.
@ -922,22 +925,24 @@ eantoobig:
* Exported routines. * Exported routines.
*---------------------------------------------------------*/ *---------------------------------------------------------*/
void _PG_init(void);
void void
initialize(void) _PG_init(void)
{ {
#ifdef ISN_DEBUG if (ISN_DEBUG)
if (!check_table(EAN13, EAN13_index)) {
elog(LOG, "EAN13 failed check"); if (!check_table(EAN13_range, EAN13_index))
if (!check_table(ISBN, ISBN_index)) elog(ERROR, "EAN13 failed check");
elog(LOG, "ISBN failed check"); if (!check_table(ISBN_range, ISBN_index))
if (!check_table(ISMN, ISMN_index)) elog(ERROR, "ISBN failed check");
elog(LOG, "ISMN failed check"); if (!check_table(ISMN_range, ISMN_index))
if (!check_table(ISSN, ISSN_index)) elog(ERROR, "ISMN failed check");
elog(LOG, "ISSN failed check"); if (!check_table(ISSN_range, ISSN_index))
if (!check_table(UPC, UPC_index)) elog(ERROR, "ISSN failed check");
elog(LOG, "UPC failed check"); if (!check_table(UPC_range, UPC_index))
#endif elog(ERROR, "UPC failed check");
g_initialized = true; }
} }
/* isn_out /* isn_out