From 2e137f31fa4af5e99ac61dba1922fb1e5966bd60 Mon Sep 17 00:00:00 2001 From: Jim Young Date: Thu, 17 Dec 2020 13:23:14 +0000 Subject: [PATCH] Update comments: From wtap_pkthdr to wtap_rec. Fixup some overlooked comments to reflect refactoring made back in 2018 with commit 1f5f63f8ef98bfe9c4d734674cee0df64855555d. --- wiretap/daintree-sna.c | 2 +- wiretap/ipfix.c | 2 +- wiretap/netscaler.c | 2 +- wiretap/pcapng.c | 4 ++-- wiretap/pppdump.c | 2 +- wiretap/wtap.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c index 60975890c6..5768a52b30 100644 --- a/wiretap/daintree-sna.c +++ b/wiretap/daintree-sna.c @@ -141,7 +141,7 @@ daintree_sna_seek_read(wtap *wth, gint64 seek_off, wtap_rec *rec, err_info); } -/* Read a header line, scan it, and fill in a struct wtap_pkthdr. +/* Read a header line, scan it, and fill in a struct wtap_rec. * Then convert packet data from ASCII hex string to binary in place, * sanity-check its length against what we assume is the packet length field, * and copy it into a Buffer. */ diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c index 5f076698b4..44f5808309 100644 --- a/wiretap/ipfix.c +++ b/wiretap/ipfix.c @@ -135,7 +135,7 @@ ipfix_read_message_header(ipfix_message_header_t *pfx_hdr, FILE_T fh, int *err, } -/* Read IPFIX message header from file and fill in the struct wtap_pkthdr +/* Read IPFIX message header from file and fill in the struct wtap_rec * for the packet, and, if that succeeds, read the packet data. * Return true on success. Set *err to 0 on EOF, any other value for "real" * errors (EOF is ok, since return value is still FALSE). diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index f8df1bb996..40a009f3eb 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -1727,7 +1727,7 @@ static gboolean nstrace_seek_read_v10(wtap *wth, gint64 seek_off, } /* - ** Fill in what part of the struct wtap_pkthdr we can. + ** Fill in what part of the struct wtap_rec we can. */ #define GENERATE_CASE_FULL(rec,type,HEADERVER) \ case NSPR_PDPKTRACEFULLTX_V##type:\ diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index d3a5a098b0..c7fcf06dce 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -246,9 +246,9 @@ typedef struct { * A handler has a "read" routine and a "write" routine. * * A "read" routine returns a block as a libwiretap record, filling - * in the wtap_pkthdr structure with the appropriate record type and + * in the wtap_rec structure with the appropriate record type and * other information, and filling in the supplied Buffer with - * data for which there's no place in the wtap_pkthdr structure. + * data for which there's no place in the wtap_rec structure. * * A "write" routine takes a libwiretap record and Buffer and writes * out a block. diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c index 1553cff090..32bf813870 100644 --- a/wiretap/pppdump.c +++ b/wiretap/pppdump.c @@ -308,7 +308,7 @@ pppdump_open(wtap *wth, int *err, gchar **err_info) return WTAP_OPEN_MINE; } -/* Set part of the struct wtap_pkthdr. */ +/* Set part of the struct wtap_rec. */ static void pppdump_set_phdr(wtap_rec *rec, int num_bytes, direction_enum direction) diff --git a/wiretap/wtap.h b/wiretap/wtap.h index c3b016397e..9eef03dd40 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1843,7 +1843,7 @@ gboolean wtap_read(wtap *wth, wtap_rec *rec, Buffer *buf, int *err, * reading. * @seek_off a gint64 giving an offset value returned by a previous * wtap_read() call. - * @phdr a pointer to a struct wtap_pkthdr, filled in with information + * @rec a pointer to a struct wtap_rec, filled in with information * about the record. * @buf a pointer to a Buffer, filled in with data from the record. * @param err a positive "errno" value, or a negative number indicating