From 345c5d5964007c2d7abed8bc563c0ad99e604b50 Mon Sep 17 00:00:00 2001 From: Abhinav Prasai Date: Fri, 29 Aug 2025 19:34:03 +0100 Subject: make shiftor unsigned to prevent undefined behavior --- src/sxwm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sxwm.c') diff --git a/src/sxwm.c b/src/sxwm.c index 6ed33c0..57be734 100644 --- a/src/sxwm.c +++ b/src/sxwm.c @@ -2783,10 +2783,10 @@ void update_modifier_masks(void) /* keycode at mod[i][j] */ KeyCode keycode = mod_mapping->modifiermap[i * mod_mapping->max_keypermod + j]; if (keycode == num) { - numlock_mask = (1 << i); /* which mod bit == NumLock key */ + numlock_mask = (1u << i); /* which mod bit == NumLock key */ } if (keycode == mode) { - mode_switch_mask = (1 << i); /* which mod bit == Mode_switch key */ + mode_switch_mask = (1u << i); /* which mod bit == Mode_switch key */ } } } -- cgit v1.2.3 From fc9b4122b2a5869eea52def7752c884343f8d87a Mon Sep 17 00:00:00 2001 From: dehroox Date: Mon, 1 Sep 2025 14:08:15 +0800 Subject: make printing more consistent --- src/sxwm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/sxwm.c') diff --git a/src/sxwm.c b/src/sxwm.c index 57be734..e507a83 100644 --- a/src/sxwm.c +++ b/src/sxwm.c @@ -1106,7 +1106,7 @@ void hdl_map_req(XEvent *xev) } if (open_windows == MAX_CLIENTS) { - printf("sxwm: max clients reached, ignoring map request\n"); + fprintf(stderr, "sxwm: max clients reached, ignoring map request\n"); return; } @@ -1458,13 +1458,13 @@ Bool is_child_proc(pid_t parent_pid, pid_t child_pid) snprintf(path, sizeof(path), "/proc/%d/stat", current_pid); f = fopen(path, "r"); if (!f) { - printf("sxwm: could not open %s\n", path); + fprintf(stderr, "sxwm: could not open %s\n", path); return False; } int ppid = 0; if (fscanf(f, "%*d %*s %*c %d", &ppid) != 1) { - printf("sxwm: failed to read ppid from %s\n", path); + fprintf(stderr, "sxwm: failed to read ppid from %s\n", path); fclose(f); return False; } @@ -1476,7 +1476,7 @@ Bool is_child_proc(pid_t parent_pid, pid_t child_pid) if (ppid <= 1) { /* Reached init or kernel */ - printf("sxwm: reached init/kernel, no relationship found\n"); + fprintf(stderr, "sxwm: reached init/kernel, no relationship found\n"); break; } current_pid = ppid; @@ -1720,7 +1720,7 @@ void quit(void) XFreeCursor(dpy, cursor_move); XFreeCursor(dpy, cursor_normal); XFreeCursor(dpy, cursor_resize); - printf("quitting...\n"); + puts("quitting..."); running = False; } @@ -3014,7 +3014,7 @@ void xev_case(XEvent *xev) evtable[xev->type](xev); } else { - printf("sxwm: invalid event type: %d\n", xev->type); + fprintf(stderr, "sxwm: invalid event type: %d\n", xev->type); } } @@ -3037,7 +3037,7 @@ int main(int ac, char **av) } } setup(); - printf("sxwm: starting...\n"); + puts("sxwm: starting..."); run(); return 0; } -- cgit v1.2.3 From 1fb97bcb79e90e2db15103ccdeeb39de40e2f675 Mon Sep 17 00:00:00 2001 From: dehroox Date: Mon, 1 Sep 2025 14:46:45 +0800 Subject: use return instead of exit in main() --- src/sxwm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sxwm.c') diff --git a/src/sxwm.c b/src/sxwm.c index e507a83..c135ab7 100644 --- a/src/sxwm.c +++ b/src/sxwm.c @@ -3023,7 +3023,7 @@ int main(int ac, char **av) if (ac > 1) { if (strcmp(av[1], "-v") == 0 || strcmp(av[1], "--version") == 0) { printf("%s\n%s\n%s\n", SXWM_VERSION, SXWM_AUTHOR, SXWM_LICINFO); - exit(0); + return 0; } else if (strcmp(av[1], "-b") == 0 || strcmp(av[1], "--backup") == 0) { puts("sxwm: using backup keybinds"); @@ -3033,7 +3033,7 @@ int main(int ac, char **av) puts("usage:\n"); puts("\t[-v || --version]: See the version of sxwm\n"); puts("\t[-b || --backup]: Use backup set of keybinds with sxwm\n"); - exit(0); + return 0; } } setup(); -- cgit v1.2.3 From ffe3105b0fbd1043ccd32132dae4c7d87d01e95a Mon Sep 17 00:00:00 2001 From: dehroox Date: Mon, 1 Sep 2025 14:54:39 +0800 Subject: use fancy schamncy macros accordingly --- src/sxwm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sxwm.c') diff --git a/src/sxwm.c b/src/sxwm.c index c135ab7..820eca8 100644 --- a/src/sxwm.c +++ b/src/sxwm.c @@ -3023,7 +3023,7 @@ int main(int ac, char **av) if (ac > 1) { if (strcmp(av[1], "-v") == 0 || strcmp(av[1], "--version") == 0) { printf("%s\n%s\n%s\n", SXWM_VERSION, SXWM_AUTHOR, SXWM_LICINFO); - return 0; + return EXIT_SUCCESS; } else if (strcmp(av[1], "-b") == 0 || strcmp(av[1], "--backup") == 0) { puts("sxwm: using backup keybinds"); @@ -3033,11 +3033,11 @@ int main(int ac, char **av) puts("usage:\n"); puts("\t[-v || --version]: See the version of sxwm\n"); puts("\t[-b || --backup]: Use backup set of keybinds with sxwm\n"); - return 0; + return EXIT_SUCCESS; } } setup(); puts("sxwm: starting..."); run(); - return 0; + return EXIT_SUCCESS; } -- cgit v1.2.3