forked from osmocom/wireshark
In follow.c, initialize data_out_file to NULL, as it used to
be initialized in gtk/follow_dlg.c In gtk/follow_dlg.c, declare data_out_file as 'extern'. In tethereal.c, no longer define 'data_out_file', as the storage for it is now in follow.c. svn path=/trunk/; revision=4830
This commit is contained in:
parent
12832ed6df
commit
d96747f550
4
follow.c
4
follow.c
|
@ -1,6 +1,6 @@
|
||||||
/* follow.c
|
/* follow.c
|
||||||
*
|
*
|
||||||
* $Id: follow.c,v 1.28 2002/01/21 07:36:31 guy Exp $
|
* $Id: follow.c,v 1.29 2002/02/28 19:35:08 gram Exp $
|
||||||
*
|
*
|
||||||
* Copyright 1998 Mike Hall <mlh@io.com>
|
* Copyright 1998 Mike Hall <mlh@io.com>
|
||||||
*
|
*
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
#include <epan/packet.h>
|
#include <epan/packet.h>
|
||||||
#include "follow.h"
|
#include "follow.h"
|
||||||
|
|
||||||
FILE* data_out_file;
|
FILE* data_out_file = NULL;
|
||||||
|
|
||||||
gboolean incomplete_tcp_stream = FALSE;
|
gboolean incomplete_tcp_stream = FALSE;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* follow_dlg.c
|
/* follow_dlg.c
|
||||||
*
|
*
|
||||||
* $Id: follow_dlg.c,v 1.20 2002/01/21 07:37:41 guy Exp $
|
* $Id: follow_dlg.c,v 1.21 2002/02/28 19:35:09 gram Exp $
|
||||||
*
|
*
|
||||||
* Ethereal - Network traffic analyzer
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -111,7 +111,7 @@ static void follow_stream_om_client(GtkWidget * w, gpointer data);
|
||||||
static void follow_stream_om_server(GtkWidget * w, gpointer data);
|
static void follow_stream_om_server(GtkWidget * w, gpointer data);
|
||||||
|
|
||||||
|
|
||||||
FILE *data_out_file = NULL;
|
extern FILE *data_out_file;
|
||||||
|
|
||||||
|
|
||||||
#define E_FOLLOW_INFO_KEY "follow_info_key"
|
#define E_FOLLOW_INFO_KEY "follow_info_key"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* tethereal.c
|
/* tethereal.c
|
||||||
*
|
*
|
||||||
* $Id: tethereal.c,v 1.128 2002/02/27 08:57:14 guy Exp $
|
* $Id: tethereal.c,v 1.129 2002/02/28 19:35:08 gram Exp $
|
||||||
*
|
*
|
||||||
* Ethereal - Network traffic analyzer
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -150,7 +150,6 @@ static void wtap_dispatch_cb_print(u_char *, const struct wtap_pkthdr *, long,
|
||||||
union wtap_pseudo_header *, const u_char *);
|
union wtap_pseudo_header *, const u_char *);
|
||||||
|
|
||||||
capture_file cfile;
|
capture_file cfile;
|
||||||
FILE *data_out_file = NULL;
|
|
||||||
ts_type timestamp_type = RELATIVE;
|
ts_type timestamp_type = RELATIVE;
|
||||||
#ifdef HAVE_LIBPCAP
|
#ifdef HAVE_LIBPCAP
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
Loading…
Reference in New Issue