From 1c455284f0f6166beb4212614d4f1e2a177c7ebe Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Sun, 17 May 2015 22:59:12 +0200 Subject: Fix some files to pass the pre-commit hook script. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I105bf4e03fcf95cf7541f6377215809759fd933e Reviewed-on: https://code.wireshark.org/review/8502 Reviewed-by: Jörg Mayer --- echld/child.c | 28 +++++++++++--------- echld/common.c | 76 +++++++++++++++++++++++++++---------------------------- echld/echld-int.h | 20 +++++++-------- echld/parent.c | 28 ++++++++++++-------- 4 files changed, 81 insertions(+), 71 deletions(-) (limited to 'echld') diff --git a/echld/child.c b/echld/child.c index 0d76caa796..571d1578f8 100644 --- a/echld/child.c +++ b/echld/child.c @@ -25,7 +25,6 @@ #include "echld-int.h" -// echld_ typedef struct _child { child_state_t state; @@ -48,13 +47,15 @@ typedef struct _child { child_encoder_t* enc; child_decoder_t* dec; - // epan stuff + /* epan stuff */ char* cf_name; char* cfilter; char* dfilter; -// capture_file cfile; +#if 0 + capture_file cfile; +#endif dfilter_t* df; } echld_child_t; @@ -117,13 +118,13 @@ static echld_bool_t param_set_dbg_level(char* val , char** err ) { static long dbg_resp(GByteArray* em, echld_msg_type_t t) { long st = echld_write_frame(child.fds.pipe_to_parent, em, child.chld_id, t, child.reqh_id, NULL); child_debug(1, "SND fd=%d ch=%d ty='%s' rh=%d msg='%s'", - child.fds.pipe_to_parent, child.chld_id, TY(t), child.reqh_id, (st>0?"ok":strerror(errno)) ); + child.fds.pipe_to_parent, child.chld_id, TY(t), child.reqh_id, (st>0?"ok":g_strerror(errno)) ); return st; } #define CHILD_DBG(attrs) ( child_debug attrs ) #define CHILD_DBG_INIT() do { debug_fp = stderr; DCOM(); } while(0) -#define CHILD_DBG_START(fname) do { debug_fp = fopen(fname,"a"); DCOM(); CHILD_DBG((0,"Log Started")); } while(0) +#define CHILD_DBG_START(fname) do { debug_fp = ws_fopen(fname,"a"); DCOM(); CHILD_DBG((0,"Log Started")); } while(0) #define CHILD_RESP(BA,T) dbg_resp(BA,T) #define CHILD_STATE(ST) do { DISP_DBG((0,"State %s => %s")) } while(0) #else @@ -202,7 +203,7 @@ static char* param_get_cwd(char** err ) { char* pwd = getcwd(NULL, 128); if (!pwd) { - *err = g_strdup(strerror(errno)); + *err = g_strdup(g_strerror(errno)); } return pwd; } @@ -210,7 +211,7 @@ static char* param_get_cwd(char** err ) { static echld_bool_t param_set_cwd(char* val , char** err ) { /* XXX SANITIZE */ if (chdir(val) != 0) { - *err = g_strdup_printf("cannot chdir reas='%s'",strerror(errno)); + *err = g_strdup_printf("cannot chdir reas='%s'",g_strerror(errno)); return FALSE; } @@ -422,7 +423,9 @@ static long child_receive(guint8* b, size_t len, echld_chld_id_t chld_id, echld_ CHILD_DBG((2,"RCVD type='%s' len='%d'",TY(type),len)); - // gettimeofday(&(child.now), NULL); +#if 0 + gettimeofday(&(child.now), NULL); +#endif if (child.chld_id != chld_id) { child_err(ECHLD_ERR_WRONG_MSG,reqh_id, @@ -613,7 +616,7 @@ static long child_receive(guint8* b, size_t len, echld_chld_id_t chld_id, echld_ return 0; misencoded: - // dump the misencoded message (b,blen) + /* dump the misencoded message (b,blen) */ child_err(ECHLD_ERR_WRONG_MSG,reqh_id,"misencoded msg msg_type='%s'",TY(type)); return 0; @@ -624,9 +627,10 @@ static long child_receive(guint8* b, size_t len, echld_chld_id_t chld_id, echld_ } static int child_dumpcap_read(void) { - // this folk manages the reading of dumpcap's pipe - // it has to read interface descriptions when doing so - // and managing capture during capture + /* this folk manages the reading of dumpcap's pipe + * it has to read interface descriptions when doing so + * and managing capture during capture + */ CHILD_DBG((2,"child_dumpcap_read")); return FALSE; } diff --git a/echld/common.c b/echld/common.c index 5e9687ca14..c298d2c49c 100644 --- a/echld/common.c +++ b/echld/common.c @@ -177,9 +177,9 @@ static reader_realloc_t reader_realloc_buff = child_realloc_buff; #ifdef PARENT_THREADS static void parent_realloc_buff(echld_reader_t* b, size_t needed) { - // parent thread: obtain malloc mutex + /* parent thread: obtain malloc mutex */ child_realloc_buff(b,needed); - // parent thread: release malloc mutex + /* parent thread: release malloc mutex */ } #endif @@ -209,7 +209,7 @@ void echld_init_reader(echld_reader_t* r, int fd, size_t initial) { void free_reader(echld_reader_t* r) { - free(r->data); + g_free(r->data); } static long reader_readv(echld_reader_t* r, size_t len) { @@ -226,7 +226,7 @@ static long reader_readv(echld_reader_t* r, size_t len) { nread = readv(r->fd, &iov, 1); - DBG((2,"READV nread=%d msg='%s'",nread, (nread<0) ? strerror(errno) : "-" )); + DBG((2,"READV nread=%d msg='%s'",nread, (nread<0) ? g_strerror(errno) : "-" )); if (nread >= 0) { r->wp += nread; @@ -242,7 +242,7 @@ static long reader_readv(echld_reader_t* r, size_t len) { long echld_read_frame(echld_reader_t* r, read_cb_t cb, void* cb_data) { DBG((4,"READ = echld_read_frame fd=%d",r->fd)); - // it will use shared memory instead of inband communication + /* it will use shared memory instead of inband communication */ do { hdr_t* h = (hdr_t*)r->rp; long nread; @@ -833,38 +833,38 @@ char* echld_decode(echld_msg_type_t t, enc_msg_t* m ) { extern void dummy_switch(echld_msg_type_t type) { switch(type) { - case ECHLD_ERROR: break; // + case ECHLD_ERROR: break; case ECHLD_TIMED_OUT: break; case ECHLD_NEW_CHILD: break; case ECHLD_HELLO: break; - case ECHLD_CHILD_DEAD: break; //S msg + case ECHLD_CHILD_DEAD: break; /* S msg */ case ECHLD_CLOSE_CHILD: break; - case ECHLD_CLOSING: break; // + case ECHLD_CLOSING: break; case ECHLD_SET_PARAM: break; case ECHLD_GET_PARAM: break; - case ECHLD_PARAM: break; //SS param,val + case ECHLD_PARAM: break; /* SS param,val */ case ECHLD_PING: break; - case ECHLD_PONG: break; // + case ECHLD_PONG: break; case ECHLD_OPEN_FILE: break; - case ECHLD_FILE_OPENED: break; // + case ECHLD_FILE_OPENED: break; case ECHLD_OPEN_INTERFACE: break; - case ECHLD_INTERFACE_OPENED: 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_CAPTURE_STARTED: break; + case ECHLD_NOTIFY: break; /* S notification (pre-encoded) */ case ECHLD_GET_SUM: break; - case ECHLD_PACKET_SUM: break; //S (pre-encoded) + case ECHLD_PACKET_SUM: break; /* S (pre-encoded) */ case ECHLD_GET_TREE: break; - case ECHLD_TREE: break; //IS framenum,tree (pre-encoded) + case ECHLD_TREE: break; /* IS framenum,tree (pre-encoded) */ case ECHLD_GET_BUFFER: break; - case ECHLD_BUFFER: break; //SSIS name,range,totlen,data - case ECHLD_EOF: break; // + case ECHLD_BUFFER: break; /* SSIS name,range,totlen,data */ + case ECHLD_EOF: break; case ECHLD_STOP_CAPTURE: break; - case ECHLD_CAPTURE_STOPPED: break; // + case ECHLD_CAPTURE_STOPPED: break; case ECHLD_ADD_NOTE: break; - case ECHLD_NOTE_ADDED: break; //IS + case ECHLD_NOTE_ADDED: break; /* IS */ case ECHLD_APPLY_FILTER: break; - case ECHLD_PACKET_LIST: break; //SS name,range + case ECHLD_PACKET_LIST: break; /* SS name,range */ case ECHLD_SAVE_FILE: break; case ECHLD_FILE_SAVED: break; case EC_ACTUAL_ERROR: break; @@ -873,39 +873,39 @@ extern void dummy_switch(echld_msg_type_t type) { switch(type) { case ECHLD_NEW_CHILD: break; case ECHLD_CLOSE_CHILD: break; - case ECHLD_SET_PARAM: break; // set_param(p,v) - case ECHLD_GET_PARAM: break; // get_param(p) + case ECHLD_SET_PARAM: break; /* set_param(p,v) */ + case ECHLD_GET_PARAM: break; /* get_param(p) */ case ECHLD_PING: break; - case ECHLD_OPEN_FILE: break; // open_file(f,mode) - case ECHLD_OPEN_INTERFACE: break; // open_interface(if,param) + case ECHLD_OPEN_FILE: break; /* open_file(f,mode) */ + case ECHLD_OPEN_INTERFACE: break; /* open_interface(if,param) */ case ECHLD_START_CAPTURE: break; - case ECHLD_GET_SUM: break; // get_sum(rng) - case ECHLD_GET_TREE: break; // get_tree(rng) - case ECHLD_GET_BUFFER: break; // get_buffer(rng) + case ECHLD_GET_SUM: break; /* get_sum(rng) */ + case ECHLD_GET_TREE: break; /* get_tree(rng) */ + case ECHLD_GET_BUFFER: break; /* get_buffer(rng) */ case ECHLD_STOP_CAPTURE: break; - case ECHLD_ADD_NOTE: break; // add_note(framenum,note) - case ECHLD_APPLY_FILTER: break; // apply_filter(df) - case ECHLD_SAVE_FILE: break; // save_file(f,mode) + case ECHLD_ADD_NOTE: break; /* add_note(framenum,note) */ + case ECHLD_APPLY_FILTER: break; /* apply_filter(df) */ + case ECHLD_SAVE_FILE: break; /* save_file(f,mode) */ - case ECHLD_ERROR: break; // error(err,reason) + case ECHLD_ERROR: break; /* error(err,reason) */ case ECHLD_TIMED_OUT: break; case ECHLD_HELLO: break; - case ECHLD_CHILD_DEAD: break; // child_dead(msg) + 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_INTERFACE_OPENED: break; case ECHLD_CAPTURE_STARTED: break; - 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_BUFFER: break; // buffer (name,range,totlen,data) + 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_BUFFER: break; /* buffer (name,range,totlen,data) */ 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_PACKET_LIST: break; /* packet_list(name,filter,range); */ case ECHLD_FILE_SAVED: break; case EC_ACTUAL_ERROR: break; diff --git a/echld/echld-int.h b/echld/echld-int.h index 29b0ae7b7d..9c1ed4698a 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -215,11 +215,11 @@ 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* (*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; @@ -227,11 +227,11 @@ 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 (*packet_list) (enc_msg_t*, char**, char**, char**); // name, filter, range + 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; extern void echld_get_all_codecs(child_encoder_t**, child_decoder_t**, echld_parent_encoder_t**, parent_decoder_t**); diff --git a/echld/parent.c b/echld/parent.c index 267ca0fb1f..468291ec60 100644 --- a/echld/parent.c +++ b/echld/parent.c @@ -91,7 +91,7 @@ static void parent_dbg(int level, const char* fmt, ...) { } #define PARENT_DBG(attrs) parent_dbg attrs -#define PARENT_SEND(BYTEARR,CHILDNUM,TYPE,R_ID) do { long st = echld_write_frame(parent.dispatcher_fd, BYTEARR, CHILDNUM, TYPE, R_ID, NULL); PARENT_DBG((1,"SEND type='%s' chld_id=%d reqh_id=%d err_msg='%s'",TY(TYPE),CHILDNUM,R_ID, ( st >= 8 ? "ok" : ((st<0)?strerror(errno):"?") ) )); } while(0) +#define PARENT_SEND(BYTEARR,CHILDNUM,TYPE,R_ID) do { long st = echld_write_frame(parent.dispatcher_fd, BYTEARR, CHILDNUM, TYPE, R_ID, NULL); PARENT_DBG((1,"SEND type='%s' chld_id=%d reqh_id=%d err_msg='%s'",TY(TYPE),CHILDNUM,R_ID, ( st >= 8 ? "ok" : ((st<0)?g_strerror(errno):"?") ) )); } while(0) #else #define PARENT_DBG(attrs) @@ -128,18 +128,22 @@ static void parent_fatal(int exit_code, const char* fmt, ...) { } static void echld_cleanup(void) { - // int i; +#if 0 + int i; +#endif PARENT_DBG((4,"echld_cleanup starting")); - // for (i=0;idispatcher_hello_cb) echld_msgh(0, ECHLD_HELLO, hello_cb, init); PARENT_DBG((3,"Ready")); -- cgit v1.2.3