diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2018-03-12 22:07:23 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2018-03-13 09:41:19 +0000 |
| commit | 9d74d9936d9036354369a280a42920911162ddc8 (patch) | |
| tree | de234ba1f710d15eab2d7a677e710b9369bafba3 /epan/dissectors/packet-f5ethtrailer.c | |
| parent | ce991ecb7da78b23926ed9767af6464783e57ba1 (diff) | |
Column format functions must not be called with a NULL format string.
Fix two compile time warnings while at it.
Change-Id: I4e1539bec9a5b5092acde221e1d434dbd325ab42
Reviewed-on: https://code.wireshark.org/review/26453
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'epan/dissectors/packet-f5ethtrailer.c')
| -rw-r--r-- | epan/dissectors/packet-f5ethtrailer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 16bc1aa2b6..4933e6db38 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -901,8 +901,10 @@ static void f5eth_set_info_col_slot( col_set_writable(pinfo->cinfo, COL_INFO, TRUE); if(ingress != 0) { + DISSECTOR_ASSERT(info_format_in_slot); col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, info_format_in_slot, slot, tmm); } else { + DISSECTOR_ASSERT(info_format_out_slot); col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, info_format_out_slot, slot, tmm); } @@ -2037,7 +2039,7 @@ dissect_low_trailer( * not currently in shipping WS code and only people who are interested * will load it, it's probably not that big of a deal. */ -gboolean +static gboolean dissect_f5ethtrailer( tvbuff_t *tvb , packet_info *pinfo @@ -2198,7 +2200,7 @@ static void proto_init_f5ethtrailer(void) } } -void f5ethtrailer_prefs(void) +static void f5ethtrailer_prefs(void) { static gint tap_ip_enabled = -1; static gint tap_ipv6_enabled = -1; @@ -2710,4 +2712,4 @@ void proto_register_f5fileinfo(void) void proto_reg_handoff_f5fileinfo(void) { heur_dissector_add("eth", dissect_f5fileinfo, "F5 Capture Information", "f5fileinfo", proto_f5fileinfo, HEURISTIC_ENABLE); -}
\ No newline at end of file +} |