From f24067ec9d39b7d53da2e83a317ebe7ae335f5ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Fri, 13 Sep 2013 17:08:00 +0000 Subject: Fix warnings shown by gcc-4.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: enum conversion in initialization is invalid in C++ [-Werror=c++-compat] {0,NULL} ^ /home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: (near initialization for ‘t_map[34].type’) [-Werror=c++-compat] /home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’ /home/jmayer/work/wireshark/svn/trunk/echld/common.c:253:8: error: variable ‘off’ set but not used [-Werror=unused-but-set-variable] long off; ^ cc1: all warnings being treated as errors Still todo: /home/jmayer/work/wireshark/svn/trunk/echld/common.c: In function ‘echld_read_frame’: /home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: error: enum conversion when passing argument 4 of ‘cb’ is invalid in C++ [-Werror=c++-compat] cb( &(r->rp[sizeof(hdr_t)]), HDR_LEN(h), h->h.chld_id, HDR_TYPE(h), h->h.reqh_id, cb_data); ^ /home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’ Whitespace fixes svn path=/trunk/; revision=52007 --- echld/common.c | 62 +++++++++++++++++++++++++++---------------------------- echld/echld-int.h | 42 ++++++++++++++++++------------------- echld/echld.h | 7 ++++--- 3 files changed, 55 insertions(+), 56 deletions(-) (limited to 'echld') diff --git a/echld/common.c b/echld/common.c index cf454a0352..785f7dae77 100644 --- a/echld/common.c +++ b/echld/common.c @@ -1,5 +1,5 @@ /* echld_common.h - * common functions of ECHLD + * common functions of ECHLD * * $Id$ * @@ -55,7 +55,7 @@ extern void echld_common_set_dbg(int level, FILE* fp, const char* prefix) { } #define DBG(attrs) ( common_dbg attrs ) #else -#define DBG(attrs) +#define DBG(attrs) #endif @@ -131,7 +131,7 @@ static struct _t_map t_map[] = { {ECHLD_PACKET_LIST,"PACKET_LIST"}, {ECHLD_SAVE_FILE,"SAVE_FILE"}, {ECHLD_FILE_SAVED,"FILE_SAVED"}, - {0,NULL} + {ECHLD_NULL,NULL} }; const char* echld_msg_type_str(echld_msg_type_t id) { @@ -146,10 +146,10 @@ const char* echld_msg_type_str(echld_msg_type_t id) { /** - the "epan pipe" protocol + the "epan pipe" protocol **/ -typedef void (*reader_realloc_t)(echld_reader_t*, size_t); +typedef void (*reader_realloc_t)(echld_reader_t*, size_t); static void child_realloc_buff(echld_reader_t* r, size_t needed) { size_t a = r->actual_len; @@ -160,8 +160,8 @@ static void child_realloc_buff(echld_reader_t* r, size_t needed) { if ( a < (s + needed) ) { guint8* data = r->data; - - do { + + do { a *= 2; } while( a < (s + needed) ); @@ -182,7 +182,7 @@ static void parent_realloc_buff(echld_reader_t* b, size_t needed) { // parent thread: obtain malloc mutex child_realloc_buff(b,needed); // parent thread: release malloc mutex -} +} #endif @@ -200,7 +200,7 @@ void echld_reset_reader(echld_reader_t* r, int fd, size_t initial) { } else { r->wp = r->data; r->rp = r->data; - r->len = 0; + r->len = 0; } } @@ -220,7 +220,7 @@ static long reader_readv(echld_reader_t* r, size_t len) { DBG((2,"READV needed=%d",len)); - if ( (r->actual_len - r->len) < len ) + if ( (r->actual_len - r->len) < len ) reader_realloc_buff(r, len); iov.iov_base = r->wp; @@ -250,7 +250,6 @@ long echld_read_frame(echld_reader_t* r, read_cb_t cb, void* cb_data) { long nread; size_t fr_len; size_t missing; - long off; DBG((5,"READ reader_len=%d",r->len)); @@ -262,9 +261,8 @@ long echld_read_frame(echld_reader_t* r, read_cb_t cb, void* cb_data) { goto incomplete_frame; } - off = (fr_len = HDR_LEN(h)) + ECHLD_HDR_LEN; DBG((5,"READ we've got a frame! fr_len=%d ch=%d t='%c' rh=%d",fr_len, h->h.chld_id, HDR_TYPE(h), h->h.reqh_id)); - + cb( &(r->rp[sizeof(hdr_t)]), HDR_LEN(h), h->h.chld_id, HDR_TYPE(h), h->h.reqh_id, cb_data); @@ -275,7 +273,7 @@ long echld_read_frame(echld_reader_t* r, read_cb_t cb, void* cb_data) { DBG((5,"READ consumed frame!")); goto again; - + incomplete_header: missing = ECHLD_HDR_LEN - (r->len); DBG((5,"READ incomplete_header missing=%d",missing)); @@ -308,7 +306,7 @@ long echld_read_frame(echld_reader_t* r, read_cb_t cb, void* cb_data) { } } while(1); - + DBG((1,"READ incomplete_frame Cannot happen")); return 0; @@ -352,7 +350,7 @@ param_t* paramset_find (param_t* paramsets, char* name, char** err) { echld_bool_t paramset_apply_set (param_t* paramsets, char* name, char* val, char** err) { param_t* p = paramset_find(paramsets,name,err); - + if ( !p ) return FALSE; if ( ! p->set ) { *err = g_strdup_printf("Cannot set RO param='%s'",name); @@ -364,7 +362,7 @@ echld_bool_t paramset_apply_set (param_t* paramsets, char* name, char* val, char char* paramset_apply_get (param_t* paramsets, char* name, char** err) { param_t* p = paramset_find(paramsets,name,err); - + if ( !p ) return NULL; if ( ! p->get ) { @@ -405,14 +403,14 @@ echld_bool_t paramset_apply_em(param_t* paramset, enc_msg_t* em, char** err) { return FALSE; } - if (! paramset_apply_set(paramset,param,value,err)) + if (! paramset_apply_set(paramset,param,value,err)) return FALSE; } return TRUE; } -char* paramset_get_params_list(param_t* paramsets,const char* fmt) { +char* paramset_get_params_list(param_t* paramsets,const char* fmt) { param_t* p = paramsets; GString* str = g_string_new(""); char* s; @@ -608,7 +606,7 @@ static child_decoder_t child_decoder = { str_dec, int_str_dec, str_dec, - x2str_dec + x2str_dec }; static child_encoder_t child_encoder = { @@ -789,7 +787,7 @@ static char* save_file_json(GByteArray* ba _U_) { /* this to be used only at the parent */ static char* decode_json(echld_msg_type_t type, enc_msg_t* m) { - GByteArray* ba = (GByteArray*)m; + GByteArray* ba = (GByteArray*)m; switch(type) { case ECHLD_ERROR: return error_json(ba); @@ -843,22 +841,22 @@ extern void dummy_switch(echld_msg_type_t type) { case ECHLD_ERROR: break; // case ECHLD_TIMED_OUT: break; case ECHLD_NEW_CHILD: break; - case ECHLD_HELLO: break; + case ECHLD_HELLO: break; case ECHLD_CHILD_DEAD: break; //S msg case ECHLD_CLOSE_CHILD: break; case ECHLD_CLOSING: break; // - case ECHLD_SET_PARAM: break; + case ECHLD_SET_PARAM: break; case ECHLD_GET_PARAM: break; case ECHLD_PARAM: break; //SS param,val case ECHLD_PING: break; case ECHLD_PONG: break; // - case ECHLD_OPEN_FILE: break; + case ECHLD_OPEN_FILE: break; case ECHLD_FILE_OPENED: break; // case ECHLD_OPEN_INTERFACE: break; case ECHLD_INTERFACE_OPENED: break; // case ECHLD_START_CAPTURE: break; case ECHLD_CAPTURE_STARTED: break; // - case ECHLD_NOTIFY: break; //S notification (pre-encoded) + case ECHLD_NOTIFY: break; //S notification (pre-encoded) case ECHLD_GET_SUM: break; case ECHLD_PACKET_SUM: break; //S (pre-encoded) case ECHLD_GET_TREE: break; @@ -897,21 +895,21 @@ extern void dummy_switch(echld_msg_type_t type) { case ECHLD_ERROR: break; // error(err,reason) case ECHLD_TIMED_OUT: break; - case ECHLD_HELLO: break; + case ECHLD_HELLO: break; case ECHLD_CHILD_DEAD: break; // child_dead(msg) case ECHLD_CLOSING: break; case ECHLD_PARAM: break; case ECHLD_PONG: break; - case ECHLD_FILE_OPENED: break; + case ECHLD_FILE_OPENED: break; case ECHLD_INTERFACE_OPENED: break; case ECHLD_CAPTURE_STARTED: break; - case ECHLD_NOTIFY: break; // notify(pre-encoded) + case ECHLD_NOTIFY: break; // notify(pre-encoded) case ECHLD_PACKET_SUM: break; // packet_sum(pre-encoded) - case ECHLD_TREE: break; //tree(framenum, tree(pre-encoded) ) + case ECHLD_TREE: break; //tree(framenum, tree(pre-encoded) ) case ECHLD_BUFFER: break; // buffer (name,range,totlen,data) - case ECHLD_EOF: break; - case ECHLD_CAPTURE_STOPPED: break; - case ECHLD_NOTE_ADDED: break; + case ECHLD_EOF: break; + case ECHLD_CAPTURE_STOPPED: break; + case ECHLD_NOTE_ADDED: break; case ECHLD_PACKET_LIST: break; // packet_list(name,filter,range); case ECHLD_FILE_SAVED: break; diff --git a/echld/echld-int.h b/echld/echld-int.h index f6283af967..ddcb38d9fa 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -98,7 +98,7 @@ struct _hdr { typedef union _hdr_t { struct _hdr h; - guint8 b[ECHLD_HDR_LEN]; + guint8 b[ECHLD_HDR_LEN]; } hdr_t; #define HDR_TYPE(H) ((((H)->h.type_len)&0xff000000)>>24) @@ -140,7 +140,7 @@ typedef struct _echld_reader { #define reader_is_empty(R) ( (R)->len == 0 ) -#define reader_has_header(R) ((R)->len >= ECHLD_HDR_LEN) +#define reader_has_header(R) ((R)->len >= ECHLD_HDR_LEN) #define reader_has_frame(R) ( reader_has_header(R) && ( (HDR_LEN( (hdr_t*)((R)->rp) ) + ECHLD_HDR_LEN) >= ((R)->len ))) #define READER_FD_SET(R,fdset_p) FD_SET(R.fd,&(fdset_p)) @@ -189,7 +189,7 @@ typedef struct _echld_epan_stuff_t { capture_session cap_sess; capture_options cap_opts; capture_file cfile; -#endif +#endif e_prefs* prefs; } echld_epan_stuff_t; @@ -213,25 +213,25 @@ typedef struct _child_in { } child_decoder_t; typedef struct _child_out { - enc_msg_t* (*error) (int , const char*); - enc_msg_t* (*child_dead) (const char*); - enc_msg_t* (*param) (const char*, const char*); - enc_msg_t* (*notify) (const char*); // pre-encoded - enc_msg_t* (*packet_sum) (int, const char*); // framenum, sum(pre-encoded) - enc_msg_t* (*tree) (int, const char*); // framenum, tree(pre-encoded) - enc_msg_t* (*buffer) (int , const char*, const char*, const char*); // totlen,name,range,data - enc_msg_t* (*packet_list) (const char*, const char*, const char*); // name, filter, range + enc_msg_t* (*error) (int , const char*); + enc_msg_t* (*child_dead) (const char*); + enc_msg_t* (*param) (const char*, const char*); + enc_msg_t* (*notify) (const char*); // pre-encoded + enc_msg_t* (*packet_sum) (int, const char*); // framenum, sum(pre-encoded) + enc_msg_t* (*tree) (int, const char*); // framenum, tree(pre-encoded) + enc_msg_t* (*buffer) (int , const char*, const char*, const char*); // totlen,name,range,data + enc_msg_t* (*packet_list) (const char*, const char*, const char*); // name, filter, range } child_encoder_t; typedef struct _parent_in { - echld_bool_t (*error) (enc_msg_t*, int* , char**); - echld_bool_t (*child_dead) (enc_msg_t*, char**); - echld_bool_t (*param) (enc_msg_t*, char**, char**); - echld_bool_t (*notify) (enc_msg_t*, char**); // pre-encoded - echld_bool_t (*packet_sum) (enc_msg_t*, int*, char**); // framenum, sum(pre-encoded) - echld_bool_t (*packet) (enc_msg_t*, int*, char**); // framenum, tree(pre-encoded) - echld_bool_t (*buffer) (enc_msg_t*, int*, char**, char**, char**); // totlen,name,range,data + echld_bool_t (*error) (enc_msg_t*, int* , char**); + echld_bool_t (*child_dead) (enc_msg_t*, char**); + echld_bool_t (*param) (enc_msg_t*, char**, char**); + echld_bool_t (*notify) (enc_msg_t*, char**); // pre-encoded + echld_bool_t (*packet_sum) (enc_msg_t*, int*, char**); // framenum, sum(pre-encoded) + echld_bool_t (*packet) (enc_msg_t*, int*, char**); // framenum, tree(pre-encoded) + echld_bool_t (*buffer) (enc_msg_t*, int*, char**, char**, char**); // totlen,name,range,data echld_bool_t (*packet_list) (enc_msg_t*, char**, char**, char**); // name, filter, range } parent_decoder_t; @@ -251,13 +251,13 @@ extern int echld_child_loop(void); extern void echld_dispatcher_start(int* in_pipe_fds, int* out_pipe_fds, char* argv0, int (*main)(int, char **)); -extern void dummy_switch(echld_msg_type_t type); +extern void dummy_switch(echld_msg_type_t type); extern void echld_unused(void); /* config stuff */ /* initial debug levels */ -/* undefine to avoid debugging */ +/* undefine to avoid debugging */ #define DEBUG_BASE 5 #define DEBUG_CHILD 5 #define DEBUG_DISPATCHER 5 @@ -283,7 +283,7 @@ extern void echld_unused(void); #define NO_INITIALIZER 19 #ifndef DEBUG_BASE -#define echld_common_set_dbg(a,b,c) +#define echld_common_set_dbg(a,b,c) #endif diff --git a/echld/echld.h b/echld/echld.h index 9176ee46fa..309a97eea1 100644 --- a/echld/echld.h +++ b/echld/echld.h @@ -35,10 +35,10 @@ extern "C" { #define ECHLD_VERSION "0.0" #define ECHLD_MAJOR_VERSION 0 /* increases when existing things change */ - /* if this changes an old client may or may not work */ + /* if this changes an old client may or may not work */ #define ECHLD_MINOR_VERSION 0 /* increases when new things are added */ - /* if just this one changes an old client will still work */ + /* if just this one changes an old client will still work */ /* * You should take a look to doc/README.epan_child before reading this @@ -182,7 +182,7 @@ WS_DLL_PUBLIC enc_msg_t* echld_new_child_params(void); -/* takes the em, and param=value pairs of strings, NULL to end. +/* takes the em, and param=value pairs of strings, NULL to end. echld_new_child_params_add_params(em,param1_str,val1_str,param2_str,val2_str,NULL); */ WS_DLL_PUBLIC void echld_new_child_params_add_params(enc_msg_t*, ...); @@ -315,6 +315,7 @@ enum _echld_msg_type_t { /* in = child to parent */ /* out = parent to child */ + ECHLD_NULL ='\0', /* To terminate array */ ECHLD_ERROR = '!', /* in: an error has occurred, * this can be a response to most messages * some errors are sent asyncronously (some are handled internally, some are then passed) -- cgit v1.2.3