From 3bb887fb62d638a23e275f9a9d2327743f1f14f5 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 6 Jan 2015 23:27:36 -0500 Subject: [PATCH] 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 --- epan/address_to_str.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/epan/address_to_str.c b/epan/address_to_str.c index 7dc23b1f30..362d8eb32e 100644 --- a/epan/address_to_str.c +++ b/epan/address_to_str.c @@ -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 */