diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-11-29 07:26:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-11-29 07:26:52 +0000 |
| commit | 785ef839640e00fd7db46130e367fc731525ccad (patch) | |
| tree | 8036658f090e43777bddb573b6c226bbfd0d5459 /epan/tvbuff.h | |
| parent | 1429986ded1a0a63afcf67d57a1de2c496839068 (diff) | |
| download | wireshark-785ef839640e00fd7db46130e367fc731525ccad.tar.gz | |
Revert "Add QNX' QNET protocol"
This reverts commit 72b91a56f86e3bbab700900366f81dc8c353b91d.
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>
Diffstat (limited to 'epan/tvbuff.h')
| -rw-r--r-- | epan/tvbuff.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/epan/tvbuff.h b/epan/tvbuff.h index c5bf1f13e4..65931257d0 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -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. * |