summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-09-27 15:43:44 +0200
committerDavid Robillard <d@drobilla.net>2020-09-27 15:43:44 +0200
commit0ab07d65fe9261ecfa495090691db324eff7aefc (patch)
tree24f90131d01039374ecdabab6008d734a762bedd /src
parentefbc456d41a634aa9b89b0333b26071f503bd5f3 (diff)
downloadsuil-0ab07d65fe9261ecfa495090691db324eff7aefc.tar.gz
suil-0ab07d65fe9261ecfa495090691db324eff7aefc.tar.bz2
suil-0ab07d65fe9261ecfa495090691db324eff7aefc.zip
Don't use else after return or break
Normally I don't enable this once, since it's often silly, but here it does actually make things more readable.
Diffstat (limited to 'src')
-rw-r--r--src/instance.c59
1 files changed, 32 insertions, 27 deletions
diff --git a/src/instance.c b/src/instance.c
index fd0aea2..9235f6e 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -46,36 +46,39 @@ suil_ui_supported(const char* host_type_uri,
SUIL_WRAPPING_NATIVE = 1,
SUIL_WRAPPING_EMBEDDED = 2
};
+
if (!strcmp(host_type_uri, ui_type_uri)) {
return SUIL_WRAPPING_NATIVE;
- } else if ((!strcmp(host_type_uri, GTK2_UI_URI)
- && !strcmp(ui_type_uri, QT4_UI_URI))
- || (!strcmp(host_type_uri, GTK2_UI_URI)
- && !strcmp(ui_type_uri, QT5_UI_URI))
- || (!strcmp(host_type_uri, QT4_UI_URI)
- && !strcmp(ui_type_uri, GTK2_UI_URI))
- || (!strcmp(host_type_uri, QT5_UI_URI)
- && !strcmp(ui_type_uri, GTK2_UI_URI))
- || (!strcmp(host_type_uri, GTK2_UI_URI)
- && !strcmp(ui_type_uri, X11_UI_URI))
- || (!strcmp(host_type_uri, GTK3_UI_URI)
- && !strcmp(ui_type_uri, X11_UI_URI))
- || (!strcmp(host_type_uri, GTK3_UI_URI)
- && !strcmp(ui_type_uri, QT5_UI_URI))
- || (!strcmp(host_type_uri, GTK2_UI_URI)
- && !strcmp(ui_type_uri, WIN_UI_URI))
- || (!strcmp(host_type_uri, GTK2_UI_URI)
- && !strcmp(ui_type_uri, COCOA_UI_URI))
- || (!strcmp(host_type_uri, QT4_UI_URI)
- && !strcmp(ui_type_uri, X11_UI_URI))
- || (!strcmp(host_type_uri, QT5_UI_URI)
- && !strcmp(ui_type_uri, X11_UI_URI))
- || (!strcmp(host_type_uri, QT5_UI_URI)
- && !strcmp(ui_type_uri, COCOA_UI_URI))) {
+ }
+
+ if ((!strcmp(host_type_uri, GTK2_UI_URI)
+ && !strcmp(ui_type_uri, QT4_UI_URI))
+ || (!strcmp(host_type_uri, GTK2_UI_URI)
+ && !strcmp(ui_type_uri, QT5_UI_URI))
+ || (!strcmp(host_type_uri, QT4_UI_URI)
+ && !strcmp(ui_type_uri, GTK2_UI_URI))
+ || (!strcmp(host_type_uri, QT5_UI_URI)
+ && !strcmp(ui_type_uri, GTK2_UI_URI))
+ || (!strcmp(host_type_uri, GTK2_UI_URI)
+ && !strcmp(ui_type_uri, X11_UI_URI))
+ || (!strcmp(host_type_uri, GTK3_UI_URI)
+ && !strcmp(ui_type_uri, X11_UI_URI))
+ || (!strcmp(host_type_uri, GTK3_UI_URI)
+ && !strcmp(ui_type_uri, QT5_UI_URI))
+ || (!strcmp(host_type_uri, GTK2_UI_URI)
+ && !strcmp(ui_type_uri, WIN_UI_URI))
+ || (!strcmp(host_type_uri, GTK2_UI_URI)
+ && !strcmp(ui_type_uri, COCOA_UI_URI))
+ || (!strcmp(host_type_uri, QT4_UI_URI)
+ && !strcmp(ui_type_uri, X11_UI_URI))
+ || (!strcmp(host_type_uri, QT5_UI_URI)
+ && !strcmp(ui_type_uri, X11_UI_URI))
+ || (!strcmp(host_type_uri, QT5_UI_URI)
+ && !strcmp(ui_type_uri, COCOA_UI_URI))) {
return SUIL_WRAPPING_EMBEDDED;
- } else {
- return SUIL_WRAPPING_UNSUPPORTED;
}
+
+ return SUIL_WRAPPING_UNSUPPORTED;
}
static SuilWrapper*
@@ -228,7 +231,9 @@ suil_instance_new(SuilHost* host,
const LV2UI_Descriptor* ld = df(i);
if (!ld) {
break;
- } else if (!strcmp(ld->URI, ui_uri)) {
+ }
+
+ if (!strcmp(ld->URI, ui_uri)) {
descriptor = ld;
break;
}