From: Antony Dovgal <tony2001@php.net>
Date: Fri, 13 Aug 2004 15:02:05 +0000 (+0000)
Subject: MFH: fix yet another annoying compile warning
X-Git-Tag: php-5.0.2RC1~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=970f1f9c7f5b77b8ebcbc2af3d03279670d26f3b;p=php

MFH: fix yet another annoying compile warning
---

diff --git a/ext/ereg/regex/engine.c b/ext/ereg/regex/engine.c
index c4bdc8079f..0682267f61 100644
--- a/ext/ereg/regex/engine.c
+++ b/ext/ereg/regex/engine.c
@@ -270,7 +270,7 @@ sopno stopst;
 		/* 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 @@ sopno stopst;
 			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 @@ sopno stopst;
 		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 @@ sopno stopst;
 			m->pmatch[i].rm_eo = sp - m->offp;
 			break;
 		default:		/* uh oh */
-			assert(nope);
+			assert(PHP_REGEX_NOPE);
 			break;
 		}
 	}
@@ -606,12 +606,12 @@ sopno lev;			/* PLUS nesting level */
 		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 @@ register states aft;		/* states already known reachable after */
 			FWD(aft, aft, 1);
 			break;
 		default:		/* ooooops... */
-			assert(nope);
+			assert(PHP_REGEX_NOPE);
 			break;
 		}
 	}
diff --git a/ext/ereg/regex/regexec.c b/ext/ereg/regex/regexec.c
index c8cb8fdf56..bbfe094c96 100644
--- a/ext/ereg/regex/regexec.c
+++ b/ext/ereg/regex/regexec.c
@@ -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
diff --git a/regex/engine.c b/regex/engine.c
index c4bdc8079f..0682267f61 100644
--- a/regex/engine.c
+++ b/regex/engine.c
@@ -270,7 +270,7 @@ sopno stopst;
 		/* 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 @@ sopno stopst;
 			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 @@ sopno stopst;
 		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 @@ sopno stopst;
 			m->pmatch[i].rm_eo = sp - m->offp;
 			break;
 		default:		/* uh oh */
-			assert(nope);
+			assert(PHP_REGEX_NOPE);
 			break;
 		}
 	}
@@ -606,12 +606,12 @@ sopno lev;			/* PLUS nesting level */
 		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 @@ register states aft;		/* states already known reachable after */
 			FWD(aft, aft, 1);
 			break;
 		default:		/* ooooops... */
-			assert(nope);
+			assert(PHP_REGEX_NOPE);
 			break;
 		}
 	}
diff --git a/regex/regexec.c b/regex/regexec.c
index c8cb8fdf56..bbfe094c96 100644
--- a/regex/regexec.c
+++ b/regex/regexec.c
@@ -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