From a344c9736efe5519543da1290e1ad9065d0b0cff Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 23 May 2014 10:50:02 +0000 Subject: Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records." This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4. A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes. That is in-progress. Change-Id: Ic558f163a48e2c6d0df7f55e81a35a5e24b53bc6 Reviewed-on: https://code.wireshark.org/review/1741 Reviewed-by: Guy Harris --- wiretap/ber.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'wiretap/ber.c') diff --git a/wiretap/ber.c b/wiretap/ber.c index 1a3f4e6bf6..59e7e28f39 100644 --- a/wiretap/ber.c +++ b/wiretap/ber.c @@ -38,14 +38,14 @@ #define BER_UNI_TAG_SEQ 16 /* SEQUENCE, SEQUENCE OF */ #define BER_UNI_TAG_SET 17 /* SET, SET OF */ -static int ber_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, - Buffer *buf, int *err, gchar **err_info) +static gboolean ber_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, + Buffer *buf, int *err, gchar **err_info) { gint64 file_size; int packet_size; if ((file_size = wtap_file_size(wth, err)) == -1) - return -1; + return FALSE; if (file_size > WTAP_MAX_PACKET_SIZE) { /* @@ -55,7 +55,7 @@ static int ber_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("ber: File has %" G_GINT64_MODIFIER "d-byte packet, bigger than maximum of %u", file_size, WTAP_MAX_PACKET_SIZE); - return -1; + return FALSE; } packet_size = (int)file_size; @@ -67,12 +67,10 @@ static int ber_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, phdr->ts.secs = 0; phdr->ts.nsecs = 0; - if (!wtap_read_packet_bytes(fh, buf, packet_size, err, err_info)) - return -1; - return REC_TYPE_PACKET; + return wtap_read_packet_bytes(fh, buf, packet_size, err, err_info); } -static int ber_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) +static gboolean ber_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { gint64 offset; @@ -82,24 +80,24 @@ static int ber_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) /* there is only ever one packet */ if (offset != 0) - return -1; + return FALSE; *data_offset = offset; return ber_read_file(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info); } -static int ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr _U_, - Buffer *buf, int *err, gchar **err_info) +static gboolean ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr _U_, + Buffer *buf, int *err, gchar **err_info) { /* there is only one packet */ if(seek_off > 0) { *err = 0; - return -1; + return FALSE; } if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) - return -1; + return FALSE; return ber_read_file(wth, wth->random_fh, phdr, buf, err, err_info); } -- cgit v1.2.3