all: Remove unneeded use of WCORE_ERROR_DISABLED

Now that the error policy has changed (first error wins),
most uses of WCORE_ERROR_DISABLED are unneeded.

The only usage that remains occurs in linux_platform_dl_can_open().

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

11 files changed, 12 insertions, 34 deletions

diff --git a/src/waffle/core/wcore_platform.c b/src/waffle/core/wcore_platform.c
index b34a7d5..d28d150 100644
--- a/src/waffle/core/wcore_platform.c
+++ b/src/waffle/core/wcore_platform.c
@@ -84,9 +84,7 @@ wcore_platform_create(int platform, int gl_api)
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        wcore_platform_destroy(self);
-    });
+    wcore_platform_destroy(self);
     return NULL;
 }
 
diff --git a/src/waffle/glx/glx_config.c b/src/waffle/glx/glx_config.c
index dc26132..93ac755 100644
--- a/src/waffle/glx/glx_config.c
+++ b/src/waffle/glx/glx_config.c
@@ -176,10 +176,8 @@ glx_config_choose(
     goto end;
 
 error:
-    WCORE_ERROR_DISABLED({
-        glx_config_destroy(self);
-        self = NULL;
-    });
+    glx_config_destroy(self);
+    self = NULL;
 
 end:
     if (configs)
diff --git a/src/waffle/glx/glx_display.c b/src/waffle/glx/glx_display.c
index d51f077..739a2f0 100644
--- a/src/waffle/glx/glx_display.c
+++ b/src/waffle/glx/glx_display.c
@@ -80,9 +80,7 @@ glx_display_connect(
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        glx_display_disconnect(self);
-    });
+    glx_display_disconnect(self);
     return NULL;
 }
 
diff --git a/src/waffle/glx/glx_platform.c b/src/waffle/glx/glx_platform.c
index 668dc12..eac61b1 100644
--- a/src/waffle/glx/glx_platform.c
+++ b/src/waffle/glx/glx_platform.c
@@ -74,9 +74,7 @@ glx_platform_create(
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        glx_platform_destroy(self);
-    });
+    glx_platform_destroy(self);
     return NULL;
 }
 
diff --git a/src/waffle/glx/glx_window.c b/src/waffle/glx/glx_window.c
index d5ab762..282414e 100644
--- a/src/waffle/glx/glx_window.c
+++ b/src/waffle/glx/glx_window.c
@@ -67,9 +67,7 @@ glx_window_create(
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        glx_window_destroy(self);
-    });
+    glx_window_destroy(self);
     return NULL;
 }
 
diff --git a/src/waffle/wayland/wayland_display.c b/src/waffle/wayland/wayland_display.c
index 9828a66..d7327f7 100644
--- a/src/waffle/wayland/wayland_display.c
+++ b/src/waffle/wayland/wayland_display.c
@@ -79,9 +79,7 @@ wayland_display_connect(
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        wayland_display_disconnect(self);
-    });
+    wayland_display_disconnect(self);
     return NULL;
 }
 
diff --git a/src/waffle/wayland/wayland_platform.c b/src/waffle/wayland/wayland_platform.c
index fe8842c..a2345e1 100644
--- a/src/waffle/wayland/wayland_platform.c
+++ b/src/waffle/wayland/wayland_platform.c
@@ -93,9 +93,7 @@ wayland_platform_create(
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        wayland_platform_destroy(self);
-    });
+    wayland_platform_destroy(self);
     return NULL;
 }
 
diff --git a/src/waffle/wayland/wayland_window.c b/src/waffle/wayland/wayland_window.c
index 04d8d7b..b3725ab 100644
--- a/src/waffle/wayland/wayland_window.c
+++ b/src/waffle/wayland/wayland_window.c
@@ -93,9 +93,7 @@ wayland_window_create(
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        wayland_window_destroy(self);
-    });
+    wayland_window_destroy(self);
     return NULL;
 }
 
diff --git a/src/waffle/x11_egl/xegl_display.c b/src/waffle/x11_egl/xegl_display.c
index c69f588..b12167a 100644
--- a/src/waffle/x11_egl/xegl_display.c
+++ b/src/waffle/x11_egl/xegl_display.c
@@ -58,9 +58,7 @@ xegl_display_connect(
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        xegl_display_disconnect(self);
-    });
+    xegl_display_disconnect(self);
     return NULL;
 }
 
diff --git a/src/waffle/x11_egl/xegl_platform.c b/src/waffle/x11_egl/xegl_platform.c
index e40ec02..d206d04 100644
--- a/src/waffle/x11_egl/xegl_platform.c
+++ b/src/waffle/x11_egl/xegl_platform.c
@@ -93,9 +93,7 @@ xegl_platform_create(
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        xegl_platform_destroy(self);
-    });
+    xegl_platform_destroy(self);
     return NULL;
 }
 
diff --git a/src/waffle/x11_egl/xegl_window.c b/src/waffle/x11_egl/xegl_window.c
index 0eec7d0..5a09c39 100644
--- a/src/waffle/x11_egl/xegl_window.c
+++ b/src/waffle/x11_egl/xegl_window.c
@@ -64,9 +64,7 @@ xegl_window_create(
     return self;
 
 error:
-    WCORE_ERROR_DISABLED({
-        xegl_window_destroy(self);
-    });
+    xegl_window_destroy(self);
     return NULL;
 }