diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-11-29 19:21:20 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-11-29 19:21:20 +0000 |
| commit | d99fdfda639e78feffa3d9a1a6c758ae90539442 (patch) | |
| tree | 87b591d02048464feebc32f8cf1dc784c7229b17 /wiretap/i4btrace.c | |
| parent | 5ac6474c945133a8415fb3be917859e5d42b6256 (diff) | |
| download | wireshark-d99fdfda639e78feffa3d9a1a6c758ae90539442.tar.gz | |
Replace macros: BSWAP16, BSWAP32, BSWAP64 with glib-version.
XXX, people are not aware that expression of this macros might be evaluated multiple times, like:
- BSWAP16(tvb_get_letohs(tvb, off)) : \
+ GUINT16_SWAP_LE_BE(tvb_get_letohs(tvb, off)) : \
Should be tvb_get_ntohs() called?
svn path=/trunk/; revision=53653
Diffstat (limited to 'wiretap/i4btrace.c')
| -rw-r--r-- | wiretap/i4btrace.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index ccdce4db12..d6d1074ffe 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -73,11 +73,11 @@ int i4btrace_open(wtap *wth, int *err, gchar **err_info) /* * OK, try byte-swapping the header fields. */ - hdr.length = BSWAP32(hdr.length); - hdr.unit = BSWAP32(hdr.unit); - hdr.type = BSWAP32(hdr.type); - hdr.dir = BSWAP32(hdr.dir); - hdr.trunc = BSWAP32(hdr.trunc); + hdr.length = GUINT32_SWAP_LE_BE(hdr.length); + hdr.unit = GUINT32_SWAP_LE_BE(hdr.unit); + hdr.type = GUINT32_SWAP_LE_BE(hdr.type); + hdr.dir = GUINT32_SWAP_LE_BE(hdr.dir); + hdr.trunc = GUINT32_SWAP_LE_BE(hdr.trunc); if (!I4B_HDR_IS_OK(hdr)) { /* * It doesn't look valid in either byte order. @@ -164,14 +164,14 @@ i4b_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, /* * Byte-swap the header. */ - hdr.length = BSWAP32(hdr.length); - hdr.unit = BSWAP32(hdr.unit); - hdr.type = BSWAP32(hdr.type); - hdr.dir = BSWAP32(hdr.dir); - hdr.trunc = BSWAP32(hdr.trunc); - hdr.count = BSWAP32(hdr.count); - hdr.ts_sec = BSWAP32(hdr.ts_sec); - hdr.ts_usec = BSWAP32(hdr.ts_usec); + hdr.length = GUINT32_SWAP_LE_BE(hdr.length); + hdr.unit = GUINT32_SWAP_LE_BE(hdr.unit); + hdr.type = GUINT32_SWAP_LE_BE(hdr.type); + hdr.dir = GUINT32_SWAP_LE_BE(hdr.dir); + hdr.trunc = GUINT32_SWAP_LE_BE(hdr.trunc); + hdr.count = GUINT32_SWAP_LE_BE(hdr.count); + hdr.ts_sec = GUINT32_SWAP_LE_BE(hdr.ts_sec); + hdr.ts_usec = GUINT32_SWAP_LE_BE(hdr.ts_usec); } if (hdr.length < sizeof(hdr)) { |