From: VMware, Inc <>
Date: Tue, 28 Jun 2011 19:51:17 +0000 (-0700)
Subject: lib/file: an optimization
X-Git-Tag: 2011.06.27-437995~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d122f12cc9b354c2e43880280fbd03e425f7da7;p=thirdparty%2Fopen-vm-tools.git

lib/file: an optimization

We can avoid a loop.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/file/fileTemp.c b/open-vm-tools/lib/file/fileTemp.c
index 365ccfd58..df33d9dd1 100644
--- a/open-vm-tools/lib/file/fileTemp.c
+++ b/open-vm-tools/lib/file/fileTemp.c
@@ -69,15 +69,10 @@ static void
 FileTempNum(Bool createTempFile,  // IN:
             uint32 *var)          // IN/OUT:
 {
-   uint32 delta;
-
    ASSERT(var);
 
-   do {
-      delta = (FileSimpleRandom() >> 8) & 0xFF;
-   } while (((*var + delta) & 0x1) != (createTempFile ? 1 : 0));
-
-   *var += delta;
+   *var += (FileSimpleRandom() >> 8) & 0xFF;
+   *var = (*var & ~0x1) | (createTempFile ? 1 : 0);
 }