svn commit: samba r8696 - in branches/SAMBA_4_0/source/lib/appweb: ejs mpr

[tridge at samba.org]

Author: tridge
Date: 2005-07-22 01:56:51 +0000 (Fri, 22 Jul 2005)
New Revision: 8696

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8696

Log:
fixed ejs to more strictly follow the va_list rules. Might fix that
pesky panic on x86_64

Modified:
   branches/SAMBA_4_0/source/lib/appweb/ejs/ejsParser.c
   branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/appweb/ejs/ejsParser.c
===================================================================
--- branches/SAMBA_4_0/source/lib/appweb/ejs/ejsParser.c	2005-07-22 01:14:09 UTC (rev 8695)
+++ branches/SAMBA_4_0/source/lib/appweb/ejs/ejsParser.c	2005-07-22 01:56:51 UTC (rev 8696)
@@ -230,7 +230,7 @@
 
 #if BLD_DEBUG
 			fullNameLen = mprReallocStrcat(&fullName, MPR_MAX_VAR, fullNameLen,
-				0, ".", 0);
+				0, ".", NULL);
 #endif
 
 			ep->currentProperty = vp;
@@ -266,7 +266,7 @@
 				 *	If not executing yet, id may not be known
 				 */
 				fullNameLen = mprReallocStrcat(&fullName, MPR_MAX_VAR, 
-					fullNameLen, 0, "[", id, "]", 0);
+					fullNameLen, 0, "[", id, "]", NULL);
 			}
 #endif
 
@@ -1258,7 +1258,7 @@
 	*id = mprStrdup(ep->token);
 #if BLD_DEBUG
 	*fullNameLen = mprReallocStrcat(fullName, MPR_MAX_VAR, *fullNameLen,
-		0, *id, 0);
+		0, *id, NULL);
 #endif
 	if (ep->currentObj == 0) {
 		ep->currentObj = ejsFindObj(ep, state, *id, flags);

Modified: branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.c
===================================================================
--- branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.c	2005-07-22 01:14:09 UTC (rev 8695)
+++ branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.c	2005-07-22 01:56:51 UTC (rev 8696)
@@ -343,6 +343,7 @@
 		addBytes += strlen(str) + sepLen;
 		str = va_arg(ap, const char*);
 	}
+	va_end(ap);
 
 	if (existingLen > 0) {
 		addBytes += sepLen;
@@ -387,6 +388,7 @@
 				dp += sepLen;
 			}
 		}
+		va_end(ap);
 	} else if (dest == 0) {
 		dest = (char*) mprMalloc(1);
 	}