diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-08-15 09:40:00 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-08-15 14:47:25 +0000 |
| commit | 271deaa4ffbbf6ef0699d8e94248a5dfd438c8f4 (patch) | |
| tree | cddcd939654a2c8383cc1403f2e00a359380bcb0 /epan/dissectors/packet-llc.c | |
| parent | 60707f812bf68e76d462bf446704405f373e9c7d (diff) | |
paacket-llc.c: Minor changes
- Remove unneeded '#include <epan/conversation.h>';
- tvb_length_remaining() --> tvb_reported_length_remaining();
- Add editor modelines.
Change-Id: I8410a1286238c0fa1ec9f6b680ab0eb2665672f9
Reviewed-on: https://code.wireshark.org/review/3621
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-llc.c')
| -rw-r--r-- | epan/dissectors/packet-llc.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index dac0ec26b9..d48d5698cb 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -36,7 +36,6 @@ #include <epan/bridged_pids.h> #include <epan/ppptypes.h> #include <epan/arcnet_pids.h> -#include <epan/conversation.h> #include "packet-fc.h" #include "packet-ip.h" #include "packet-ipx.h" @@ -494,7 +493,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Response" : "Command" ); - if (tvb_length_remaining(tvb, llc_header_len) > 0) { + if (tvb_reported_length_remaining(tvb, llc_header_len) > 0) { next_tvb = tvb_new_subset_remaining(tvb, llc_header_len); if (XDLC_IS_INFORMATION(control)) { /* @@ -953,3 +952,16 @@ proto_reg_handoff_llc(void) if (oui_info_table != NULL) g_hash_table_foreach(oui_info_table, register_hf, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ |