cleanup: fix some infer warnings

TokTok · Feb 21, 2024 · 6e933b2 · 6e933b2
1 parent 06bb243
commit 6e933b2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/src/chat.c b/src/chat.c
@@ -1375,7 +1375,7 @@ static bool chat_onKey(ToxWindow *self, Toxic *toxic, wint_t key, bool ltr)
 
     if (key == L'\t' && ctx->len > 1 && ctx->line[0] == '/') {    /* TAB key: auto-complete */
         input_ret = true;
-        int diff = -1;
+        int diff;
 
         /* TODO: make this not suck */
         if (wcsncmp(ctx->line, L"/sendfile ", wcslen(L"/sendfile ")) == 0) {
@@ -1395,7 +1395,7 @@ static bool chat_onKey(ToxWindow *self, Toxic *toxic, wint_t key, bool ltr)
             diff = complete_line(self, toxic, chat_cmd_list, sizeof(chat_cmd_list) / sizeof(char *));
         }
 
-        if (diff != -1) {
+        if (diff >= 0) {
             if (x + diff > x2 - 1) {
                 const int wlen = MAX(0, wcswidth(ctx->line, sizeof(ctx->line) / sizeof(wchar_t)));
                 ctx->start = wlen < x2 ? 0 : wlen - x2 + 1;

diff --git a/src/conference.c b/src/conference.c
@@ -1224,7 +1224,6 @@ static void conference_onDraw(ToxWindow *self, Toxic *toxic)
         mvwaddch(ctx->sidebar, line, 0, ACS_LTEE);
         mvwhline(ctx->sidebar, line, 1, ACS_HLINE, SIDEBAR_WIDTH - 1);
         wattroff(ctx->sidebar, COLOR_PAIR(PEERLIST_LINE));
-        ++line;
 
         for (uint32_t i = 0;
                 i < num_peers && i < y2 - header_lines - CHATBOX_HEIGHT;

diff --git a/src/friendlist.c b/src/friendlist.c
@@ -1197,7 +1197,7 @@ static void friendlist_onDraw(ToxWindow *self, Toxic *toxic)
             pthread_mutex_unlock(&Winthread.lock);
 
             if (connection_status != TOX_CONNECTION_NONE) {
-                int colour = MAGENTA;
+                int colour;
 
                 switch (status) {
                     case TOX_USER_STATUS_NONE:
@@ -1211,6 +1211,10 @@ static void friendlist_onDraw(ToxWindow *self, Toxic *toxic)
                     case TOX_USER_STATUS_BUSY:
                         colour = RED;
                         break;
+
+                    default:
+                        colour = BAR_TEXT;
+                        break;
                 }
 
                 wattron(self->window, COLOR_PAIR(colour) | A_BOLD);

diff --git a/src/groupchats.c b/src/groupchats.c
@@ -1955,7 +1955,7 @@ static bool groupchat_onKey(ToxWindow *self, Toxic *toxic, wint_t key, bool ltr)
         input_ret = true;
 
         if (ctx->len > 0) {
-            int diff = -1;
+            int diff;
 
             /* TODO: make this not suck */
             if (ctx->line[0] != L'/' || wcschr(ctx->line, L' ') != NULL) {

diff --git a/src/misc_tools.c b/src/misc_tools.c
@@ -567,9 +567,9 @@ int char_find(int idx, const char *s, char ch)
         return 0;
     }
 
-    int i = idx;
+    int i;
 
-    for (i = idx; s[i]; ++i) {
+    for (i = idx; s[i] != '\0'; ++i) {
         if (s[i] == ch) {
             break;
         }