libweston: drop return type from ::query_dmabuf_{formats, modifiers}

Nobody checks for the bool returned by these functions. At the same
time: a) the functions set the respective num_foo to zero on error and
b) callers honour that variable.

Just drop the return type - it's useless.

Note: this is an ABI break.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>

diff --git a/libweston/compositor.h b/libweston/compositor.h
index 97f9a2ffb8a00dbd70306c6bebe7705fef5810bb..dffcba899ecb82bb2900ead51eab303abe63af6b 100644 (file)
--- a/libweston/compositor.h
+++ b/libweston/compositor.h
@@ -755,10 +755,12 @@ struct weston_renderer {
        bool (*import_dmabuf)(struct weston_compositor *ec,
                              struct linux_dmabuf_buffer *buffer);
 
-       bool (*query_dmabuf_formats)(struct weston_compositor *ec,
+       /** On error sets num_formats to zero */
+       void (*query_dmabuf_formats)(struct weston_compositor *ec,
                                int **formats, int *num_formats);
 
-       bool (*query_dmabuf_modifiers)(struct weston_compositor *ec,
+       /** On error sets num_modifiers to zero */
+       void (*query_dmabuf_modifiers)(struct weston_compositor *ec,
                                int format, uint64_t **modifiers,
                                int *num_modifiers);
 };

diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
index 5a4b83cd96f6f220e0d1fe0666716b31ece9228e..abf556f03de3a7c03061db08b63ebcfa8714943f 100644 (file)
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -2083,7 +2083,7 @@ import_dmabuf(struct gl_renderer *gr,
        return image;
 }
 
-static bool
+static void
 gl_renderer_query_dmabuf_formats(struct weston_compositor *wc,
                                int **formats, int *num_formats)
 {
@@ -2095,25 +2095,24 @@ gl_renderer_query_dmabuf_formats(struct weston_compositor *wc,
        if (!gr->has_dmabuf_import_modifiers ||
            !gr->query_dmabuf_formats(gr->egl_display, 0, NULL, &num)) {
                *num_formats = 0;
-               return false;
+               return;
        }
 
        *formats = calloc(num, sizeof(int));
        if (*formats == NULL) {
                *num_formats = 0;
-               return false;
+               return;
        }
        if (!gr->query_dmabuf_formats(gr->egl_display, num, *formats, &num)) {
                *num_formats = 0;
                free(*formats);
-               return false;
+               return;
        }
 
        *num_formats = num;
-       return true;
 }
 
-static bool
+static void
 gl_renderer_query_dmabuf_modifiers(struct weston_compositor *wc, int format,
                                        uint64_t **modifiers,
                                        int *num_modifiers)
@@ -2127,23 +2126,22 @@ gl_renderer_query_dmabuf_modifiers(struct weston_compositor *wc, int format,
                !gr->query_dmabuf_modifiers(gr->egl_display, format, 0, NULL,
                                            NULL, &num)) {
                *num_modifiers = 0;
-               return false;
+               return;
        }
 
        *modifiers = calloc(num, sizeof(uint64_t));
        if (*modifiers == NULL) {
                *num_modifiers = 0;
-               return false;
+               return;
        }
        if (!gr->query_dmabuf_modifiers(gr->egl_display, format,
                                num, *modifiers, NULL, &num)) {
                *num_modifiers = 0;
                free(*modifiers);
-               return false;
+               return;
        }
 
        *num_modifiers = num;
-       return true;
 }
 
 static bool