[PHP-CVS] cvs: php-src(PHP_5_0) /regex engine.c regexec.c

[Antony Dovgal]

tony2001                Fri Aug 13 11:02:05 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/regex      engine.c regexec.c 
  Log:
  MFH: fix yet another annoying compile warning
  
  
http://cvs.php.net/diff.php/php-src/regex/engine.c?r1=1.4&r2=1.4.2.1&ty=u
Index: php-src/regex/engine.c
diff -u php-src/regex/engine.c:1.4 php-src/regex/engine.c:1.4.2.1
--- php-src/regex/engine.c:1.4  Mon Sep 29 20:26:03 2003
+++ php-src/regex/engine.c      Fri Aug 13 11:02:04 2004
@@ -270,7 +270,7 @@
                /* figure out what it matched */
                switch (OP(m->g->strip[ss])) {
                case OEND:
-                       assert(nope);
+                       assert(PHP_REGEX_NOPE);
                        break;
                case OCHAR:
                        sp++;
@@ -286,7 +286,7 @@
                        break;
                case OBACK_:
                case O_BACK:
-                       assert(nope);
+                       assert(PHP_REGEX_NOPE);
                        break;
                /* cases where length of match is hard to find */
                case OQUEST_:
@@ -389,7 +389,7 @@
                case OOR1:
                case OOR2:
                case O_CH:
-                       assert(nope);
+                       assert(PHP_REGEX_NOPE);
                        break;
                case OLPAREN:
                        i = OPND(m->g->strip[ss]);
@@ -402,7 +402,7 @@
                        m->pmatch[i].rm_eo = sp - m->offp;
                        break;
                default:                /* uh oh */
-                       assert(nope);
+                       assert(PHP_REGEX_NOPE);
                        break;
                }
        }
@@ -606,12 +606,12 @@
                return(NULL);
                break;
        default:                /* uh oh */
-               assert(nope);
+               assert(PHP_REGEX_NOPE);
                break;
        }
 
        /* "can't happen" */
-       assert(nope);
+       assert(PHP_REGEX_NOPE);
        /* NOTREACHED */
        return((unsigned char *)NULL);  /* dummy */
 }
@@ -914,7 +914,7 @@
                        FWD(aft, aft, 1);
                        break;
                default:                /* ooooops... */
-                       assert(nope);
+                       assert(PHP_REGEX_NOPE);
                        break;
                }
        }
http://cvs.php.net/diff.php/php-src/regex/regexec.c?r1=1.3&r2=1.3.2.1&ty=u
Index: php-src/regex/regexec.c
diff -u php-src/regex/regexec.c:1.3 php-src/regex/regexec.c:1.3.2.1
--- php-src/regex/regexec.c:1.3 Mon Sep 29 20:26:03 2003
+++ php-src/regex/regexec.c     Fri Aug 13 11:02:05 2004
@@ -16,7 +16,7 @@
 #include "utils.h"
 #include "regex2.h"
 
-static int nope = 0;           /* for use in asserts; shuts lint up */
+#define PHP_REGEX_NOPE 0;              /* for use in asserts; shuts lint up */
 
 /* macros for manipulating states, small version */
 #define        states  unsigned

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php