Get rid of the per-capture_file wtap_rec and Buffer.

Most code that reads from a capture_file already has its own wtap_rec
and Buffer; change the remaining ones to do so as well.

Change-Id: I9b7c136642bbb375848c37ebe23c9cdeffe830c3
Reviewed-on: https://code.wireshark.org/review/32732
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 2 insertions, 13 deletions

diff --git a/file.h b/file.h
index 0d9bcb318e..18e537f151 100644
--- a/file.h
+++ b/file.h
@@ -150,19 +150,8 @@ cf_read_status_t cf_read(capture_file *cf, gboolean from_save);
  * @param buf a Buffer into which to read the record's raw data
  * @return TRUE if the read succeeded, FALSE if there was an error
  */
-gboolean cf_read_record_r(capture_file *cf, const frame_data *fdata,
-                          wtap_rec *rec, Buffer *buf);
-
-/**
- * Read the metadata and raw data for a record into a
- * capture_file structure's phdr and buf members.
- * It will pop up an alert box if there's an error.
- *
- * @param cf the capture file from which to read the record
- * @param fdata the frame_data structure for the record in question
- * @return TRUE if the read succeeded, FALSE if there was an error
- */
-gboolean cf_read_record(capture_file *cf, frame_data *fdata);
+gboolean cf_read_record(capture_file *cf, const frame_data *fdata,
+                        wtap_rec *rec, Buffer *buf);
 
 /**
  * Read packets from the "end" of a capture file.