Make the status item list globally visible.

diff --git a/audiod.h b/audiod.h
index ca22160d3fa378bd1849cb16549b85a6b409c254..9c53e6d6500b4dabc83e609ac64b0f427b742def 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -105,7 +105,6 @@ extern struct status_task *stat_task;
 extern struct slot_info slot[MAX_STREAM_SLOTS];
 extern struct audiod_args_info conf;
 extern int audiod_status;
-extern const char *status_item_list[NUM_STAT_ITEMS];
 
 void __noreturn clean_exit(int status, const char *msg);
 int handle_connect(int accept_fd);

diff --git a/command.c b/command.c
index 6c60ef972f97aef62a2bf24425bd6a8d103b77c7..319c88a6ba5f3aa7c6da1f124eb2c247e93eb2dd 100644 (file)
--- a/command.c
+++ b/command.c
@@ -37,7 +37,6 @@ static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 
-extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 

diff --git a/gui.c b/gui.c
index e60e6f54e39daf44a3fec62653d995107d9cf7ba..40d521bcf81ceb546a9675b5729c182109a07cf6 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -23,7 +23,6 @@
 
 /** define the array of error lists needed by para_gui */
 INIT_GUI_ERRLISTS;
-extern const char *status_item_list[NUM_STAT_ITEMS];
 static char *stat_content[NUM_STAT_ITEMS];
 
 #define STANDARD_STATUS_BAR "para_gui " PACKAGE_VERSION " (hit ? for help)"

diff --git a/gui_common.c b/gui_common.c
index dc3450a8410b3002e6a4e41f0a548d2f8efd8e9f..607a88e81c62e80c880bd54258a0f3084c9dc1d8 100644 (file)
--- a/gui_common.c
+++ b/gui_common.c
@@ -14,8 +14,6 @@
 #include "string.h"
 #include "fd.h"
 
-extern const char *status_item_list[NUM_STAT_ITEMS];
-
 int para_open_audiod_pipe(char *cmd)
 {
        int fds[3] = {0, 1, 0};

diff --git a/para.h b/para.h
index 9fe316ed7454ed101cf2f66f2b04109f24c463dd..69383dbe65492734fbedd49d9525cddee4bc1119 100644 (file)
--- a/para.h
+++ b/para.h
@@ -173,6 +173,8 @@ enum {
        NUM_STAT_ITEMS
 };
 
+extern const char *status_item_list[NUM_STAT_ITEMS];
+
 int stat_item_valid(const char *item);
 int stat_line_valid(const char *);
 void stat_client_write(const char *msg, int itemnum);

diff --git a/vss.c b/vss.c
index bf11dc9b8e82c06c78a684e983836fc4348090d7..7150c9087845b3450690a9a1210039ef9b319b27 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -29,8 +29,6 @@
 #include "ipc.h"
 #include "fd.h"
 
-extern const char *status_item_list[];
-
 static struct timeval announce_tv;
 static struct timeval data_send_barrier;
 static struct timeval eof_barrier;