[Freeswitch-trunk] [commit] r6161 - freeswitch/trunk/libs/pcre

[Freeswitch SVN]

Author: mikej
Date: Sun Nov  4 06:41:31 2007
New Revision: 6161

Modified:
   freeswitch/trunk/libs/pcre/pcre_compile.c
   freeswitch/trunk/libs/pcre/pcre_dfa_exec.c
   freeswitch/trunk/libs/pcre/pcre_exec.c
   freeswitch/trunk/libs/pcre/pcre_internal.h

Log:
dont print pcre intensive debug messages, even in our debug builds (you can still enable it by defining PCRE_DEBUG on the project.

Modified: freeswitch/trunk/libs/pcre/pcre_compile.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_compile.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_compile.c	Sun Nov  4 06:41:31 2007
@@ -46,10 +46,10 @@
 #include "pcre_internal.h"
 
 
-/* When DEBUG is defined, we need the pcre_printint() function, which is also
-used by pcretest. DEBUG is not defined when building a production library. */
+/* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is also
+used by pcretest. PCRE_DEBUG is not defined when building a production library. */
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
 #include "pcre_printint.src"
 #endif
 
@@ -5154,7 +5154,7 @@
 
 *code++ = OP_END;
 
-#ifndef DEBUG
+#ifndef PCRE_DEBUG
 if (code - codestart > length) errorcode = ERR23;
 #endif
 
@@ -5223,7 +5223,7 @@
 /* Print out the compiled data if debugging is enabled. This is never the
 case when building a production library. */
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
 
 printf("Length = %d top_bracket = %d top_backref = %d\n",
   length, re->top_bracket, re->top_backref);

Modified: freeswitch/trunk/libs/pcre/pcre_dfa_exec.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_dfa_exec.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_dfa_exec.c	Sun Nov  4 06:41:31 2007
@@ -150,7 +150,7 @@
 #define INTS_PER_STATEBLOCK  (sizeof(stateblock)/sizeof(int))
 
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
 /*************************************************
 *             Print character string             *
 *************************************************/
@@ -439,7 +439,7 @@
   workspace[0] ^= 1;              /* Remember for the restarting feature */
   workspace[1] = active_count;
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
   printf("%.*sNext character: rest of subject = \"", rlevel*2-2, SP);
   pchars((uschar *)ptr, strlen((char *)ptr), stdout);
   printf("\"\n");
@@ -486,7 +486,7 @@
     int count, codevalue;
     int chartype, script;
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
     printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);
     if (c < 0) printf("-1\n");
       else if (c > 32 && c < 127) printf("'%c'\n", c);

Modified: freeswitch/trunk/libs/pcre/pcre_exec.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_exec.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_exec.c	Sun Nov  4 06:41:31 2007
@@ -81,7 +81,7 @@
 
 
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
 /*************************************************
 *        Debugging function to print chars       *
 *************************************************/
@@ -133,7 +133,7 @@
 {
 USPTR p = md->start_subject + md->offset_vector[offset];
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
 if (eptr >= md->end_subject)
   printf("matching subject <null>");
 else
@@ -195,7 +195,7 @@
 
 #ifndef NO_RECURSE
 #define REGISTER register
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
 #define RMATCH(rx,ra,rb,rc,rd,re,rf,rg) \
   { \
   printf("match() called in line %d\n", __LINE__); \
@@ -537,7 +537,7 @@
 /* OK, now we can get on with the real code of the function. Recursive calls
 are specified by the macro RMATCH and RRETURN is used to return. When
 NO_RECURSE is *not* defined, these just turn into a recursive call to match()
-and a "return", respectively (possibly with some debugging if DEBUG is
+and a "return", respectively (possibly with some debugging if PCRE_DEBUG is
 defined). However, RMATCH isn't like a function call because it's quite a
 complicated macro. It has to be used in one particular way. This shouldn't,
 however, impact performance when true recursion is being used. */
@@ -608,7 +608,7 @@
       number = GET2(ecode, 2+LINK_SIZE);
     offset = number << 1;
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
     printf("start bracket %d subject=", number);
     pchars(eptr, 16, TRUE, md);
     printf("\n");
@@ -1116,7 +1116,7 @@
       if (number > EXTRACT_BASIC_MAX) number = GET2(prev, 2+LINK_SIZE);
       offset = number << 1;
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
       printf("end bracket %d", number);
       printf("\n");
 #endif
@@ -3777,7 +3777,7 @@
 
   end_subject = save_end_subject;
 
-#ifdef DEBUG  /* Sigh. Some compilers never learn. */
+#ifdef PCRE_DEBUG  /* Sigh. Some compilers never learn. */
   printf(">>>> Match against: ");
   pchars(start_match, end_subject - start_match, TRUE, md);
   printf("\n");

Modified: freeswitch/trunk/libs/pcre/pcre_internal.h
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_internal.h	(original)
+++ freeswitch/trunk/libs/pcre/pcre_internal.h	Sun Nov  4 06:41:31 2007
@@ -45,10 +45,10 @@
 #ifndef PCRE_INTERNAL_H
 #define PCRE_INTERNAL_H
 
-/* Define DEBUG to get debugging output on stdout. */
+/* Define PCRE_DEBUG to get debugging output on stdout. */
 
 #if 0
-#define DEBUG
+#define PCRE_DEBUG
 #endif
 
 /* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef
@@ -56,7 +56,7 @@
 pre-processor statements, or at least there were when I first wrote this. After
 all, it had only been about 10 years then... */
 
-#ifdef DEBUG
+#ifdef PCRE_DEBUG
 #define DPRINTF(p) printf p
 #else
 #define DPRINTF(p) /*nothing*/