Wireshark-commits: [Wireshark-commits] master-2.0 85cc4f0: Convert ftype-tvbuff.c to ftype-protocol
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=85cc4f0f696833a03fb6c37aba423c6da0bc101b
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
85cc4f0 by Michael Mann (mmann78@xxxxxxxxxxxx):
Convert ftype-tvbuff.c to ftype-protocol.c
As noted in https://www.wireshark.org/lists/wireshark-dev/201604/msg00103.html
a protocol field isn't really a tv_buff, so allow for the possibility
of a NULL tv_buff in a "protocol type". If the tvb is NULL, use the
string of the protocol field for comparison
# Conflicts:
# epan/ftypes/.editorconfig
# epan/ftypes/CMakeLists.txt
# epan/ftypes/ftype-ieee-11073-float.c
# epan/ftypes/ftypes.h
Bug: 12335
Change-Id: Ie12a5f7b31c7293c61006b0f70135d100a97c4e0
Reviewed-on: https://code.wireshark.org/review/15261
Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Reviewed-on: https://code.wireshark.org/review/15274
Actions performed:
from d141d31 Git: Add .vscode to .gitignore.
adds 85cc4f0 Convert ftype-tvbuff.c to ftype-protocol.c
Summary of changes:
epan/CMakeLists.txt | 2 +-
epan/ftypes/Makefile.common | 4 +-
epan/ftypes/ftype-bytes.c | 18 +-
epan/ftypes/ftype-double.c | 4 +-
epan/ftypes/ftype-guid.c | 2 +-
epan/ftypes/ftype-integer.c | 40 ++---
epan/ftypes/ftype-ipv4.c | 2 +-
epan/ftypes/ftype-ipv6.c | 2 +-
epan/ftypes/ftype-none.c | 2 +-
epan/ftypes/ftype-pcre.c | 2 +-
epan/ftypes/{ftype-tvbuff.c => ftype-protocol.c} | 192 ++++++++++++++--------
epan/ftypes/ftype-string.c | 8 +-
epan/ftypes/ftype-time.c | 4 +-
epan/ftypes/ftypes-int.h | 4 +-
epan/ftypes/ftypes.c | 6 +-
epan/ftypes/ftypes.h | 12 +-
epan/proto.c | 15 +-
17 files changed, 189 insertions(+), 130 deletions(-)
rename epan/ftypes/{ftype-tvbuff.c => ftype-protocol.c} (58%)
