From cb9725ce2beefe34c08dc954ff2a9c51c6a7e3bd Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 28 Dec 2011 23:39:14 +0000 Subject: Prepend the sita_phdr fields with "sita_" to make them less collision-prone. svn path=/trunk/; revision=40320 --- wiretap/pcap-common.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'wiretap/pcap-common.c') 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); -- cgit v1.2.1