diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-12-28 23:39:14 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-12-28 23:39:14 +0000 |
| commit | cb9725ce2beefe34c08dc954ff2a9c51c6a7e3bd (patch) | |
| tree | 0fa7ae9fc06a62e7fb6793b1ea1693b2f89ada25 /wiretap | |
| parent | 10dfe948422a48963b611a07b1193ddb5b655d95 (diff) | |
| download | wireshark-cb9725ce2beefe34c08dc954ff2a9c51c6a7e3bd.tar.gz | |
Prepend the sita_phdr fields with "sita_" to make them less
collision-prone.
svn path=/trunk/; revision=40320
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 20 | ||||
| -rw-r--r-- | wiretap/wtap.h | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 25a2be444c..e0575c06a5 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -934,11 +934,11 @@ pcap_read_sita_pseudoheader(FILE_T fh, union wtap_pseudo_header *pseudo_header, return FALSE; } - pseudo_header->sita.flags = sita_phdr[SITA_FLAGS_OFFSET]; - pseudo_header->sita.signals = sita_phdr[SITA_SIGNALS_OFFSET]; - pseudo_header->sita.errors1 = sita_phdr[SITA_ERRORS1_OFFSET]; - pseudo_header->sita.errors2 = sita_phdr[SITA_ERRORS2_OFFSET]; - pseudo_header->sita.proto = sita_phdr[SITA_PROTO_OFFSET]; + pseudo_header->sita.sita_flags = sita_phdr[SITA_FLAGS_OFFSET]; + pseudo_header->sita.sita_signals = sita_phdr[SITA_SIGNALS_OFFSET]; + pseudo_header->sita.sita_errors1 = sita_phdr[SITA_ERRORS1_OFFSET]; + pseudo_header->sita.sita_errors2 = sita_phdr[SITA_ERRORS2_OFFSET]; + pseudo_header->sita.sita_proto = sita_phdr[SITA_PROTO_OFFSET]; return TRUE; } @@ -1878,11 +1878,11 @@ pcap_write_phdr(wtap_dumper *wdh, int encap, const union wtap_pseudo_header *pse * Write the SITA header. */ memset(&sita_hdr, 0, sizeof(sita_hdr)); - sita_hdr[SITA_FLAGS_OFFSET] = pseudo_header->sita.flags; - sita_hdr[SITA_SIGNALS_OFFSET] = pseudo_header->sita.signals; - sita_hdr[SITA_ERRORS1_OFFSET] = pseudo_header->sita.errors1; - sita_hdr[SITA_ERRORS2_OFFSET] = pseudo_header->sita.errors2; - sita_hdr[SITA_PROTO_OFFSET] = pseudo_header->sita.proto; + sita_hdr[SITA_FLAGS_OFFSET] = pseudo_header->sita.sita_flags; + sita_hdr[SITA_SIGNALS_OFFSET] = pseudo_header->sita.sita_signals; + sita_hdr[SITA_ERRORS1_OFFSET] = pseudo_header->sita.sita_errors1; + sita_hdr[SITA_ERRORS2_OFFSET] = pseudo_header->sita.sita_errors2; + sita_hdr[SITA_PROTO_OFFSET] = pseudo_header->sita.sita_proto; if (!wtap_dump_file_write(wdh, sita_hdr, sizeof(sita_hdr), err)) return FALSE; wdh->bytes_dumped += sizeof(sita_hdr); diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 8355c76f2b..972cee4b39 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -739,11 +739,11 @@ struct erf_mc_phdr { #define SITA_PROTO_BOP_FRL (0x12) struct sita_phdr { - guint8 flags; - guint8 signals; - guint8 errors1; - guint8 errors2; - guint8 proto; + guint8 sita_flags; + guint8 sita_signals; + guint8 sita_errors1; + guint8 sita_errors2; + guint8 sita_proto; }; /*pseudo header for Bluetooth HCI*/ |