diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-02-05 00:33:45 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-02-06 21:35:58 +0000 |
| commit | 63479adf638710b6fd272be5b4b0df23bda2daac (patch) | |
| tree | 0d7fd0d6b0de10ffc163b270e387aa814305e364 /wiretap/atm.h | |
| parent | 1dc06a2681495b3bb2c75fc871f156f06b973260 (diff) | |
Make some routines take a struct wtap_pkthdr * as an argument.
For some routines that take multiple arguments that come from a struct
wtap_pkthdr, pass a pointer to the struct wtap_pkthdr in question,
rather than the separate arguments. Do this even if we're passing
expressions that were earlier assigned to the struct wtap_pkthdr fields
in question. This simplifies the calling sequences and ensures that the
right values are picked up by the called routine; in at least one case
we were *not* passing the right values (the code to handle Simple Packet
Blocks in pcap-ng files).
Also, call the byte-swapping routines for pseudo-header fields only if
we need to do byte-swapping.
Change-Id: I3a8badfcfeb0237dfc1d1014185a67f18c0f2ebe
Reviewed-on: https://code.wireshark.org/review/119
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/atm.h')
| -rw-r--r-- | wiretap/atm.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/wiretap/atm.h b/wiretap/atm.h index fe7b5130a1..4db8837b87 100644 --- a/wiretap/atm.h +++ b/wiretap/atm.h @@ -32,11 +32,9 @@ */ extern void -atm_guess_traffic_type(const guint8 *pd, guint32 len, - union wtap_pseudo_header *pseudo_header); +atm_guess_traffic_type(struct wtap_pkthdr *phdr, const guint8 *pd); extern void -atm_guess_lane_type(const guint8 *pd, guint32 len, - union wtap_pseudo_header *pseudo_header); +atm_guess_lane_type(struct wtap_pkthdr *phdr, const guint8 *pd); #endif /* __ATM_H__ */ |