mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

string-helpers.c: add string_empty()

Browse source
This commit is contained in:
Johan Malm 2024-01-19 19:06:07 +00:00 • committed by Johan Malm
parent 8c9be2f0d1
commit c066821046
9 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/button/button-png.c
View file

@ -12,6 +12,7 @@
#include "buffer.h"
#include "button/button-png.h"
#include "button/common.h"
#include "common/string-helpers.h"
#include "labwc.h"
/*
@ -49,7 +50,7 @@ button_png_load(const char *button_name, struct lab_data_buffer **buffer)
wlr_buffer_drop(&(*buffer)->base);
*buffer = NULL;
}
if (!button_name || !*button_name) {
if (string_null_or_empty(button_name)) {
return;
}

3
src/button/button-svg.c
View file

@ -12,6 +12,7 @@
#include "buffer.h"
#include "button/button-svg.h"
#include "button/common.h"
#include "common/string-helpers.h"
#include "labwc.h"
void
@ -22,7 +23,7 @@ button_svg_load(const char *button_name, struct lab_data_buffer **buffer,
wlr_buffer_drop(&(*buffer)->base);
*buffer = NULL;
}
if (!button_name || !*button_name) {
if (string_null_or_empty(button_name)) {
return;
}

3
src/button/button-xbm.c
View file

@ -17,6 +17,7 @@
#include "button/common.h"
#include "common/grab-file.h"
#include "common/mem.h"
#include "common/string-helpers.h"
#include "buffer.h"
enum token_type {
@ -279,7 +280,7 @@ button_xbm_load(const char *button_name, struct lab_data_buffer **buffer,
wlr_buffer_drop(&(*buffer)->base);
*buffer = NULL;
}
if (!button_name || !*button_name) {
if (string_null_or_empty(button_name)) {
return;
}
color = argb32(rgba);

3
src/common/font.c
View file

@ -7,6 +7,7 @@
#include <wlr/util/log.h>
#include "common/font.h"
#include "common/graphic-helpers.h"
#include "common/string-helpers.h"
#include "labwc.h"
#include "buffer.h"
@ -84,7 +85,7 @@ font_buffer_create(struct lab_data_buffer **buffer, int max_width,
max_width = 2;
}
if (!text || !*text) {
if (string_null_or_empty(text)) {
return;
}

6
src/common/string-helpers.c
View file

@ -6,6 +6,12 @@
#include "common/mem.h"
#include "common/string-helpers.h"
bool
string_null_or_empty(const char *s)
{
return !s || !*s;
}
void
trim_last_field(char *buf, char delim)
{

3
src/config/libinput.c
View file

@ -4,6 +4,7 @@
#include "common/mem.h"
#include "common/list.h"
#include "common/string-helpers.h"
#include "config/libinput.h"
#include "config/rcxml.h"
@ -27,7 +28,7 @@ libinput_category_init(struct libinput_category *l)
enum lab_libinput_device_type
get_device_type(const char *s)
{
if (!s || !*s) {
if (string_null_or_empty(s)) {
return LAB_LIBINPUT_DEVICE_NONE;
}
if (!strcasecmp(s, "default")) {

10
src/config/session.c
View file

@ -14,16 +14,10 @@
#include "config/session.h"
#include "labwc.h"
static bool
string_empty(const char *s)
{
return !s || !*s;
}
static void
process_line(char *line)
{
if (string_empty(line) || line[0] == '#') {
if (string_null_or_empty(line) || line[0] == '#') {
return;
}
char *key = NULL;
@ -39,7 +33,7 @@ process_line(char *line)
buf_add(&value, string_strip(++p));
buf_expand_shell_variables(&value);
buf_expand_tilde(&value);
if (string_empty(key) || !value.len) {
if (string_null_or_empty(key) || !value.len) {
goto error;
}
setenv(key, value.buf, 1);

3
src/ssd/ssd_titlebar.c
View file

@ -7,6 +7,7 @@
#include "common/mem.h"
#include "common/scaled_font_buffer.h"
#include "common/scene-helpers.h"
#include "common/string-helpers.h"
#include "labwc.h"
#include "node.h"
#include "ssd-internal.h"
@ -325,7 +326,7 @@ ssd_update_title(struct ssd *ssd)
struct view *view = ssd->view;
char *title = (char *)view_get_string_prop(view, "title");
if (!title || !*title) {
if (string_null_or_empty(title)) {
return;
}