diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-27 16:15:30 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-27 16:15:30 +0000 |
| commit | 3e575defe1939ae362f052849af77ef353289638 (patch) | |
| tree | 4085507410fd9cdbc670acc4969542f1f47d2fb4 /epan/dissectors/pidl | |
| parent | fa010b26528445f8aac4c58dc77f0e125d63d024 (diff) | |
Fix some warnings reported by gcc -Wshadow ...
Fix some spacing in packet-dcom.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25618 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/pidl')
| -rw-r--r-- | epan/dissectors/pidl/mapi/request.cnf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/pidl/mapi/request.cnf.c b/epan/dissectors/pidl/mapi/request.cnf.c index 2f67ef35a0..d1b267e548 100644 --- a/epan/dissectors/pidl/mapi/request.cnf.c +++ b/epan/dissectors/pidl/mapi/request.cnf.c @@ -297,7 +297,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int guint32 codepage; guint32 padding; guint8 row; - guint16 strlen; + guint16 str_len; gchar *mailbox; origin_offset = offset; @@ -323,13 +323,13 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int proto_tree_add_text(tree, tvb, old_offset, offset - old_offset, "row: 0x%x", row); old_offset = offset; - strlen = tvb_get_letohs(tvb, offset); + str_len = tvb_get_letohs(tvb, offset); offset += 2; - proto_tree_add_text(tree, tvb, old_offset, offset - old_offset, "str length: 0x%x", strlen); + proto_tree_add_text(tree, tvb, old_offset, offset - old_offset, "str length: 0x%x", str_len); old_offset = offset; - mailbox = tvb_format_text(tvb, offset, strlen - 1); - offset += strlen; + mailbox = tvb_format_text(tvb, offset, str_len - 1); + offset += str_len; proto_tree_add_text(tree, tvb, old_offset, offset - old_offset, "mailbox: %s", mailbox); proto_item_set_len(item, offset - origin_offset); |