From: Martin Peres <martin.peres@linux.intel.com>
Date: Wed, 25 Mar 2015 14:28:03 +0000 (+0200)
Subject: mesa/fbo: do not assign a value that is never read later on
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa3832155100850da8346faa64c3cb30c4e86e39;p=mesa.git

mesa/fbo: do not assign a value that is never read later on

The issue has been detected by coverty.

v2:
- move the declaration of obj to the else clause (Brian Paul)

v3: Review by Brian Paul
- get rid of the obj declaration in favor of a direct reference

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 072e1a8c8bb..3808b560e81 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1400,7 +1400,6 @@ create_render_buffers(struct gl_context *ctx, GLsizei n, GLuint *renderbuffers,
                       bool dsa)
 {
    const char *func = dsa ? "glCreateRenderbuffers" : "glGenRenderbuffers";
-   struct gl_renderbuffer *obj;
    GLuint first;
    GLint i;
 
@@ -1419,13 +1418,11 @@ create_render_buffers(struct gl_context *ctx, GLsizei n, GLuint *renderbuffers,
       renderbuffers[i] = name;
 
       if (dsa) {
-         obj = allocate_renderbuffer(ctx, name, func);
+         allocate_renderbuffer(ctx, name, func);
       } else {
-         obj = &DummyRenderbuffer;
-
-         /* insert the object into the hash table */
+         /* insert a dummy renderbuffer into the hash table */
          mtx_lock(&ctx->Shared->Mutex);
-         _mesa_HashInsert(ctx->Shared->RenderBuffers, name, obj);
+         _mesa_HashInsert(ctx->Shared->RenderBuffers, name, &DummyRenderbuffer);
          mtx_unlock(&ctx->Shared->Mutex);
       }
    }