aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2014-07-16 15:04:09 +0200
committerMartin Kaiser <wireshark@kaiser.cx>2014-07-19 14:22:22 +0000
commitab2922b7e5897ec31fbb7fd195e3b4a8b3c22d95 (patch)
treeb0c5f6644f3cf7798099dc036e857bf4a0fc88d0 /epan
parent18dfb13c1240fc98a5e47dea6360ea18f8f50f04 (diff)
simplify APPEND_OUI_NAME
Change-Id: I83aef5ebc92a7218f59bd77338058d98ffa2ed6b Reviewed-on: https://code.wireshark.org/review/3127 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-oampdu.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-oampdu.c b/epan/dissectors/packet-oampdu.c
index 07998e9ba0..f8e0241e33 100644
--- a/epan/dissectors/packet-oampdu.c
+++ b/epan/dissectors/packet-oampdu.c
@@ -964,12 +964,8 @@ static const char cont_sep[] = ", ";
}
#define APPEND_OUI_NAME(item, string, tvb, offset) \
- if(item){ \
- string = tvb_get_manuf_name(tvb, offset); \
- proto_item_append_text(item, " ("); \
- proto_item_append_text(item, "%s", string); \
- proto_item_append_text(item, ")"); \
- }
+ string = tvb_get_manuf_name(tvb, offset); \
+ proto_item_append_text(item, " (%s)", string);
static void
dissect_oampdu_information(tvbuff_t *tvb, proto_tree *tree);