diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-11-18 07:25:12 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-11-18 07:25:12 +0000 |
commit | 7b80faa66f55f8be5f344691cb1de0fe364a6881 (patch) | |
tree | 34441cbb985ca9a1e27a36090fa7f08fa62983e5 /echld/dispatcher.c | |
parent | adc82b16ba83b46d64cf094ad7c2ecaa442ffb2d (diff) |
Fix some warnings that were really errors.
It would really help to fix the remaining warnings so that these
files can be compiled with -Werror, which gets me to the quesiton:
Is this code still maintained in some form or was it an interesting
experiment that has been terminated?
svn path=/trunk/; revision=53406
Diffstat (limited to 'echld/dispatcher.c')
-rw-r--r-- | echld/dispatcher.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/echld/dispatcher.c b/echld/dispatcher.c index 3dbe8f0048..0684179770 100644 --- a/echld/dispatcher.c +++ b/echld/dispatcher.c @@ -202,7 +202,6 @@ static void dispatcher_err(int errnum, const char* fmt, ...) { static char* intflist2json(GList* if_list, char** if_cap_err) { #define ADDRSTRLEN 46 /* Covers IPv4 & IPv6 */ - int i; GList *if_entry; if_info_t *if_info; GSList *addr; @@ -212,7 +211,6 @@ static char* intflist2json(GList* if_list, char** if_cap_err) { GString *str = g_string_new("{ what='interfaces', interfaces={ \n"); char* s; - i = 1; /* Interface id number */ for (if_entry = g_list_first(if_list); if_entry != NULL; if_entry = g_list_next(if_entry)) { if_info = (if_info_t *)if_entry->data; @@ -392,7 +390,7 @@ static char* param_get_capture_types(char** err _U_) { for (i = 0; i < WTAP_NUM_FILE_TYPES_SUBTYPES; i++) { if (wtap_dump_can_open(i)) { g_string_append_printf(str,"%s: %s\n", - wtap_file_type_short_string(i), wtap_file_type_string(i)); + wtap_file_type_subtype_short_string(i), wtap_file_type_subtype_string(i)); } } @@ -1025,14 +1023,8 @@ void dispatcher_alrm(int sig _U_) { void echld_dispatcher_start(int* in_pipe_fds, int* out_pipe_fds, char* argv0, int (*main)(int, char **)) { static struct dispatcher d; int i; -#ifdef DEBUG_DISPATCHER - int dbg_fd; -#endif DISP_DBG_INIT(); -#ifdef DEBUG_DISPATCHER - dbg_fd = fileno(debug_fp); -#endif DISP_DBG((2,"Dispatcher Starting")); |