From: Jim Jagielski <jim@apache.org>
Date: Wed, 26 Sep 2012 15:28:27 +0000 (+0000)
Subject: wrap var inits in the macro w/ a do-while.
X-Git-Tag: 2.5.0-alpha~6265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ade3b53bb5c53bc43b3b9fe5d4291290f8df064a;p=apache

wrap var inits in the macro w/ a do-while.


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

diff --git a/server/util.c b/server/util.c
index 07a612403d..27ebfc141e 100644
--- a/server/util.c
+++ b/server/util.c
@@ -2838,24 +2838,26 @@ AP_DECLARE(void) ap_get_sload(ap_sload_t *ld)
 
 AP_DECLARE(void) ap_get_loadavg(ap_loadavg_t *ld)
 {
-    double la[3];
-    int num;
-
     /* preload errored fields, we overwrite */
     ld->loadavg = -1.0;
     ld->loadavg5 = -1.0;
     ld->loadavg15 = -1.0;
 
 #if HAVE_GETLOADAVG
-    num = getloadavg(la, 3);
-    if (num > 0) {
-        ld->loadavg = (float)la[0];
-    }
-    if (num > 1) {
-        ld->loadavg5 = (float)la[1];
-    }
-    if (num > 2) {
-        ld->loadavg15 = (float)la[2];
-    }
+    do {
+        double la[3];
+        int num;
+
+        num = getloadavg(la, 3);
+        if (num > 0) {
+            ld->loadavg = (float)la[0];
+        }
+        if (num > 1) {
+            ld->loadavg5 = (float)la[1];
+        }
+        if (num > 2) {
+            ld->loadavg15 = (float)la[2];
+        }
+    } while(0);
 #endif
 }