diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-09-13 17:08:00 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-13 17:08:00 +0000 |
| commit | f24067ec9d39b7d53da2e83a317ebe7ae335f5ae (patch) | |
| tree | b660c34c885e0efdfca6f400041e30b8430a6d1f /echld/echld.h | |
| parent | 9c7e47fb2e8fa2f0050e779e125e2170633b88a3 (diff) | |
Fix warnings shown by gcc-4.8.1
/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
Diffstat (limited to 'echld/echld.h')
| -rw-r--r-- | echld/echld.h | 7 |
1 files changed, 4 insertions, 3 deletions
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) |