From 74b84c425231d70a509adc3992678933b6ff67d7 Mon Sep 17 00:00:00 2001
From: Jfreegman <Jfreegman@gmail.com>
Date: Sun, 6 Jul 2014 23:08:36 -0400
Subject: [PATCH] some code cleanup

---
 src/chat_commands.c   |  4 ++--
 src/global_commands.c | 10 +++++-----
 src/prompt.c          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/chat_commands.c b/src/chat_commands.c
index 15cf701..ba0435e 100644
--- a/src/chat_commands.c
+++ b/src/chat_commands.c
@@ -171,8 +171,8 @@ void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
     }
 
     ++path;
-    path[strlen(path) - 1] = L'\0';
-    int path_len = strlen(path);
+    int path_len = strlen(path) - 1;
+    path[path_len] = '\0';
 
     if (path_len > MAX_STR_SIZE) {
         errmsg = "File path exceeds character limit.";
diff --git a/src/global_commands.c b/src/global_commands.c
index 92ec9d4..dbf70de 100644
--- a/src/global_commands.c
+++ b/src/global_commands.c
@@ -156,7 +156,7 @@ void cmd_add(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
         }
 
         ++temp;
-        temp[strlen(temp) - 1] = L'\0';
+        temp[strlen(temp) - 1] = '\0';
         snprintf(msg, sizeof(msg), "%s", temp);
     } else {
         char selfname[TOX_MAX_NAME_LENGTH];
@@ -377,8 +377,8 @@ void cmd_note(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
     }
 
     ++msg;
-    msg[strlen(msg) - 1] = '\0';
-    int len = strlen(msg);
+    int len = strlen(msg) - 1;
+    msg[len] = '\0';
     tox_set_status_message(m, (uint8_t *) msg, (uint16_t) len);
     prompt_update_statusmessage(prompt, msg);
 }
@@ -434,8 +434,8 @@ void cmd_status(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
 
     if (msg != NULL) {
         ++msg;
-        msg[strlen(msg) - 1] = L'\0'; /* remove opening and closing quotes */
-        int len = strlen(msg);
+        int len = strlen(msg) - 1;
+        msg[len] = '\0';    /* remove opening and closing quotes */
         tox_set_status_message(m, (uint8_t *) msg, (uint16_t) len);
         prompt_update_statusmessage(prompt, msg);
     }
diff --git a/src/prompt.c b/src/prompt.c
index 33d5c6d..232d7b4 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -270,7 +270,7 @@ static void prompt_onConnectionChange(ToxWindow *self, Tox *m, int32_t friendnum
 
     ChatContext *ctx = self->chatwin;
 
-    char nick[TOX_MAX_NAME_LENGTH];
+    char nick[TOX_MAX_NAME_LENGTH] = {0};
     int n_len = tox_get_name(m, friendnum, (uint8_t *) nick);
     n_len = MIN(n_len, TOXIC_MAX_NAME_LENGTH - 1);