From: Marc Slemko <marc@apache.org>
Date: Mon, 30 Jun 1997 00:02:01 +0000 (+0000)
Subject: Workaround AIX 3.x compiler bug.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72c8e3c5e2702da37562541f9c525816bb0de86f;p=thirdparty%2Fapache%2Fhttpd.git

Workaround AIX 3.x compiler bug.

PR: 725
Reviewed by:	Dean Gaudet, Jim Jagielski
Submitted by:
Obtained from:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78463 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index 972c6ae4dff..3ddd2d19ec2 100644
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -91,6 +91,9 @@ Changes with Apache 1.2.1
 
   *) PORT: Support for Maxion/OS SVR4.2 Real Time Unix. [no name given] PR#383
 
+  *) PORT: Workaround for AIX 3.x compiler bug in http_bprintf.c.  
+     [Marc Slemko] PR#725
+
 Changes with Apache 1.2
 
 Changes with Apache 1.2b11
diff --git a/APACHE_1_2_X/src/main/http_bprintf.c b/APACHE_1_2_X/src/main/http_bprintf.c
index 712af066883..3035b759ccf 100644
--- a/APACHE_1_2_X/src/main/http_bprintf.c
+++ b/APACHE_1_2_X/src/main/http_bprintf.c
@@ -289,7 +289,10 @@ int vbprintf(BUFF *bp, const char *format, va_list arg)
 		    else
 			{
 			p = memchr(charPtrArg, '\0', precision);
-			buffReqd=(p == NULL) ? precision : p - charPtrArg;
+			if (p == NULL)
+				buffReqd = precision;
+			else
+				buffReqd = p - charPtrArg;
 			}
 		    break;