osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix compiler error because I didn't completely amend last patch. 

Change-Id: I7b8ffc4a63e69b5f50666dc1cf3482ae20124c0f
Reviewed-on: https://code.wireshark.org/review/6356
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2015-01-06 23:27:36 -05:00
parent 47d670d3d7
commit 3bb887fb62
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/address_to_str.c
View File

@ -409,18 +409,6 @@ tvb_address_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, address_type type, co
addr.len = 8;
addr.data = tvb_get_ptr(tvb, offset, 8);
break;
case AT_IB:
if (length >= 16)
{
addr.len = length;
addr.data = tvb_get_ptr(tvb, offset, length);
}
else
{
addr.len = 2;
addr.data = GUINT_TO_POINTER(tvb_get_ntohs(tvb, offset));
}
break;
case AT_AX25:
addr.len = AX25_ADDR_LEN;
addr.data = tvb_get_ptr(tvb, offset, AX25_ADDR_LEN);
@ -444,6 +432,7 @@ tvb_address_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, address_type type, co
case AT_STRINGZ:
case AT_URI:
case AT_TIPC:
case AT_IB:
/* Have variable length fields, use tvb_address_var_to_str() */
case AT_USB:
/* These addresses are not supported through tvb accessor */