button: save a few cycles by returning early

...and in preparation for the merge-config patch, avoid building
directory lists for empty filenames.

diff --git a/src/button/button-png.c b/src/button/button-png.c
index f094f1a931d7f6bf5f899b57ffbcd4b169bef902..e053ad4778507931e170d96158da2a4cb417ab5c 100644 (file)
--- a/src/button/button-png.c
+++ b/src/button/button-png.c
@@ -49,6 +49,9 @@ button_png_load(const char *button_name, struct lab_data_buffer **buffer)
                wlr_buffer_drop(&(*buffer)->base);
                *buffer = NULL;
        }
+       if (!button_name || !*button_name) {
+               return;
+       }
 
        char path[4096] = { 0 };
        button_filename(button_name, path, sizeof(path));

diff --git a/src/button/button-svg.c b/src/button/button-svg.c
index 17882c0d3e20cceedc4e974e120f83c56356b651..2846e5b158fe169644d02fd26638aa2e606f9d85 100644 (file)
--- a/src/button/button-svg.c
+++ b/src/button/button-svg.c
@@ -22,6 +22,9 @@ button_svg_load(const char *button_name, struct lab_data_buffer **buffer,
                wlr_buffer_drop(&(*buffer)->base);
                *buffer = NULL;
        }
+       if (!button_name || !*button_name) {
+               return;
+       }
 
        char filename[4096] = { 0 };
        button_filename(button_name, filename, sizeof(filename));

diff --git a/src/button/button-xbm.c b/src/button/button-xbm.c
index 908cacaa1a2ea2072d5589d10d231b21637b74c1..fe7460fa9f0f313776702e14b71fe912eb01cdca 100644 (file)
--- a/src/button/button-xbm.c
+++ b/src/button/button-xbm.c
@@ -279,6 +279,9 @@ button_xbm_load(const char *button_name, struct lab_data_buffer **buffer,
                wlr_buffer_drop(&(*buffer)->base);
                *buffer = NULL;
        }
+       if (!button_name || !*button_name) {
+               return;
+       }
        color = argb32(rgba);
 
        /* Read file into memory as it's easier to tokenize that way */