From f513183bb624dc785de48b556cca7a876b0e7754 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 2 Nov 2007 02:46:35 +0100 Subject: [PATCH] Make the status item list globally visible. --- audiod.h | 1 - command.c | 1 - gui.c | 1 - gui_common.c | 2 -- para.h | 2 ++ vss.c | 2 -- 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/audiod.h b/audiod.h index ca22160d..9c53e6d6 100644 --- 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 6c60ef97..319c88a6 100644 --- 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 e60e6f54..40d521bc 100644 --- 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 dc3450a8..607a88e8 100644 --- 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 9fe316ed..69383dbe 100644 --- 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 bf11dc9b..7150c908 100644 --- 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; -- 2.39.5