Mesa (mesa_7_6_branch): mesa: Initialize variable in MatchInstruction.

Vinson Lee vlee at kemper.freedesktop.org
Thu Dec 10 18:52:48 PST 2009


Module: Mesa
Branch: mesa_7_6_branch
Commit: 94fba49be97008565c0225bc46894bfd9453bb5e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94fba49be97008565c0225bc46894bfd9453bb5e

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Dec 10 18:51:51 2009 -0800

mesa: Initialize variable in MatchInstruction.

---

 src/mesa/shader/nvfragparse.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 0fd5552..b739a6a 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -217,6 +217,12 @@ MatchInstruction(const GLubyte *token)
    const struct instruction_pattern *inst;
    struct instruction_pattern result;
 
+   result.name = NULL;
+   result.opcode = MAX_OPCODE; /* i.e. invalid instruction */
+   result.inputs = 0;
+   result.outputs = 0;
+   result.suffixes = 0;
+
    for (inst = Instructions; inst->name; inst++) {
       if (_mesa_strncmp((const char *) token, inst->name, 3) == 0) {
          /* matched! */
@@ -247,7 +253,7 @@ MatchInstruction(const GLubyte *token)
          return result;
       }
    }
-   result.opcode = MAX_OPCODE; /* i.e. invalid instruction */
+
    return result;
 }
 



More information about the mesa-commit mailing list