diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-08-14 14:28:33 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-08-15 14:44:58 +0000 |
| commit | 3c073f2346403e894f416966bba1b99c3a2fe132 (patch) | |
| tree | 1cb8577a1bc16e7ad7f376ef1d0678f2b7984560 /epan/dissectors/packet-fclctl.c | |
| parent | 7a1b46a699dc87d09d1f4ec6407795434cc4811d (diff) | |
| download | wireshark-3c073f2346403e894f416966bba1b99c3a2fe132.tar.gz | |
packet-fclctl.c: remove unnbeeded #include; Create/use value_string_ext; Add editor modelines
Change-Id: I1b9547ec33031b9645648c20be3ca20b07b80d76
Reviewed-on: https://code.wireshark.org/review/3615
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-fclctl.c')
| -rw-r--r-- | epan/dissectors/packet-fclctl.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/epan/dissectors/packet-fclctl.c b/epan/dissectors/packet-fclctl.c index 487bc3ae66..f858a6d124 100644 --- a/epan/dissectors/packet-fclctl.c +++ b/epan/dissectors/packet-fclctl.c @@ -28,7 +28,6 @@ #include <epan/packet.h> #include <epan/wmem/wmem.h> #include <epan/etypes.h> -#include <epan/conversation.h> #include "packet-fc.h" #include "packet-fclctl.h" @@ -111,6 +110,7 @@ static const value_string fc_lctl_rjt_val[] = { {FC_LCTL_RJT_VEND_ERR , "Vendor Unique Error"}, {0, NULL}, }; +static value_string_ext fc_lctl_rjt_val_ext = VALUE_STRING_EXT_INIT(fc_lctl_rjt_val); const gchar * fclctl_get_typestr (guint8 linkctl_type, guint8 type) @@ -128,13 +128,26 @@ fclctl_get_paramstr (guint32 linkctl_type, guint32 param) if (linkctl_type == FC_LCTL_PBSY) { return wmem_strdup_printf(wmem_packet_scope(), "%s, %s", val_to_str (((param & 0xFF000000) >> 24), fc_lctl_pbsy_acode_val, "0x%x"), - val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_pbsy_rjt_val, "0x%x")); + val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_pbsy_rjt_val, "0x%x")); } if ((linkctl_type == FC_LCTL_FRJT) || (linkctl_type == FC_LCTL_PRJT)) { return wmem_strdup_printf(wmem_packet_scope(), "%s, %s", val_to_str (((param & 0xFF000000) >> 24), fc_lctl_rjt_acode_val, "0x%x"), - val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_rjt_val, "%x")); + val_to_str_ext (((param & 0x00FF0000) >> 16), &fc_lctl_rjt_val_ext, "%x")); } return ""; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ |