Check if DEBUG is defined in regex_internal.h

Message ID 20140731204156.GN16739@spoyarek.pnq.redhat.com
State Committed
Headers

Commit Message

Siddhesh Poyarekar July 31, 2014, 8:41 p.m. UTC
  Hi,

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.

Siddhesh

	* posix/regex_internal.c: Check if DEBUG is defined and is
	set.
  

Comments

Roland McGrath July 31, 2014, 8:43 p.m. UTC | #1
OK
  

Patch

diff --git a/posix/regex_internal.c b/posix/regex_internal.c
index 7eebf46..86c04a8 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