Get rid of unused structure member.
Change-Id: I86c32f18f8168d776fc5eb2116bc600a87ab57e0 Reviewed-on: https://code.wireshark.org/review/25677 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
parent
e5ac9e4cf0
commit
a0e76588bb
|
@ -124,7 +124,6 @@ merge_open_in_files(guint in_file_count, const char *const *in_file_names,
|
||||||
for (i = 0; i < in_file_count; i++) {
|
for (i = 0; i < in_file_count; i++) {
|
||||||
files[i].filename = in_file_names[i];
|
files[i].filename = in_file_names[i];
|
||||||
files[i].wth = wtap_open_offline(in_file_names[i], WTAP_TYPE_AUTO, err, err_info, FALSE);
|
files[i].wth = wtap_open_offline(in_file_names[i], WTAP_TYPE_AUTO, err, err_info, FALSE);
|
||||||
files[i].data_offset = 0;
|
|
||||||
files[i].state = RECORD_NOT_PRESENT;
|
files[i].state = RECORD_NOT_PRESENT;
|
||||||
files[i].packet_num = 0;
|
files[i].packet_num = 0;
|
||||||
|
|
||||||
|
@ -256,12 +255,14 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[],
|
||||||
* merge of those records, but you obviously *can't* get that.
|
* merge of those records, but you obviously *can't* get that.
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < in_file_count; i++) {
|
for (i = 0; i < in_file_count; i++) {
|
||||||
|
gint64 data_offset;
|
||||||
|
|
||||||
if (in_files[i].state == RECORD_NOT_PRESENT) {
|
if (in_files[i].state == RECORD_NOT_PRESENT) {
|
||||||
/*
|
/*
|
||||||
* No packet available, and we haven't seen an error or EOF yet,
|
* No packet available, and we haven't seen an error or EOF yet,
|
||||||
* so try to read the next packet.
|
* so try to read the next packet.
|
||||||
*/
|
*/
|
||||||
if (!wtap_read(in_files[i].wth, err, err_info, &in_files[i].data_offset)) {
|
if (!wtap_read(in_files[i].wth, err, err_info, &data_offset)) {
|
||||||
if (*err != 0) {
|
if (*err != 0) {
|
||||||
in_files[i].state = GOT_ERROR;
|
in_files[i].state = GOT_ERROR;
|
||||||
return &in_files[i];
|
return &in_files[i];
|
||||||
|
@ -337,6 +338,7 @@ merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
|
||||||
int *err, gchar **err_info)
|
int *err, gchar **err_info)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
gint64 data_offset;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Find the first file not at EOF, and read the next packet from it.
|
* Find the first file not at EOF, and read the next packet from it.
|
||||||
|
@ -344,7 +346,7 @@ merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
|
||||||
for (i = 0; i < in_file_count; i++) {
|
for (i = 0; i < in_file_count; i++) {
|
||||||
if (in_files[i].state == AT_EOF)
|
if (in_files[i].state == AT_EOF)
|
||||||
continue; /* This file is already at EOF */
|
continue; /* This file is already at EOF */
|
||||||
if (wtap_read(in_files[i].wth, err, err_info, &in_files[i].data_offset))
|
if (wtap_read(in_files[i].wth, err, err_info, &data_offset))
|
||||||
break; /* We have a packet */
|
break; /* We have a packet */
|
||||||
if (*err != 0) {
|
if (*err != 0) {
|
||||||
/* Read error - quit immediately. */
|
/* Read error - quit immediately. */
|
||||||
|
|
|
@ -30,7 +30,6 @@ typedef enum {
|
||||||
typedef struct merge_in_file_s {
|
typedef struct merge_in_file_s {
|
||||||
const char *filename;
|
const char *filename;
|
||||||
wtap *wth;
|
wtap *wth;
|
||||||
gint64 data_offset;
|
|
||||||
in_file_state_e state;
|
in_file_state_e state;
|
||||||
guint32 packet_num; /* current packet number */
|
guint32 packet_num; /* current packet number */
|
||||||
gint64 size; /* file size */
|
gint64 size; /* file size */
|
||||||
|
|
Loading…
Reference in New Issue