Mesa (master): egl: Drop check for driver != NULL.

Eric Anholt anholt at kemper.freedesktop.org
Mon Jun 15 17:42:41 UTC 2015


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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jun  9 12:16:19 2015 -0700

egl: Drop check for driver != NULL.

Back in 2013, a patch was added (with 2 reviewers!) at the end of the
block to early exit the loop in this case, without noticing that the loop
already did.  I added another early exit case, again without noticing, but
Rob caught me.  Just drop the loop condition that apparently surprises
most of us, instead of leaving the end of the loop conspicuously not
exiting on success.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Rob Clark <robdclark at gmail.com>

---

 src/egl/drivers/dri2/egl_dri2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 44a6c96..dceb9a0 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -397,7 +397,7 @@ dri2_open_driver(_EGLDisplay *disp)
 
    dri2_dpy->driver = NULL;
    end = search_paths + strlen(search_paths);
-   for (p = search_paths; p < end && dri2_dpy->driver == NULL; p = next + 1) {
+   for (p = search_paths; p < end; p = next + 1) {
       int len;
       next = strchr(p, ':');
       if (next == NULL)




More information about the mesa-commit mailing list