summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2012-12-01 21:07:28 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2012-12-01 21:07:28 +0000
commitc715f45d3551979419683c22697671d0cec83cd3 (patch)
treeaad84c39eb2ca693b5e4159de7b1277de09bcd64
parentf9fef6015d5f823f3a816839102a934ed91c5409 (diff)
If compiling with gcc 3, initialize a local variable to prevent -Wuninitialized
from firing a false positive; ok robert@
-rw-r--r--usr.sbin/nginx/README.OpenBSD1
-rw-r--r--usr.sbin/nginx/src/pcre/pcre_compile.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/usr.sbin/nginx/README.OpenBSD b/usr.sbin/nginx/README.OpenBSD
index 5d92e12bd95..2a926e158fa 100644
--- a/usr.sbin/nginx/README.OpenBSD
+++ b/usr.sbin/nginx/README.OpenBSD
@@ -26,6 +26,7 @@ Modified files by OpenBSD:
- src/http/ngx_http_request.c
- src/os/unix/ngx_process_cycle.c
- src/os/unix/ngx_process_cycle.h
+- src/pcre/pcre_compile.c
The syslog patch has been applied from:
https://github.com/yaoweibin/nginx_syslog_patch
diff --git a/usr.sbin/nginx/src/pcre/pcre_compile.c b/usr.sbin/nginx/src/pcre/pcre_compile.c
index 1ffa2c5fb43..bb4d62441de 100644
--- a/usr.sbin/nginx/src/pcre/pcre_compile.c
+++ b/usr.sbin/nginx/src/pcre/pcre_compile.c
@@ -2889,6 +2889,9 @@ get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,
unsigned int *odptr)
{
unsigned int c, othercase, next;
+#if defined(__GNUC__) && __GNUC__ == 3
+othercase = 0; /* XXX gcc -Wuninitialized */
+#endif
for (c = *cptr; c <= d; c++)
{ if ((othercase = UCD_OTHERCASE(c)) != c) break; }