diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2017-03-19 12:26:28 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2017-03-19 12:27:12 +0000 |
| commit | 2890e415bbec3ddad7c0485067dd09f1e503c84f (patch) | |
| tree | 1500c8273b345db49f17b73a987be300290d7662 /echld/dispatcher.c | |
| parent | 74e793e8bac3013f0474fdf398608ba24506307c (diff) | |
Fix various compile warnings turning error on Linux with gcc6 when
compiling with HAVE_PCAP_REMOTE (and ENABLE_ECHLD)
Change-Id: If5524f2d3dcacca9c82a46167480c8436dd8b1b2
Reviewed-on: https://code.wireshark.org/review/20615
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'echld/dispatcher.c')
| -rw-r--r-- | echld/dispatcher.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/echld/dispatcher.c b/echld/dispatcher.c index 6cddc24c16..eb749d9b27 100644 --- a/echld/dispatcher.c +++ b/echld/dispatcher.c @@ -158,13 +158,13 @@ static void children_massacre(void) { } +#define ERR_STR_LEN 1024 static void dispatcher_fatal(int cause, const char* fmt, ...) { - size_t len= 1024; - gchar err_str[len]; + gchar err_str[ERR_STR_LEN]; va_list ap; va_start(ap, fmt); - g_vsnprintf(err_str,len,fmt,ap); + g_vsnprintf(err_str, ERR_STR_LEN, fmt,ap); va_end(ap); DISP_DBG((0,"fatal cause=%d msg=\"%s\"",cause ,err_str)); @@ -177,13 +177,12 @@ static void dispatcher_fatal(int cause, const char* fmt, ...) { #define DISP_FATAL(attrs) dispatcher_fatal attrs static void dispatcher_err(int errnum, const char* fmt, ...) { - size_t len= 1024; - gchar err_str[len]; + gchar err_str[ERR_STR_LEN]; va_list ap; static GByteArray* ba; va_start(ap, fmt); - g_vsnprintf(err_str,len,fmt,ap); + g_vsnprintf(err_str, ERR_STR_LEN, fmt,ap); va_end(ap); DISP_DBG((0,"error=\"%s\"",err_str)); @@ -1019,6 +1018,7 @@ 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; + int ret; DISP_DBG_INIT(); DISP_DBG((2,"Dispatcher Starting")); @@ -1059,7 +1059,7 @@ void echld_dispatcher_start(int* in_pipe_fds, int* out_pipe_fds, char* argv0, in DISP_WRITE(dispatcher->parent_out, NULL, 0, ECHLD_HELLO, 0); ret = dispatcher_loop(); - capture_opts_cleanup(dispatcher->capture_opts); + capture_opts_cleanup(&(dispatcher->capture_opts)); exit(ret); } |