diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-03 20:35:50 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-03 20:35:50 +0000 |
| commit | 01e08ae582b9e01bd5d236e748f43b4a2cedee43 (patch) | |
| tree | 144a4d538a1b9801393b3a6ed896e15be740dcd5 /wiretap/stanag4607.c | |
| parent | f98625c0d00ce32fb4cb8d7065a830f31f4bf269 (diff) | |
| download | wireshark-01e08ae582b9e01bd5d236e748f43b4a2cedee43.tar.gz | |
wiretap: start using <wsutil/pint.h>
svn path=/trunk/; revision=53764
Diffstat (limited to 'wiretap/stanag4607.c')
| -rw-r--r-- | wiretap/stanag4607.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/stanag4607.c b/wiretap/stanag4607.c index df521ebacb..ed02bd5bea 100644 --- a/wiretap/stanag4607.c +++ b/wiretap/stanag4607.c @@ -68,14 +68,14 @@ static gboolean stanag4607_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *p goto fail; offset += bytes_read; - if (!is_valid_id(pntohs(&stanag_pkt_hdr[0]))) { + if (!is_valid_id(pntoh16(&stanag_pkt_hdr[0]))) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup("Bad version number"); return FALSE; } /* The next 4 bytes are the packet length */ - packet_size = pntohl(&stanag_pkt_hdr[2]); + packet_size = pntoh32(&stanag_pkt_hdr[2]); phdr->caplen = packet_size; phdr->len = packet_size; @@ -101,7 +101,7 @@ static gboolean stanag4607_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *p goto fail; offset += bytes_read; - tm.tm_year = pntohs(&mseg[35]) - 1900; + tm.tm_year = pntoh16(&mseg[35]) - 1900; tm.tm_mon = mseg[37] - 1; tm.tm_mday = mseg[38]; tm.tm_hour = 0; @@ -124,7 +124,7 @@ static gboolean stanag4607_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *p if (bytes_read != sizeof dseg) goto fail; offset += bytes_read; - millisecs = pntohl(&dseg[15]); + millisecs = pntoh32(&dseg[15]); } if (0 != millisecs) { secs = millisecs/1000; |