From 78dd658a025fb16d004677284b4db0d0c0191845 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Fri, 1 Aug 2014 14:24:41 +0530 Subject: [PATCH] Check if DEBUG is defined in regex_internal.c The DEBUG macro is checked for its value in one place and if it is defined in another. Make this consistent across the two cases and use the same style that we did in mktime.c, which is to check if the macro is defined and it is set. --- ChangeLog | 3 +++ posix/regex_internal.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c5d2107f2..e69f433669 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-08-01 Siddhesh Poyarekar + * posix/regex_internal.c: Check if DEBUG is defined and is + set. + * include/libc-symbols.h (HAVE_MBSTATE_T): Define macro. (HAVE_MBSRTOWCS): Likewise. * posix/fnmatch.c: Include string.h unconditionally. diff --git a/posix/regex_internal.c b/posix/regex_internal.c index 7eebf46924..86c04a807c 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -679,7 +679,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) pstr->valid_len - offset); pstr->valid_len -= offset; pstr->valid_raw_len -= offset; -#if DEBUG +#if defined DEBUG && DEBUG assert (pstr->valid_len > 0); #endif } @@ -936,7 +936,7 @@ re_string_context_at (const re_string_t *input, int idx, int eflags) int wc_idx = idx; while(input->wcs[wc_idx] == WEOF) { -#ifdef DEBUG +#if defined DEBUG && DEBUG /* It must not happen. */ assert (wc_idx >= 0); #endif