From 03b67742f6e3939ceae5f9587c60391d35259f6d Mon Sep 17 00:00:00 2001 From: Wynn Wolf Arbor Date: Wed, 18 Mar 2020 19:47:57 +0100 Subject: Fix several sign-compare warnings --- kbfunc.c | 4 +++- search.c | 4 ++-- xevents.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kbfunc.c b/kbfunc.c index c68aa8c..a58a9ac 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -626,7 +626,9 @@ kbfunc_menu_exec(void *ctx, struct cargs *cargs) (void)memset(tpath, '\0', sizeof(tpath)); l = snprintf(tpath, sizeof(tpath), "%s/%s", paths[i], dp->d_name); - if (l == -1 || l >= sizeof(tpath)) + if (l < 0) + continue; + if ((unsigned)l >= sizeof(tpath)) continue; /* Skip everything but regular files and symlinks. */ if (dp->d_type != DT_REG && dp->d_type != DT_LNK) { diff --git a/search.c b/search.c index 3a9e1e7..e0a8c5f 100644 --- a/search.c +++ b/search.c @@ -97,7 +97,7 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) continue; /* Current window is ranked down. */ - if ((tier < nitems(tierp) - 1) && (cc->flags & CLIENT_ACTIVE)) + if (((unsigned)tier < nitems(tierp) - 1) && (cc->flags & CLIENT_ACTIVE)) tier++; /* Hidden window is ranked up. */ @@ -160,7 +160,7 @@ match_path_type(struct menu_q *resultq, char *search, int flag) struct menu *mi; char *pattern; glob_t g; - int i; + size_t i; xasprintf(&pattern, "%s*", search); if (glob(pattern, GLOB_MARK, NULL, &g) != 0) diff --git a/xevents.c b/xevents.c index f2bcf84..5b5a0af 100644 --- a/xevents.c +++ b/xevents.c @@ -410,7 +410,7 @@ xev_handle_clientmessage(XEvent *ee) * is 0xFFFFFFFF (-1) then the window should appear * on all desktops, in our case, group 0. */ - if (e->data.l[0] == (unsigned long)-1) + if (e->data.l[0] == 0xFFFFFFFF) group_movetogroup(cc, 0); else if (e->data.l[0] >= 0 && -- cgit v1.2.3-2-gb3c3