diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-09-28 19:58:16 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-09-29 06:27:09 +0000 |
| commit | e976f68ff509a27b97afa4f0cfffed4da93f0a26 (patch) | |
| tree | a9a910c5a9c102bb2182d91f97a80f9f39665dca /epan/dissectors/pidl/mapi | |
| parent | cf3edd9eb722b34971010ac1583d60af83e62d44 (diff) | |
PIDL (DCERPC mapi): enhance dissector
Correctly regenerate mapi dissector (launch via make in pidl/mapi folder)
* Fix -Wunused-variable (fix in request/response.cnf files)
* Fix trailing whitespace
Not yet ready to remove from DIRTY list (there is always some warning about unused tree)
Change-Id: I9759202e320e90f0cb91db5c7dd9650ff62bbadd
Reviewed-on: https://code.wireshark.org/review/4347
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/pidl/mapi')
| -rw-r--r-- | epan/dissectors/pidl/mapi/request.cnf.c | 11 | ||||
| -rw-r--r-- | epan/dissectors/pidl/mapi/response.cnf.c | 5 |
2 files changed, 2 insertions, 14 deletions
diff --git a/epan/dissectors/pidl/mapi/request.cnf.c b/epan/dissectors/pidl/mapi/request.cnf.c index 4d49102cfe..0b063a7cfd 100644 --- a/epan/dissectors/pidl/mapi/request.cnf.c +++ b/epan/dissectors/pidl/mapi/request.cnf.c @@ -110,7 +110,7 @@ mapi_dissect_element_EcDoRpc_request(tvbuff_t *tvb _U_, int offset _U_, packet_i } -static int +static int mapi_dissect_element_EcDoRpc_request_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) { guint32 size; @@ -164,7 +164,7 @@ mapi_dissect_element_EcDoRpc_request_(tvbuff_t *tvb _U_, int offset _U_, packet_ } -/* +/* * Analyze mapi_request real contents */ static int mapi_dissect_element_EcDoRpc_request__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) @@ -275,17 +275,11 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int { proto_item *item = NULL; proto_tree *tree = NULL; - int old_offset; int origin_offset; /**** Function parameters ****/ - guint32 codepage; - guint32 padding; - guint8 row; guint16 str_len; - gchar *mailbox; origin_offset = offset; - old_offset = offset; if (parent_tree) { item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore, tvb, offset, -1, ENC_NA); @@ -305,7 +299,6 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int proto_tree_add_item(tree, hf_mapi_EcDoRpc_str_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - mailbox = tvb_format_text(tvb, offset, str_len - 1); proto_tree_add_item(tree, hf_mapi_EcDoRpc_mailbox, tvb, offset, str_len, ENC_ASCII|ENC_NA); offset += str_len; diff --git a/epan/dissectors/pidl/mapi/response.cnf.c b/epan/dissectors/pidl/mapi/response.cnf.c index 30b4f59eb9..d0a16d42ca 100644 --- a/epan/dissectors/pidl/mapi/response.cnf.c +++ b/epan/dissectors/pidl/mapi/response.cnf.c @@ -54,7 +54,6 @@ mapi_dissect_struct_EcDoRpc_MAPI_REPL(tvbuff_t *tvb _U_, int offset _U_, packet_ proto_tree *tree = NULL; int old_offset; guint8 opnum; - guint8 handle_idx; guint32 retval; old_offset = offset; @@ -71,7 +70,6 @@ mapi_dissect_struct_EcDoRpc_MAPI_REPL(tvbuff_t *tvb _U_, int offset _U_, packet_ col_append_fstr(pinfo->cinfo, COL_INFO, " + %s", val_to_str(opnum, mapi_MAPI_OPNUM_vals, "Unknown MAPI operation: 0x%02x")); if (opnum != op_MAPI_Notify) { - handle_idx = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_mapi_EcDoRpc_handle_index, tvb, offset, 1, ENC_NA); offset += 1; @@ -194,8 +192,6 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenFolder(tvbuff_t *tvb _U_, int o proto_tree *tree = NULL; int old_offset; int origin_offset; - /**** Function parameters ****/ - guint16 unknown; origin_offset = offset; @@ -222,7 +218,6 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_GetProps(tvbuff_t *tvb _U_, int off proto_tree *tree = NULL; int origin_offset; /**** Function parameters ****/ - guint8 layout; guint16 length; origin_offset = offset; |