diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-08-14 21:08:43 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-08-15 14:46:45 +0000 |
| commit | 56bd0a24b5ab3498d50ee34b3dbf45be069e33d7 (patch) | |
| tree | 2b82c740cad8401191b79b4777849eecd6e450a4 /epan/dissectors/packet-usb-masstorage.c | |
| parent | 494559998b40107faca35f5a1c4c54bbf473dd39 (diff) | |
Remove unneeded #include; As needed: Add editor modelines & do whitespace changes.
Change-Id: Ib345833114aab0c70fc20b1fc74c90abecec486e
Reviewed-on: https://code.wireshark.org/review/3619
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-usb-masstorage.c')
| -rw-r--r-- | epan/dissectors/packet-usb-masstorage.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index 8ac950c1c2..8d36a580b6 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -24,7 +24,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/wmem/wmem.h> -#include <epan/conversation.h> #include "packet-usb.h" #include "packet-scsi.h" @@ -53,15 +52,15 @@ static gint ett_usb_ms = -1; /* there is one such structure for each masstorage conversation */ typedef struct _usb_ms_conv_info_t { - wmem_tree_t *itl; /* indexed by LUN */ - wmem_tree_t *itlq; /* pinfo->fd->num */ + wmem_tree_t *itl; /* indexed by LUN */ + wmem_tree_t *itlq; /* pinfo->fd->num */ } usb_ms_conv_info_t; static const value_string status_vals[] = { - {0x00, "Command Passed"}, - {0x01, "Command Failed"}, - {0x02, "Phase Error"}, + {0x00, "Command Passed"}, + {0x01, "Command Failed"}, + {0x02, "Phase Error"}, {0, NULL} }; @@ -468,3 +467,16 @@ proto_reg_handoff_usb_ms(void) heur_dissector_add("usb.bulk", dissect_usb_ms_bulk_heur, proto_usb_ms); } + +/* + * 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: + */ |