aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS2
-rw-r--r--epan/packet.c3
-rw-r--r--epan/proto.c4
-rw-r--r--file.c4
-rw-r--r--tethereal.c4
-rw-r--r--wiretap/etherpeek.c8
-rw-r--r--wiretap/file.c8
-rw-r--r--wiretap/libpcap.c6
-rw-r--r--wiretap/libpcap.h5
-rw-r--r--wiretap/netmon.c6
-rw-r--r--wiretap/netmon.h5
-rw-r--r--wiretap/netxray.c6
-rw-r--r--wiretap/netxray.h5
-rw-r--r--wiretap/ngsniffer.c5
-rw-r--r--wiretap/ngsniffer.h5
-rw-r--r--wiretap/snoop.c6
-rw-r--r--wiretap/snoop.h5
-rw-r--r--wiretap/visual.c6
-rw-r--r--wiretap/visual.h4
19 files changed, 40 insertions, 57 deletions
diff --git a/AUTHORS b/AUTHORS
index eddb64954b..328e4823ab 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -82,6 +82,8 @@ Joerg Mayer <jmayer[AT]loplof.de> {
Crank up the warning level in GCC
Skinny (Official Name: SCCP)
Remove trailing blanks from hex dump in print/Tethereal
+ Remove unused variables and declarations of non-existent
+ functions
}
Martin Maciaszek <fastjack[AT]i-s-o.net> {
diff --git a/epan/packet.c b/epan/packet.c
index f3bfbf1bab..f6b7d7e358 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
- * $Id: packet.c,v 1.64 2002/02/27 00:26:29 guy Exp $
+ * $Id: packet.c,v 1.65 2002/02/27 08:57:23 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -734,7 +734,6 @@ dissector_table_foreach (char *name,
void
dissector_table_foreach_handle(char *name, DATFunc_handle func, gpointer user_data)
{
- dissector_foreach_info_t info;
dissector_table_t sub_dissectors = find_dissector_table( name);
GSList *tmp;
diff --git a/epan/proto.c b/epan/proto.c
index 085ad8cc2a..5c7beb55bc 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -1,7 +1,7 @@
/* proto.c
* Routines for protocol tree
*
- * $Id: proto.c,v 1.53 2002/02/18 22:26:29 guy Exp $
+ * $Id: proto.c,v 1.54 2002/02/27 08:57:23 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -67,8 +67,6 @@ static char* hfinfo_uint_format(header_field_info *hfinfo);
static char* hfinfo_int_vals_format(header_field_info *hfinfo);
static char* hfinfo_int_format(header_field_info *hfinfo);
-static gboolean check_for_protocol_or_field_id(GNode *node, gpointer data);
-
static proto_item*
proto_tree_add_node(proto_tree *tree, field_info *fi);
diff --git a/file.c b/file.c
index c561f54aaa..c2155ce9a7 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
- * $Id: file.c,v 1.263 2002/02/24 06:45:12 guy Exp $
+ * $Id: file.c,v 1.264 2002/02/27 08:57:14 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -623,7 +623,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
gboolean refilter)
{
apply_color_filter_args args;
- gint i, row;
+ gint row;
gboolean create_proto_tree = FALSE;
epan_dissect_t *edt;
GdkColor fg, bg;
diff --git a/tethereal.c b/tethereal.c
index 7f9d08c5fe..1072317459 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
/* tethereal.c
*
- * $Id: tethereal.c,v 1.127 2002/02/24 09:25:34 guy Exp $
+ * $Id: tethereal.c,v 1.128 2002/02/27 08:57:14 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1227,8 +1227,6 @@ fill_in_fdata(frame_data *fdata, capture_file *cf,
const struct wtap_pkthdr *phdr,
const union wtap_pseudo_header *pseudo_header, long offset)
{
- int i;
-
fdata->next = NULL;
fdata->prev = NULL;
fdata->pfd = NULL;
diff --git a/wiretap/etherpeek.c b/wiretap/etherpeek.c
index c7c2aa430b..5ac5d90b85 100644
--- a/wiretap/etherpeek.c
+++ b/wiretap/etherpeek.c
@@ -2,7 +2,7 @@
* Routines for opening EtherPeek (and TokenPeek?) files
* Copyright (c) 2001, Daniel Thompson <d.thompson@gmx.net>
*
- * $Id: etherpeek.c,v 1.16 2002/02/15 11:35:13 guy Exp $
+ * $Id: etherpeek.c,v 1.17 2002/02/27 08:57:24 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -138,11 +138,6 @@ int etherpeek_open(wtap *wth, int *err)
{
etherpeek_header_t ep_hdr;
struct timeval reference_time;
- static const int etherpeek_v7_encap[] = {
- WTAP_ENCAP_ETHERNET,
- WTAP_ENCAP_TOKEN_RING,
- };
- #define NUM_ETHERPEEK_V7_ENCAPS (sizeof etherpeek_v7_encap / sizeof etherpeek_v7_encap[0])
int file_encap;
/* EtherPeek files do not start with a magic value large enough
@@ -335,7 +330,6 @@ static gboolean etherpeek_read_v7(wtap *wth, int *err, long *data_offset)
guint8 status;
etherpeek_utime timestamp;
double t;
- unsigned int i;
wtap_file_read_expected_bytes(ep_pkt, sizeof(ep_pkt), wth->fh, err);
wth->data_offset += sizeof(ep_pkt);
diff --git a/wiretap/file.c b/wiretap/file.c
index 6145447c6b..f981bdd33a 100644
--- a/wiretap/file.c
+++ b/wiretap/file.c
@@ -1,6 +1,6 @@
/* file.c
*
- * $Id: file.c,v 1.80 2002/01/23 06:32:52 guy Exp $
+ * $Id: file.c,v 1.81 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -266,7 +266,7 @@ success:
static const struct file_type_info {
const char *name;
const char *short_name;
- int (*can_write_encap)(int, int);
+ int (*can_write_encap)(int);
int (*dump_open)(wtap_dumper *, int *);
} dump_open_table[WTAP_NUM_FILE_TYPES] = {
/* WTAP_FILE_UNKNOWN */
@@ -441,7 +441,7 @@ gboolean wtap_dump_can_write_encap(int filetype, int encap)
|| dump_open_table[filetype].can_write_encap == NULL)
return FALSE;
- if ((*dump_open_table[filetype].can_write_encap)(filetype, encap) != 0)
+ if ((*dump_open_table[filetype].can_write_encap)(encap) != 0)
return FALSE;
return TRUE;
@@ -529,7 +529,7 @@ static gboolean wtap_dump_open_check(int filetype, int encap, int *err)
/* OK, we know how to write that type; can we write the specified
encapsulation type? */
- *err = (*dump_open_table[filetype].can_write_encap)(filetype, encap);
+ *err = (*dump_open_table[filetype].can_write_encap)(encap);
if (*err != 0)
return FALSE;
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 05a13a64d1..cdb07aaf36 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -1,6 +1,6 @@
/* libpcap.c
*
- * $Id: libpcap.c,v 1.65 2002/02/07 20:41:28 guy Exp $
+ * $Id: libpcap.c,v 1.66 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,8 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -983,7 +983,7 @@ static int wtap_wtap_encap_to_pcap_encap(int encap)
/* Returns 0 if we could write the specified encapsulation type,
an error indication otherwise. */
-int libpcap_dump_can_write_encap(int filetype, int encap)
+int libpcap_dump_can_write_encap(int encap)
{
/* Per-packet encapsulations aren't supported. */
if (encap == WTAP_ENCAP_PER_PACKET)
diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h
index fd56251f2b..3e272b1abc 100644
--- a/wiretap/libpcap.h
+++ b/wiretap/libpcap.h
@@ -1,6 +1,6 @@
/* libpcap.h
*
- * $Id: libpcap.h,v 1.11 2001/11/13 23:55:43 gram Exp $
+ * $Id: libpcap.h,v 1.12 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
#ifndef __W_LIBPCAP_H__
@@ -94,6 +93,6 @@ struct pcaprec_nokia_hdr {
int libpcap_open(wtap *wth, int *err);
gboolean libpcap_dump_open(wtap_dumper *wdh, int *err);
-int libpcap_dump_can_write_encap(int filetype, int encap);
+int libpcap_dump_can_write_encap(int encap);
#endif
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index cae0d77fb5..4a4143aa1a 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1,6 +1,6 @@
/* netmon.c
*
- * $Id: netmon.c,v 1.47 2002/02/08 10:07:40 guy Exp $
+ * $Id: netmon.c,v 1.48 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,8 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -542,7 +542,7 @@ static const int wtap_encap[] = {
/* Returns 0 if we could write the specified encapsulation type,
an error indication otherwise. */
-int netmon_dump_can_write_encap(int filetype, int encap)
+int netmon_dump_can_write_encap(int encap)
{
/* Per-packet encapsulations aren't supported. */
if (encap == WTAP_ENCAP_PER_PACKET)
diff --git a/wiretap/netmon.h b/wiretap/netmon.h
index d6c9b15a65..9c3611e71a 100644
--- a/wiretap/netmon.h
+++ b/wiretap/netmon.h
@@ -1,6 +1,6 @@
/* netmon.h
*
- * $Id: netmon.h,v 1.8 2001/11/13 23:55:43 gram Exp $
+ * $Id: netmon.h,v 1.9 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
#ifndef __NETMON_H__
@@ -26,6 +25,6 @@
int netmon_open(wtap *wth, int *err);
gboolean netmon_dump_open(wtap_dumper *wdh, int *err);
-int netmon_dump_can_write_encap(int filetype, int encap);
+int netmon_dump_can_write_encap(int encap);
#endif
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index 7f0f6fe1ba..21da9c4e86 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1,6 +1,6 @@
/* netxray.c
*
- * $Id: netxray.c,v 1.44 2002/02/08 10:07:40 guy Exp $
+ * $Id: netxray.c,v 1.45 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,8 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -340,7 +340,7 @@ static const int wtap_encap[] = {
/* Returns 0 if we could write the specified encapsulation type,
an error indication otherwise. */
-int netxray_dump_can_write_encap(int filetype, int encap)
+int netxray_dump_can_write_encap(int encap)
{
/* Per-packet encapsulations aren't supported. */
if (encap == WTAP_ENCAP_PER_PACKET)
diff --git a/wiretap/netxray.h b/wiretap/netxray.h
index 5087a31886..2254f243b5 100644
--- a/wiretap/netxray.h
+++ b/wiretap/netxray.h
@@ -1,6 +1,6 @@
/* netxray.h
*
- * $Id: netxray.h,v 1.6 2001/11/13 23:55:43 gram Exp $
+ * $Id: netxray.h,v 1.7 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
#ifndef __NETXRAY_H__
@@ -26,6 +25,6 @@
int netxray_open(wtap *wth, int *err);
gboolean netxray_dump_open_1_1(wtap_dumper *wdh, int *err);
-int netxray_dump_can_write_encap(int filetype, int encap);
+int netxray_dump_can_write_encap(int encap);
#endif
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index 9441be3789..47fbf73077 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -1,6 +1,6 @@
/* ngsniffer.c
*
- * $Id: ngsniffer.c,v 1.71 2002/02/08 10:07:40 guy Exp $
+ * $Id: ngsniffer.c,v 1.72 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
/* The code in ngsniffer.c that decodes the time fields for each packet in the
@@ -1133,7 +1132,7 @@ static const int wtap_encap[] = {
/* Returns 0 if we could write the specified encapsulation type,
an error indication otherwise. */
-int ngsniffer_dump_can_write_encap(int filetype, int encap)
+int ngsniffer_dump_can_write_encap(int encap)
{
/* Per-packet encapsulations aren't supported. */
if (encap == WTAP_ENCAP_PER_PACKET)
diff --git a/wiretap/ngsniffer.h b/wiretap/ngsniffer.h
index aeb54827e2..cde0011a30 100644
--- a/wiretap/ngsniffer.h
+++ b/wiretap/ngsniffer.h
@@ -1,6 +1,6 @@
/* ngsniffer.h
*
- * $Id: ngsniffer.h,v 1.9 2001/11/13 23:55:44 gram Exp $
+ * $Id: ngsniffer.h,v 1.10 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
#ifndef __NGSNIFFER_H__
@@ -26,6 +25,6 @@
int ngsniffer_open(wtap *wth, int *err);
gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err);
-int ngsniffer_dump_can_write_encap(int filetype, int encap);
+int ngsniffer_dump_can_write_encap(int encap);
#endif
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index 1738b713bf..751bc6c477 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -1,6 +1,6 @@
/* snoop.c
*
- * $Id: snoop.c,v 1.40 2002/02/08 10:07:41 guy Exp $
+ * $Id: snoop.c,v 1.41 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,8 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -504,7 +504,7 @@ static const int wtap_encap[] = {
/* Returns 0 if we could write the specified encapsulation type,
an error indication otherwise. */
-int snoop_dump_can_write_encap(int filetype, int encap)
+int snoop_dump_can_write_encap(int encap)
{
/* Per-packet encapsulations aren't supported. */
if (encap == WTAP_ENCAP_PER_PACKET)
diff --git a/wiretap/snoop.h b/wiretap/snoop.h
index 7bdf645723..405ede821f 100644
--- a/wiretap/snoop.h
+++ b/wiretap/snoop.h
@@ -1,6 +1,6 @@
/* snoop.h
*
- * $Id: snoop.h,v 1.9 2001/11/13 23:55:44 gram Exp $
+ * $Id: snoop.h,v 1.10 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
#ifndef __W_SNOOP_H__
@@ -26,6 +25,6 @@
int snoop_open(wtap *wth, int *err);
gboolean snoop_dump_open(wtap_dumper *wdh, int *err);
-int snoop_dump_can_write_encap(int filetype, int encap);
+int snoop_dump_can_write_encap(int encap);
#endif
diff --git a/wiretap/visual.c b/wiretap/visual.c
index 51d3858eab..5e2c286268 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -2,7 +2,7 @@
* File read and write routines for Visual Networks cap files.
* Copyright (c) 2001, Tom Nisbet tnisbet@visualnetworks.com
*
- * $Id: visual.c,v 1.1 2001/12/04 22:28:19 guy Exp $
+ * $Id: visual.c,v 1.2 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -220,7 +220,6 @@ static gboolean visual_read(wtap *wth, int *err, long *data_offset)
int bytes_read;
struct visual_pkt_hdr vpkt_hdr;
int phdr_size = sizeof(vpkt_hdr);
- int rec_offset;
time_t secs;
guint32 usecs;
double t;
@@ -376,7 +375,7 @@ static int visual_seek_read (wtap *wth, long seek_off,
/* Check for media types that may be written in Visual file format.
Returns 0 if the specified encapsulation type is supported,
an error indication otherwise. */
-int visual_dump_can_write_encap(int filetype, int encap)
+int visual_dump_can_write_encap(int encap)
{
/* Per-packet encapsulations aren't supported. */
if (encap == WTAP_ENCAP_PER_PACKET)
@@ -564,7 +563,6 @@ static gboolean visual_dump_close(wtap_dumper *wdh, int *err)
struct visual_file_hdr vfile_hdr;
const char *magicp;
size_t magic_size;
- struct tm *tm;
/* If the visual structure was never allocated then nothing useful
can be done. */
diff --git a/wiretap/visual.h b/wiretap/visual.h
index c77bcf63c9..7102664280 100644
--- a/wiretap/visual.h
+++ b/wiretap/visual.h
@@ -5,7 +5,7 @@
*
* Based on the code that handles netmon files.
*
- * $Id: visual.h,v 1.2 2001/12/05 21:42:42 guy Exp $
+ * $Id: visual.h,v 1.3 2002/02/27 08:57:25 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -30,6 +30,6 @@
int visual_open(wtap *wth, int *err);
gboolean visual_dump_open(wtap_dumper *wdh, int *err);
-int visual_dump_can_write_encap(int filetype, int encap);
+int visual_dump_can_write_encap(int encap);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 21:36:32 +0000