Mesa (master): gallium: In option helpers, move assignment outside of if clause.

[Vinson Lee]

Module: Mesa
Branch: master
Commit: c3c920ee2c0ae46e88554c9351f22455f8e8a623
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3c920ee2c0ae46e88554c9351f22455f8e8a623

Author: Vinson Lee <vlee at vmware.com>
Date:   Fri Apr 23 22:06:19 2010 -0700

gallium: In option helpers, move assignment outside of if clause.

This silences Coverity assign_where_compare_meant warnings.

---

 src/gallium/auxiliary/util/u_debug.h |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index ec3371a..e8ff277 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -309,8 +309,10 @@ debug_get_option_ ## sufix (void) \
 { \
    static boolean first = TRUE; \
    static boolean value; \
-   if (first && !(first = FALSE)) \
+   if (first) { \
+      first = FALSE; \
       value = debug_get_bool_option(name, dfault); \
+   } \
    return value; \
 }
 
@@ -320,8 +322,10 @@ debug_get_option_ ## sufix (void) \
 { \
    static boolean first = TRUE; \
    static long value; \
-   if (first && !(first = FALSE)) \
+   if (first) { \
+      first = FALSE; \
       value = debug_get_num_option(name, dfault); \
+   } \
    return value; \
 }
 
@@ -331,8 +335,10 @@ debug_get_option_ ## sufix (void) \
 { \
    static boolean first = TRUE; \
    static unsigned long value; \
-   if (first && !(first = FALSE)) \
+   if (first) { \
+      first = FALSE; \
       value = debug_get_flags_option(name, flags, dfault); \
+   } \
    return value; \
 }