Merge pull request #391 from JFreegman/master

fix magic numbers in toxic

4 files changed, 17 insertions, 15 deletions

diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index 28c5de6c..56dfb050 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -16,7 +16,7 @@
 
 typedef struct {
   int friendnum;
-  char line[256];
+  char line[MAX_STR_SIZE];
   size_t pos;
   WINDOW* history;
   WINDOW* linewin;
@@ -178,9 +178,9 @@ void execute(ToxWindow *self, ChatContext *ctx, char *cmd)
   }
 
   else if (!strcmp(cmd, "/myid")) {
-    char id[32*2 + 1] = {0};
+    char id[KEY_SIZE_BYTES*2+1] = {0};
     int i;
-    for (i = 0; i < 32; i++) {
+    for (i = 0; i < KEY_SIZE_BYTES; i++) {
       char xx[3];
       snprintf(xx, sizeof(xx), "%02x",  self_public_key[i] & 0xff);
       strcat(id, xx);
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index b2310c80..d1519556 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -37,7 +37,7 @@ void on_request(uint8_t *public_key, uint8_t *data, uint16_t length)
   wprintw(prompt->window, "\nFriend request from:\n");
 
   int i;
-  for (i = 0; i < 32; ++i) {
+  for (i = 0; i < KEY_SIZE_BYTES; ++i) {
     wprintw(prompt->window, "%02x", public_key[i] & 0xff);
   }
 
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 661d881f..b50792fe 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -12,12 +12,12 @@
 
 #include "windows.h"
 
-uint8_t pending_requests[256][CLIENT_ID_SIZE]; // XXX
+uint8_t pending_requests[MAX_STR_SIZE][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests=0; // XXX
 
 extern void on_friendadded(int friendnumber);
 static void print_usage(ToxWindow *self);
-static char prompt_buf[256] = {0};
+static char prompt_buf[MAX_STR_SIZE] = {0};
 static int prompt_buf_pos = 0;
 
 // XXX:
@@ -43,7 +43,7 @@ unsigned char *hex_string_to_bin(char hex_string[])
 static void execute(ToxWindow *self, char *u_cmd)
 {
   int newlines = 0;
-  char cmd[256] = {0};
+  char cmd[MAX_STR_SIZE] = {0};
   int i;
   for (i = 0; i < strlen(prompt_buf); ++i) {
     if (u_cmd[i] == '\n')
@@ -53,9 +53,9 @@ static void execute(ToxWindow *self, char *u_cmd)
   }
 
   int leading_spc = 0;
-  for (i = 0; i < 256 && isspace(cmd[i]); ++i)
+  for (i = 0; i < MAX_STR_SIZE && isspace(cmd[i]); ++i)
     leading_spc++;
-  memmove(cmd, cmd + leading_spc, 256 - leading_spc);
+  memmove(cmd, cmd + leading_spc, MAX_STR_SIZE - leading_spc);
 
   int cmd_end = strlen(cmd);
   while (cmd_end > 0 && cmd_end--)
@@ -121,7 +121,7 @@ static void execute(ToxWindow *self, char *u_cmd)
   }
 
   else if (!strncmp(cmd, "add ", strlen("add "))) {
-    uint8_t id_bin[32];
+    uint8_t id_bin[KEY_SIZE_BYTES];
     char xx[3];
     uint32_t x;
     char *id = strchr(cmd, ' ');
@@ -136,12 +136,12 @@ static void execute(ToxWindow *self, char *u_cmd)
       msg++;
     }
     else msg = "";
-    if (strlen(id) != 2*32) {
+    if (strlen(id) != 2*KEY_SIZE_BYTES) {
       wprintw(self->window, "Invalid ID length.\n");
       return;
     }
     int i;
-    for (i = 0; i < 32; ++i) {
+    for (i = 0; i < KEY_SIZE_BYTES; ++i) {
       xx[0] = id[2*i];
       xx[1] = id[2*i+1];
       xx[2] = '\0';
@@ -251,9 +251,9 @@ static void execute(ToxWindow *self, char *u_cmd)
   }
 
   else if (!strcmp(cmd, "myid")) {
-    char id[32*2 + 1] = {0};
+    char id[KEY_SIZE_BYTES*2 + 1] = {0};
     size_t i;
-    for (i = 0; i < 32; ++i) {
+    for (i = 0; i < KEY_SIZE_BYTES; ++i) {
       char xx[3];
       snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff);
       strcat(id, xx);
diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h
index cb45614d..287e534a 100644
--- a/testing/toxic/windows.h
+++ b/testing/toxic/windows.h
@@ -5,7 +5,9 @@
 #include <stdbool.h>
 #define TOXWINDOWS_MAX_NUM 32
 #define MAX_FRIENDS_NUM 100
- 
+#define MAX_STR_SIZE 256
+#define KEY_SIZE_BYTES 32
+
 /* number of permanent default windows */
 #define N_DEFAULT_WINS 2