mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-03 02:47:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use has_prefix() instead of strncmp() throughout

Browse source 
This is safer than hardcoded string lengths.
This commit is contained in:
Simon Ser 2025-01-07 13:21:56 +01:00 • committed by Kenny Levinsen
parent c55dff95bc
commit 0c60d1581f
19 changed files with 44 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

5
swaybar/ipc.c
View file

@ -15,6 +15,7 @@
#include "list.h"
#include "log.h"
#include "loop.h"
#include "stringop.h"
#include "util.h"
void ipc_send_workspace_command(struct swaybar *bar, const char *ws) {
@ -45,8 +46,8 @@ void ipc_send_workspace_command(struct swaybar *bar, const char *ws) {
char *parse_font(const char *font) {
char *new_font = NULL;
if (strncmp("pango:", font, 6) == 0) {
font += 6;
if (has_prefix("pango:", font)) {
font += strlen("pango:");
}
new_font = strdup(font);
return new_font;

6
swaybar/render.c
View file

@ -293,11 +293,11 @@ static uint32_t render_status_block(struct render_context *ctx,
}
double offset = 0;
if (strncmp(block->align, "left", 4) == 0) {
if (has_prefix(block->align, "left")) {
offset = x_pos;
} else if (strncmp(block->align, "right", 5) == 0) {
} else if (has_prefix(block->align, "right")) {
offset = x_pos + width - text_width;
} else if (strncmp(block->align, "center", 6) == 0) {
} else if (has_prefix(block->align, "center")) {
offset = x_pos + (width - text_width) / 2;
}
double text_y = height / 2.0 - text_height / 2.0;

5
swaybar/tray/item.c
View file

@ -15,6 +15,7 @@
#include "cairo_util.h"
#include "list.h"
#include "log.h"
#include "stringop.h"
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
// TODO menu
@ -161,7 +162,7 @@ static int get_property_callback(sd_bus_message *msg, void *data,
}
if (strcmp(prop, "Status") == 0 || (sni->status && (sni->status[0] == 'N' ?
prop[0] == 'A' : strncmp(prop, "Icon", 4) == 0))) {
prop[0] == 'A' : has_prefix(prop, "Icon")))) {
set_sni_dirty(sni);
}
cleanup:
@ -364,7 +365,7 @@ static void handle_click(struct swaybar_sni *sni, int x, int y,
method = "ContextMenu";
}
if (strncmp(method, "Scroll", strlen("Scroll")) == 0) {
if (has_prefix(method, "Scroll")) {
char dir = method[strlen("Scroll")];
char *orientation = (dir == 'U' || dir == 'D') ? "vertical" : "horizontal";
int sign = (dir == 'U' || dir == 'L') ? -1 : 1;

6
swaybar/tray/watcher.c
View file

@ -31,9 +31,9 @@ static int handle_lost_service(sd_bus_message *msg,
struct swaybar_watcher *watcher = data;
for (int idx = 0; idx < watcher->items->length; ++idx) {
char *id = watcher->items->items[idx];
int cmp_res = using_standard_protocol(watcher) ?
cmp_id(id, service) : strncmp(id, service, strlen(service));
if (cmp_res == 0) {
bool cmp_res = using_standard_protocol(watcher) ?
cmp_id(id, service) == 0 : has_prefix(id, service);
if (cmp_res) {
sway_log(SWAY_DEBUG, "Unregistering Status Notifier Item '%s'", id);
list_del(watcher->items, idx--);
sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface,