osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Revert "Add QNX' QNET protocol" 

This reverts commit 72b91a56f8.

value_string_ext tables ***MUST*** be sorted numerically, otherwise the code prints warnings such as the ones in

    http://buildbot.wireshark.org/trunk/builders/Ubuntu%2014.04%20x64/builds/1419/steps/test.sh/logs/stdio

Fix this and resubmit.

Change-Id: I448025bb7b19a607e992831202ed31d243ce70d8
Reviewed-on: https://code.wireshark.org/review/5530
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-11-29 07:26:42 +00:00
parent 1429986ded
commit 785ef83964
4 changed files with 0 additions and 6215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/CMakeLists.txt
View File

@ -1135,7 +1135,6 @@ set(DISSECTOR_SRC
dissectors/packet-q931.c
dissectors/packet-q933.c
dissectors/packet-qllc.c
dissectors/packet-qnet6.c
dissectors/packet-quake.c
dissectors/packet-quake2.c
dissectors/packet-quake3.c

1
epan/dissectors/Makefile.common
View File

@ -1048,7 +1048,6 @@ DISSECTOR_SRC = \
packet-q931.c \
packet-q933.c \
packet-qllc.c \
packet-qnet6.c \
packet-quake.c \
packet-quake2.c \
packet-quake3.c \

6202
epan/dissectors/packet-qnet6.c
View File

File diff suppressed because it is too large Load Diff

11
epan/tvbuff.h
View File

@ -342,17 +342,6 @@ WS_DLL_PUBLIC gdouble tvb_get_letohieee_double(tvbuff_t *tvb,
#error "Unsupported byte order"
#endif
/* Fetch values from the TVB in dynamic byte order */
#define __tvb_get_dyn(TVB, OFFSET, LITTLE, SUFFIX) ((LITTLE == ENC_LITTLE_ENDIAN) ? \
tvb_get_letoh ## SUFFIX ((TVB), (OFFSET)) : \
tvb_get_ntoh ## SUFFIX ((TVB), (OFFSET)))
#define tvb_get_16(TVB, OFFSET, LITTLE) __tvb_get_dyn(TVB, OFFSET, LITTLE, s)
#define tvb_get_24(TVB, OFFSET, LITTLE) __tvb_get_dyn(TVB, OFFSET, LITTLE, 24)
#define tvb_get_32(TVB, OFFSET, LITTLE) __tvb_get_dyn(TVB, OFFSET, LITTLE, l)
#define tvb_get_40(TVB, OFFSET, LITTLE) __tvb_get_dyn(TVB, OFFSET, LITTLE, 40)
#define tvb_get_48(TVB, OFFSET, LITTLE) __tvb_get_dyn(TVB, OFFSET, LITTLE, 48)
#define tvb_get_56(TVB, OFFSET, LITTLE) __tvb_get_dyn(TVB, OFFSET, LITTLE, 56)
#define tvb_get_64(TVB, OFFSET, LITTLE) __tvb_get_dyn(TVB, OFFSET, LITTLE, 64)
/* Fetch a time value from an ASCII-style string in the tvb.
*