try to limit scope of globals

src/chat.c

@@ -19,6 +19,9 @@ extern char *DATA_FILE;
 extern int store_data(Tox *m, char *path);
 extern int num_groupchats;
 
+extern FileSender file_senders[MAX_FILES];
+extern ToxicFriend friends[MAX_FRIENDS_NUM];
+
 static void chat_onMessage(ToxWindow *self, Tox *m, int num, uint8_t *msg, uint16_t len)
 {
     if (self->num != num)

src/chat_commands.c

@@ -16,6 +16,11 @@
 extern ToxWindow *prompt;
 extern int num_groupchats;
 
+extern ToxicFriend friends[MAX_FRIENDS_NUM];
+
+extern FileSender file_senders[MAX_FILES];
+extern uint8_t max_file_senders_index;
+
 void cmd_chat_help(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
     wattron(window, COLOR_PAIR(CYAN) | A_BOLD);

src/friendlist.c

@@ -23,6 +23,7 @@ static int max_friends_index = 0;    /* marks the index of the last friend in fr
 static int num_friends = 0;
 static int num_selected = 0;
 
+ToxicFriend friends[MAX_FRIENDS_NUM];
 static int friendlist_index[MAX_FRIENDS_NUM] = {0};
 
 static int index_name_cmp(const void *n1, const void *n2)

src/friendlist.h

@@ -3,6 +3,20 @@
 
 #include "toxic_windows.h"
 
+typedef struct {
+    uint8_t name[TOX_MAX_NAME_LENGTH];
+    uint16_t namelength;
+    uint8_t statusmsg[TOX_MAX_STATUSMESSAGE_LENGTH];
+    uint16_t statusmsg_len;
+    uint8_t pending_groupchat[TOX_CLIENT_ID_SIZE];
+    int num;
+    int chatwin;
+    bool active;
+    bool online;
+    TOX_USERSTATUS status;
+    struct FileReceiver file_receiver;
+} ToxicFriend;
+
 ToxWindow new_friendlist(void);
 void disable_chatwin(int f_num);
 int get_friendnum(uint8_t *name);

src/global_commands.c

@@ -11,12 +11,16 @@
 
 #include "toxic_windows.h"
 #include "misc_tools.h"
+#include "friendlist.h"
 
 extern char *DATA_FILE;
 extern ToxWindow *prompt;
 
+extern ToxicFriend friends[MAX_FRIENDS_NUM];
+
 extern uint8_t pending_frnd_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE];
 extern uint8_t num_frnd_requests;
+
 extern int num_groupchats;
 
 /* command functions */

src/groupchat.c

@@ -15,15 +15,13 @@
 #include "misc_tools.h"
 #include "groupchat.h"
 
-static GroupChat groupchats[MAX_GROUPCHAT_NUM];
-static int max_groupchat_index = 0;
-int num_groupchats = 0;
-
-ToxWindow new_group_chat(Tox *m, int groupnum);
-
 extern char *DATA_FILE;
 extern int store_data(Tox *m, char *path);
 
+GroupChat groupchats[MAX_GROUPCHAT_NUM];
+int num_groupchats = 0;
+static int max_groupchat_index = 0;
+
 int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum)
 {
     int i;

src/groupchat.h

@@ -13,3 +13,4 @@ typedef struct {
 } GroupChat;
 
 int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum);
+ToxWindow new_group_chat(Tox *m, int groupnum);

src/main.c

@@ -49,6 +49,9 @@ char *DATA_FILE = NULL;
 char *SRVLIST_FILE = NULL;
 ToxWindow *prompt = NULL;
 
+FileSender file_senders[MAX_FILES];
+uint8_t max_file_senders_index;
+
 void on_window_resize(int sig)
 {
     endwin();

src/misc_tools.h

@@ -2,7 +2,7 @@
  * Toxic -- Tox Curses Client
  */
 
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
+// #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 
 /* convert a hex string to binary */
 unsigned char *hex_string_to_bin(char hex_string[]);

src/toxic_windows.h

@@ -123,9 +123,6 @@ typedef struct {
     uint64_t timestamp;
 } FileSender;
 
-FileSender file_senders[MAX_FILES];
-uint8_t max_file_senders_index;
-
 struct FileReceiver {
     uint8_t filenames[MAX_FILES][MAX_STR_SIZE];
     bool pending[MAX_FILES];
@@ -133,22 +130,6 @@ struct FileReceiver {
 
 /* End file transfer code */
 
-typedef struct {
-    uint8_t name[TOX_MAX_NAME_LENGTH];
-    uint16_t namelength;
-    uint8_t statusmsg[TOX_MAX_STATUSMESSAGE_LENGTH];
-    uint16_t statusmsg_len;
-    uint8_t pending_groupchat[TOX_CLIENT_ID_SIZE];
-    int num;
-    int chatwin;
-    bool active;
-    bool online;
-    TOX_USERSTATUS status;
-    struct FileReceiver file_receiver;
-} ToxicFriend;
-
-ToxicFriend friends[MAX_FRIENDS_NUM];
-
 void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata);
 void on_connectionchange(Tox *m, int friendnumber, uint8_t status, void *userdata);
 void on_message(Tox *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);