aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-04-29 08:20:18 +0000
committerGuy Harris <guy@alum.mit.edu>2002-04-29 08:20:18 +0000
commit9a80f0a5212d8ad6704cebefbaf091a473ab04a4 (patch)
tree53112d7b0bd3805cf4f0a1184361d95493a61129
parent30f02bc99cb3a578758c76cc6cb0c8278273e6be (diff)
Removal (or, at least, #ifdeffing out) of unused variables and
functions, from David Frascone. svn path=/trunk/; revision=5288
-rw-r--r--AUTHORS1
-rw-r--r--gtk/tcp_graph.c7
-rw-r--r--packet-afp.c5
-rw-r--r--packet-asap.c4
-rw-r--r--packet-beep.c4
-rw-r--r--packet-dcerpc-epm.c5
-rw-r--r--packet-dcerpc-lsa.c4
-rw-r--r--packet-dcerpc-netlogon.c15
-rw-r--r--packet-dcerpc-samr.c14
-rw-r--r--packet-dcerpc-spoolss.c44
-rw-r--r--packet-dcerpc.c8
-rw-r--r--packet-diameter.c4
-rw-r--r--packet-eapol.c3
-rw-r--r--packet-gtp.c32
-rw-r--r--packet-iapp.c4
-rw-r--r--packet-iscsi.c5
-rw-r--r--packet-ldp.c7
-rw-r--r--packet-lmp.c7
-rw-r--r--packet-mip.c4
-rw-r--r--packet-ndmp.c4
-rw-r--r--packet-pgm.c4
-rw-r--r--packet-slimp3.c9
-rw-r--r--packet-smb-pipe.c6
-rw-r--r--packet-smb.c12
24 files changed, 109 insertions, 103 deletions
diff --git a/AUTHORS b/AUTHORS
index 77dbcb1f38..4e95e7dcc7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -440,6 +440,7 @@ David Frascone <dave[AT]frascone.com> {
DIAMETER
Bug fixes and enhancements to Mobile IP
Support for Mobile IP's use of ICMP Router Advertisements
+ Removal of unused variables and functions
}
Peter Kjellerstedt <pkj[AT]axis.com> {
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 33f56bb610..ffb201e4c2 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.c,v 1.17 2002/03/05 12:03:27 guy Exp $
+ * $Id: tcp_graph.c,v 1.18 2002/04/29 08:20:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -388,8 +388,10 @@ int debugging = 0;
/*int debugging = DBS_TPUT_ELMTS;*/
static void create_gui (struct graph * );
+#if 0
static void create_text_widget (struct graph * );
static void display_text (struct graph * );
+#endif
static void create_drawing_area (struct graph * );
static void control_panel_create (struct graph * );
static GtkWidget *control_panel_create_zoom_group (struct graph * );
@@ -573,6 +575,7 @@ static void create_gui (struct graph *g)
create_drawing_area(g);
}
+#if 0
static void create_text_widget (struct graph *g)
{
GtkWidget *streamwindow, *txt_scrollw, *box;
@@ -601,7 +604,6 @@ static void create_text_widget (struct graph *g)
gtk_widget_show (g->text);
gtk_widget_show (streamwindow);
}
-
static void display_text (struct graph *g)
{
char *line[256];
@@ -663,6 +665,7 @@ static void display_text (struct graph *g)
}
gtk_text_thaw (GTK_TEXT (g->text));
}
+#endif
static void create_drawing_area (struct graph *g)
{
diff --git a/packet-afp.c b/packet-afp.c
index 2158959b7c..67c4841e8c 100644
--- a/packet-afp.c
+++ b/packet-afp.c
@@ -2,7 +2,7 @@
* Routines for afp packet dissection
* Copyright 2002, Didier Gautheron <dgautheron@magic.fr>
*
- * $Id: packet-afp.c,v 1.9 2002/04/28 23:47:44 guy Exp $
+ * $Id: packet-afp.c,v 1.10 2002/04/29 08:20:05 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -257,7 +257,9 @@ static gint ett_afp_path_name = -1;
static gint ett_afp_lock_flags = -1;
static gint ett_afp_dir_ar = -1;
+#ifdef AFP_UNUSED_HANDLES
static dissector_handle_t afp_handle;
+#endif
static dissector_handle_t data_handle;
static const value_string vol_signature_vals[] = {
@@ -827,7 +829,6 @@ parse_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap,
{
guint16 lnameoff = 0;
guint16 snameoff = 0;
- guint16 unameoff = 0;
gint max_offset = 0;
gint org_offset = offset;
diff --git a/packet-asap.c b/packet-asap.c
index 834d104088..cd4e7c7f93 100644
--- a/packet-asap.c
+++ b/packet-asap.c
@@ -5,7 +5,7 @@
*
* Copyright 2002, Michael Tuexen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-asap.c,v 1.1 2002/04/15 21:47:59 guy Exp $
+ * $Id: packet-asap.c,v 1.2 2002/04/29 08:20:05 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,7 +41,9 @@ static int proto_asap = -1;
static int hf_asap_message_type = -1;
static int hf_asap_message_flags = -1;
static int hf_asap_message_length = -1;
+#ifdef ASAP_UNUSED_HANDLES
static int hf_asap_message_value = -1;
+#endif
static int hf_asap_parameter_type = -1;
static int hf_asap_parameter_length = -1;
static int hf_asap_parameter_value = -1;
diff --git a/packet-beep.c b/packet-beep.c
index a53d68f552..3f20098cb5 100644
--- a/packet-beep.c
+++ b/packet-beep.c
@@ -1,7 +1,7 @@
/* packet-beep.c
* Routines for BEEP packet disassembly
*
- * $Id: packet-beep.c,v 1.6 2002/04/08 02:13:36 guy Exp $
+ * $Id: packet-beep.c,v 1.7 2002/04/29 08:20:05 guy Exp $
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
* Modified 2001 Darren New <dnew@invisible.net> for BEEP.
@@ -279,6 +279,7 @@ dissect_beep_more(tvbuff_t *tvb, int offset,
}
+#if 0
static void dissect_beep_status(tvbuff_t *tvb, int offset,
proto_tree *tree)
{
@@ -312,6 +313,7 @@ static void dissect_beep_status(tvbuff_t *tvb, int offset,
}
}
+#endif
static int num_len(tvbuff_t *tvb, int offset)
{
diff --git a/packet-dcerpc-epm.c b/packet-dcerpc-epm.c
index b198363bff..f3fc95c281 100644
--- a/packet-dcerpc-epm.c
+++ b/packet-dcerpc-epm.c
@@ -2,7 +2,7 @@
* Routines for dcerpc endpoint mapper dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-epm.c,v 1.4 2002/01/21 07:36:33 guy Exp $
+ * $Id: packet-dcerpc-epm.c,v 1.5 2002/04/29 08:20:06 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -103,9 +103,6 @@ epm_dissect_ept_lookup_resp (tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
- guint32 dummy;
-
-
offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep,
hf_epm_lookup_hnd, NULL);
diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c
index 97c3fd5833..0b6a1c7702 100644
--- a/packet-dcerpc-lsa.c
+++ b/packet-dcerpc-lsa.c
@@ -3,7 +3,7 @@
* Copyright 2001, Tim Potter <tpot@samba.org>
* 2002 Added LSA command dissectors Ronnie Sahlberg
*
- * $Id: packet-dcerpc-lsa.c,v 1.31 2002/04/29 06:23:03 sahlberg Exp $
+ * $Id: packet-dcerpc-lsa.c,v 1.32 2002/04/29 08:20:06 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -116,7 +116,9 @@ static int hf_lsa_unknown_long = -1;
static int hf_lsa_unknown_short = -1;
static int hf_lsa_unknown_char = -1;
static int hf_lsa_unknown_string = -1;
+#ifdef LSA_UNUSED_HANDLES
static int hf_lsa_unknown_time = -1;
+#endif
static gint ett_dcerpc_lsa = -1;
diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c
index 63df99b2aa..a12483ae2c 100644
--- a/packet-dcerpc-netlogon.c
+++ b/packet-dcerpc-netlogon.c
@@ -3,7 +3,7 @@
* Copyright 2001, Tim Potter <tpot@samba.org>
* 2002 structure and command dissectors by Ronnie Sahlberg
*
- * $Id: packet-dcerpc-netlogon.c,v 1.17 2002/04/20 07:15:19 tpot Exp $
+ * $Id: packet-dcerpc-netlogon.c,v 1.18 2002/04/29 08:20:06 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -402,7 +402,7 @@ netlogon_dissect_TYPE_2(tvbuff_t *tvb, int offset,
proto_item_set_len(item, offset-old_offset);
return offset;
}
-
+#if 0
static int
netlogon_dissect_CYPHER_BLOCK(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *parent_tree,
@@ -410,7 +410,6 @@ netlogon_dissect_CYPHER_BLOCK(tvbuff_t *tvb, int offset,
{
proto_item *item=NULL;
proto_tree *tree=NULL;
- int i;
dcerpc_info *di;
di=pinfo->private_data;
@@ -431,6 +430,7 @@ netlogon_dissect_CYPHER_BLOCK(tvbuff_t *tvb, int offset,
return offset;
}
+#endif
static int
netlogon_dissect_8_unknown_bytes(tvbuff_t *tvb, int offset,
@@ -439,7 +439,6 @@ netlogon_dissect_8_unknown_bytes(tvbuff_t *tvb, int offset,
{
proto_item *item=NULL;
proto_tree *tree=NULL;
- int i;
dcerpc_info *di;
di=pinfo->private_data;
@@ -466,7 +465,6 @@ netlogon_dissect_NETLOGON_CREDENTIAL(tvbuff_t *tvb, int offset,
{
proto_item *item=NULL;
proto_tree *tree=NULL;
- int i;
dcerpc_info *di;
di=pinfo->private_data;
@@ -633,7 +631,6 @@ netlogon_dissect_NETLOGON_LOGON_IDENTITY_INFO(tvbuff_t *tvb, int offset,
{
proto_item *item=NULL;
proto_tree *tree=NULL;
- int old_offset=offset;
if(parent_tree){
item = proto_tree_add_text(parent_tree, tvb, offset, 0,
@@ -729,7 +726,6 @@ netlogon_dissect_GROUP_MEMBERSHIP(tvbuff_t *tvb, int offset,
{
proto_item *item=NULL;
proto_tree *tree=NULL;
- int old_offset=offset;
if(parent_tree){
item = proto_tree_add_text(parent_tree, tvb, offset, 0,
@@ -1678,7 +1674,7 @@ netlogon_dissect_TYPE_31(tvbuff_t *tvb, int offset,
return offset;
}
-
+#if 0
static int
netlogon_dissect_TYPE_32(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *parent_tree,
@@ -1700,7 +1696,7 @@ netlogon_dissect_TYPE_32(tvbuff_t *tvb, int offset,
proto_item_set_len(item, offset-old_offset);
return offset;
}
-
+#endif
static int
netlogon_dissect_attrs(tvbuff_t *tvb, int offset,
@@ -2278,7 +2274,6 @@ netlogon_dissect_BLOB(tvbuff_t *tvb, int offset,
{
proto_item *item=NULL;
proto_tree *tree=NULL;
- int old_offset=offset;
if(parent_tree){
item = proto_tree_add_text(parent_tree, tvb, offset, 0,
diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c
index 870163c673..3b116dd31a 100644
--- a/packet-dcerpc-samr.c
+++ b/packet-dcerpc-samr.c
@@ -3,7 +3,7 @@
* Copyright 2001, Tim Potter <tpot@samba.org>
* 2002 Added all command dissectors Ronnie Sahlberg
*
- * $Id: packet-dcerpc-samr.c,v 1.34 2002/04/22 02:04:37 guy Exp $
+ * $Id: packet-dcerpc-samr.c,v 1.35 2002/04/29 08:20:06 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -182,7 +182,9 @@ static gint ett_samr_rids = -1;
static gint ett_nt_acct_ctrl = -1;
static gint ett_samr_sid_and_attributes_array = -1;
static gint ett_samr_sid_and_attributes = -1;
+#ifdef SAMR_UNUSED_HANDLES
static gint ett_samr_hnd = -1;
+#endif
static e_uuid_t uuid_dcerpc_samr = {
0x12345778, 0x1234, 0xabcd,
@@ -846,7 +848,6 @@ samr_dissect_PASSWORD_INFO(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *parent_tree,
char *drep)
{
- guint32 count;
proto_item *item=NULL;
proto_tree *tree=NULL;
int old_offset=offset;
@@ -1064,6 +1065,7 @@ samr_dissect_USER_GROUP_ARRAY_ptr(tvbuff_t *tvb, int offset,
return offset;
}
+#if 0
static int
samr_dissect_get_user_groups_rqst(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
@@ -1077,6 +1079,7 @@ samr_dissect_get_user_groups_rqst(tvbuff_t *tvb, int offset,
return offset;
}
+#endif
static int
samr_dissect_get_groups_for_user_rqst(tvbuff_t *tvb, int offset,
@@ -1146,7 +1149,7 @@ samr_dissect_open_domain_reply(tvbuff_t *tvb, int offset,
return offset;
}
-
+#if 0
static int
samr_dissect_context_handle_SID(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
@@ -1160,6 +1163,7 @@ samr_dissect_context_handle_SID(tvbuff_t *tvb, int offset,
"SID", -1, 0);
return offset;
}
+#endif
static int
samr_dissect_add_member_to_group_rqst(tvbuff_t *tvb, int offset,
@@ -2299,7 +2303,6 @@ dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset,
{
proto_item *item=NULL;
proto_tree *tree=NULL;
- int old_offset=offset;
if(parent_tree){
item = proto_tree_add_text(parent_tree, tvb, offset, 0,
@@ -2346,7 +2349,6 @@ samr_dissect_index(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
- int old_offset=offset;
dcerpc_info *di;
di=pinfo->private_data;
@@ -2436,6 +2438,7 @@ samr_dissect_get_alias_membership_rqst(tvbuff_t *tvb, int offset,
return offset;
}
+#if 0
static int
samr_dissect_get_alias_membership_response(tvbuff_t *tvb, int offset,
packet_info *pinfo,
@@ -2449,6 +2452,7 @@ samr_dissect_get_alias_membership_response(tvbuff_t *tvb, int offset,
return offset;
}
+#endif
static int
samr_dissect_get_alias_membership_reply(tvbuff_t *tvb, int offset,
diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c
index 52e0228f77..26fe759c2f 100644
--- a/packet-dcerpc-spoolss.c
+++ b/packet-dcerpc-spoolss.c
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\spoolss packet disassembly
* Copyright 2001-2002, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-spoolss.c,v 1.20 2002/04/24 03:08:49 tpot Exp $
+ * $Id: packet-dcerpc-spoolss.c,v 1.21 2002/04/29 08:20:07 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -398,7 +398,6 @@ static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
guint32 size, type;
/* Update information fields */
@@ -592,7 +591,6 @@ static int SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
/* Update informational fields */
@@ -622,7 +620,6 @@ static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
char *key_name, *value_name;
guint32 type, max_len;
const guint8 *policy_hnd;
@@ -680,7 +677,6 @@ static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
/* Update informational fields */
@@ -705,7 +701,7 @@ static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset,
static int prs_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, void **data, char *name)
{
- gint len = 0, remaining, i;
+ gint len = 0, remaining;
char *text;
offset = prs_align(offset, 2);
@@ -740,7 +736,6 @@ static int prs_DEVMODE(tvbuff_t *tvb, int offset, packet_info *pinfo,
{
proto_item *item;
proto_tree *subtree;
- guint32 ptr = 0;
guint16 extra;
item = proto_tree_add_text(tree, tvb, offset, 0, "DEVMODE");
@@ -816,9 +811,7 @@ static int prs_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_item *item;
proto_tree *subtree;
guint32 relstr_offset, relstr_start, relstr_end;
- guint16 *ptr;
char *text = strdup("NULL");
- gint len = 0, remaining, i;
offset = prs_uint32(tvb, offset, pinfo, tree, &relstr_offset, NULL);
@@ -1194,7 +1187,6 @@ static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- char *printer_name;
guint32 ptr = 0;
/* Update informational fields */
@@ -1246,7 +1238,6 @@ static int SpoolssOpenPrinterEx_r(tvbuff_t *tvb, int offset,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
guint32 status;
const guint8 *policy_hnd;
@@ -1361,7 +1352,7 @@ static int prs_NOTIFY_OPTION_CTR(tvbuff_t *tvb, int offset,
GList *child_dp_list = NULL;
proto_item *item;
proto_tree *subtree;
- guint32 count, i, ptr;
+ guint32 count, i;
item = proto_tree_add_text(tree, tvb, offset, 0,
"NOTIFY_OPTION_CTR");
@@ -1510,7 +1501,7 @@ static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- guint32 ptr = 0, type;
+ guint32 type;
/* Update informational fields */
@@ -1548,7 +1539,6 @@ static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
const guint8 *policy_hnd;
/* Update informational fields */
@@ -1593,7 +1583,7 @@ static int prs_BUFFER_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo,
{
proto_item *item, *subitem;
proto_tree *subtree, *subsubtree;
- guint32 ptr = 0, size;
+ guint32 size;
int data8_offset;
item = proto_tree_add_text(tree, tvb, offset, 0, "BUFFER_DATA");
@@ -1663,7 +1653,6 @@ static int SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
guint32 level;
const guint8 *policy_hnd;
@@ -1781,7 +1770,7 @@ static int prs_SPOOL_PRINTER_INFO_LEVEL(tvbuff_t *tvb, int offset,
{
proto_item *item;
proto_tree *subtree;
- guint32 ptr = 0, level;
+ guint32 level;
item = proto_tree_add_text(tree, tvb, offset, 0,
"SPOOL_PRINTER_INFO_LEVEL");
@@ -1807,7 +1796,6 @@ static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
guint32 level;
const guint8 *policy_hnd;
@@ -1852,7 +1840,6 @@ static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
/* Update informational fields */
@@ -1934,7 +1921,6 @@ static int SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- GList *dp_list = NULL;
guint32 level;
const guint8 *policy_hnd;
@@ -1976,7 +1962,6 @@ static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 count;
- GList *dp_list = NULL;
struct BUFFER_DATA *bd = NULL;
void **data_list;
@@ -2101,7 +2086,7 @@ static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset,
/*
* AddPrinterEx
*/
-
+#if 0
static int SpoolssAddPrinterEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
@@ -2151,7 +2136,7 @@ static int SpoolssAddPrinterEx_q(tvbuff_t *tvb, int offset,
return offset;
}
-
+#endif
static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
@@ -2376,7 +2361,7 @@ static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
/*
* AddPrinterDriver
*/
-
+#if 0
static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
@@ -2399,7 +2384,7 @@ static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset,
return offset;
}
-
+#endif
static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
@@ -2694,7 +2679,6 @@ static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- proto_item *info_item;
/* Update informational fields */
@@ -2856,13 +2840,12 @@ static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
*/
static gint ett_JOB_INFO_1;
-
+#if 0
static int prs_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
- guint32 level;
item = proto_tree_add_text(tree, tvb, offset, 0, "JOB_INFO_1");
@@ -2870,19 +2853,19 @@ static int prs_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
return offset;
}
+#endif
/*
* JOB_INFO_2
*/
static gint ett_JOB_INFO_2;
-
+#if 0
static int prs_JOB_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
- guint32 level;
item = proto_tree_add_text(tree, tvb, offset, 0, "JOB_INFO_2");
@@ -2890,6 +2873,7 @@ static int prs_JOB_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo,
return offset;
}
+#endif
/*
* EnumJobs
diff --git a/packet-dcerpc.c b/packet-dcerpc.c
index 72139b50f6..34494d1546 100644
--- a/packet-dcerpc.c
+++ b/packet-dcerpc.c
@@ -2,7 +2,7 @@
* Routines for DCERPC packet disassembly
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc.c,v 1.44 2002/04/22 09:43:03 guy Exp $
+ * $Id: packet-dcerpc.c,v 1.45 2002/04/29 08:20:07 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -490,7 +490,7 @@ dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
dcerpc_dissect_fnct_t *fnct)
{
- guint32 i, count;
+ guint32 i;
dcerpc_info *di;
di=pinfo->private_data;
@@ -519,7 +519,7 @@ dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree *tree, char *drep,
dcerpc_dissect_fnct_t *fnct)
{
- guint32 i, count;
+ guint32 i;
dcerpc_info *di;
di=pinfo->private_data;
@@ -775,7 +775,6 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
/*TOP LEVEL UNIQUE POINTER*/
if( pointers_are_top_level
&& (type==NDR_POINTER_UNIQUE) ){
- int idx;
guint32 id;
proto_item *item;
proto_tree *tr;
@@ -821,7 +820,6 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
/*EMBEDDED UNIQUE POINTER*/
if( (!pointers_are_top_level)
&& (type==NDR_POINTER_UNIQUE) ){
- int idx;
guint32 id;
proto_item *item;
proto_tree *tr;
diff --git a/packet-diameter.c b/packet-diameter.c
index e88bcab2b4..872c92f4e0 100644
--- a/packet-diameter.c
+++ b/packet-diameter.c
@@ -1,7 +1,7 @@
/* packet-diameter.c
* Routines for Diameter packet disassembly
*
- * $Id: packet-diameter.c,v 1.45 2002/03/05 00:24:24 guy Exp $
+ * $Id: packet-diameter.c,v 1.46 2002/04/29 08:20:07 guy Exp $
*
* Copyright (c) 2001 by David Frascone <dave@frascone.com>
*
@@ -174,7 +174,6 @@ static int hf_diameter_length = -1;
static int hf_diameter_code = -1;
static int hf_diameter_hopbyhopid =-1;
static int hf_diameter_endtoendid =-1;
-static int hf_diameter_reserved = -1;
static int hf_diameter_version = -1;
static int hf_diameter_vendor_id = -1;
static int hf_diameter_flags = -1;
@@ -189,7 +188,6 @@ static int hf_diameter_flags_reserved7 = -1;
static int hf_diameter_avp_code = -1;
static int hf_diameter_avp_length = -1;
-static int hf_diameter_avp_reserved = -1;
static int hf_diameter_avp_flags = -1;
static int hf_diameter_avp_flags_vendor_specific = -1;
static int hf_diameter_avp_flags_mandatory = -1;
diff --git a/packet-eapol.c b/packet-eapol.c
index bfd971aebe..04fb53040d 100644
--- a/packet-eapol.c
+++ b/packet-eapol.c
@@ -3,7 +3,7 @@
* (From IEEE Draft P802.1X/D11; is there a later draft, or a
* final standard? If so, check it.)
*
- * $Id: packet-eapol.c,v 1.9 2002/03/11 08:47:46 guy Exp $
+ * $Id: packet-eapol.c,v 1.10 2002/04/29 08:20:07 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -91,7 +91,6 @@ static void
dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
int offset = 0;
- guint8 eapol_ver;
guint8 eapol_type;
guint16 eapol_len;
guint len;
diff --git a/packet-gtp.c b/packet-gtp.c
index 00f5bbb12c..29153428b1 100644
--- a/packet-gtp.c
+++ b/packet-gtp.c
@@ -4,7 +4,7 @@
* Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
* Nicolas Balkota <balkota@mac.com>
*
- * $Id: packet-gtp.c,v 1.25 2002/04/08 20:30:52 gram Exp $
+ * $Id: packet-gtp.c,v 1.26 2002/04/29 08:20:07 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -83,19 +83,25 @@ static int hf_gtpv0_flags = -1;
static int hf_gtpv0_flags_ver = -1;
static int hf_gtpv0_flags_pt = -1;
static int hf_gtpv0_flags_spare = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv0_flags_e = -1;
static int hf_gtpv0_flags_s = -1;
static int hf_gtpv0_flags_pn = -1;
+#endif
static int hf_gtpv0_flags_snn = -1;
static int hf_gtpv0_message_type = -1;
static int hf_gtpv0_length = -1;
static int hf_gtpv0_seq_number = -1;
static int hf_gtpv0_flow_label = -1;
static int hf_gtpv0_sndcp_number = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv0_npdu_number = -1;
+#endif
static int hf_gtpv0_tid = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv0_teid = -1;
static int hf_gtpv0_next = -1;
+#endif
static int hf_gtpv0_cause = -1;
static int hf_gtpv0_imsi = -1;
static int hf_gtpv0_rai_mcc = -1;
@@ -119,13 +125,20 @@ static int hf_gtpv0_ms_valid = -1;
static int hf_gtpv0_recovery = -1;
static int hf_gtpv0_sel_mode = -1;
static int hf_gtpv0_ext_flow_label = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv0_teid_data = -1; /* 3G */
+#endif
static int hf_gtpv0_flow_sig = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv0_teid_cp = -1; /* 3G */
+#endif
static int hf_gtpv0_nsapi = -1;
static int hf_gtpv0_flow_ii = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv0_teid_ii = -1; /* 3G */
+#endif
static int hf_gtpv0_ms_reason = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv0_tear_ind = -1; /* 3G */
static int hf_gtpv0_ranap_cause = -1; /* 3G */
static int hf_gtpv0_rab_gtpu_dn = -1; /* 3G */
@@ -145,6 +158,7 @@ static int hf_gtpv0_chrg_char_h = -1; /* 3G */
static int hf_gtpv0_chrg_char_r = -1; /* 3G */
static int hf_gtpv0_trace_ref = -1; /* 3G */
static int hf_gtpv0_trace_type = -1; /* 3G */
+#endif
static int hf_gtpv0_tr_comm = -1; /* charging */
static int hf_gtpv0_chrg_id = -1;
static int hf_gtpv0_user_ipv4 = -1;
@@ -157,6 +171,7 @@ static int hf_gtpv0_gsn_ipv6 = -1;
static int hf_gtpv0_gsn_addr_type = -1;
static int hf_gtpv0_gsn_addr_len = -1;
static int hf_gtpv0_msisdn = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv0_qos_al_ret_priority = -1;
static int hf_gtpv0_qos_traf_class = -1;
static int hf_gtpv0_qos_del_order = -1;
@@ -172,6 +187,7 @@ static int hf_gtpv0_qos_guar_ul = -1;
static int hf_gtpv0_qos_guar_dl = -1;
static int hf_gtpv0_rnc_ipv4 = -1;
static int hf_gtpv0_rnc_ipv6 = -1;
+#endif
static int hf_gtpv0_chrg_ipv4 = -1;
static int hf_gtpv0_chrg_ipv6 = -1;
static int hf_gtpv0_node_ipv4 = -1;
@@ -187,14 +203,20 @@ static int hf_gtpv1_flags_spare = -1;
static int hf_gtpv1_flags_e = -1;
static int hf_gtpv1_flags_s = -1;
static int hf_gtpv1_flags_pn = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv1_flags_snn = -1;
+#endif
static int hf_gtpv1_message_type = -1;
static int hf_gtpv1_length = -1;
static int hf_gtpv1_seq_number = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv1_flow_label = -1;
static int hf_gtpv1_sndcp_number = -1;
+#endif
static int hf_gtpv1_npdu_number = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv1_tid = -1;
+#endif
static int hf_gtpv1_teid = -1;
static int hf_gtpv1_next = -1;
static int hf_gtpv1_cause = -1;
@@ -219,12 +241,18 @@ static int hf_gtpv1_ptmsi_sig = -1;
static int hf_gtpv1_ms_valid = -1;
static int hf_gtpv1_recovery = -1;
static int hf_gtpv1_sel_mode = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv1_ext_flow_label = -1;
+#endif
static int hf_gtpv1_teid_data = -1; /* 3G */
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv1_flow_sig = -1;
+#endif
static int hf_gtpv1_teid_cp = -1; /* 3G */
static int hf_gtpv1_nsapi = -1;
+#ifdef GTP_UNUSED_HANDLES
static int hf_gtpv1_flow_ii = -1;
+#endif
static int hf_gtpv1_teid_ii = -1; /* 3G */
static int hf_gtpv1_ms_reason = -1;
static int hf_gtpv1_tear_ind = -1; /* 3G */
@@ -4809,7 +4837,7 @@ dissect_gtpv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
proto_item *ti, *tf;
proto_tree *gtpv1_tree, *flags_tree;
guint16 seq_no;
- guint8 ext_hdr_val, i, hdr_offset = 4, next_hdr, npdu_no, probe;
+ guint8 ext_hdr_val, i, hdr_offset = 4, next_hdr, npdu_no;
tvbuff_t *next_tvb;
int offset, length, mandatory, checked_field;
diff --git a/packet-iapp.c b/packet-iapp.c
index f720cb5c29..5052dc9c20 100644
--- a/packet-iapp.c
+++ b/packet-iapp.c
@@ -2,7 +2,7 @@
* Routines for IAPP dissection
* Copyright 2002, Alfred Arnold <aarnold@elsa.de>
*
- * $Id: packet-iapp.c,v 1.1 2002/02/02 12:04:22 guy Exp $
+ * $Id: packet-iapp.c,v 1.2 2002/04/29 08:20:08 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -259,9 +259,7 @@ static gchar*
authval_to_str(int type, int len, tvbuff_t *tvb, int offset)
{
gchar *run;
- const guint8 *mac;
int z, val;
- gchar *strval;
run = textbuffer;
run += sprintf(run, "Value: ");
diff --git a/packet-iscsi.c b/packet-iscsi.c
index 892afa423d..3a9445aa0c 100644
--- a/packet-iscsi.c
+++ b/packet-iscsi.c
@@ -7,7 +7,7 @@
* draft-ietf-ips-iscsi-09.txt by defining DRAFT09
* draft-ietf-ips-iscsi-08.txt by defining DRAFT08
*
- * $Id: packet-iscsi.c,v 1.29 2002/04/04 23:24:09 guy Exp $
+ * $Id: packet-iscsi.c,v 1.30 2002/04/29 08:20:08 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -155,7 +155,9 @@ static int hf_iscsi_Login_X = -1;
static int hf_iscsi_Login_T = -1;
static int hf_iscsi_Login_CSG = -1;
static int hf_iscsi_Login_NSG = -1;
+#ifdef ISCSI_UNUSED_HANDLES
static int hf_iscsi_Login_Stage = -1;
+#endif
static int hf_iscsi_Login_Status = -1;
static int hf_iscsi_KeyValue = -1;
static int hf_iscsi_Text_F = -1;
@@ -721,7 +723,6 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
guint original_offset = offset;
proto_tree *ti = NULL;
- char *scsi_command_name = NULL;
guint8 scsi_status = 0;
guint cdb_offset = offset + 32; /* offset of CDB from start of PDU */
guint end_offset = offset + tvb_length_remaining(tvb, offset);
diff --git a/packet-ldp.c b/packet-ldp.c
index fb11ce7bdb..3fb6db918c 100644
--- a/packet-ldp.c
+++ b/packet-ldp.c
@@ -1,7 +1,7 @@
/* packet-ldp.c
* Routines for LDP (RFC 3036) packet disassembly
*
- * $Id: packet-ldp.c,v 1.37 2002/04/28 00:18:50 guy Exp $
+ * $Id: packet-ldp.c,v 1.38 2002/04/29 08:20:08 guy Exp $
*
* Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
@@ -1047,7 +1047,10 @@ dissect_tlv_returned_message(tvbuff_t *tvb, guint offset, proto_tree *tree, int
static void
dissect_tlv_common_hello_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem)
{
- proto_tree *ti = NULL, *val_tree = NULL;
+#if 0
+ proto_tree *ti = NULL;
+#endif
+ proto_tree *val_tree = NULL;
if (tree) {
#if 0
diff --git a/packet-lmp.c b/packet-lmp.c
index 490425f9e5..beb3ea8ffa 100644
--- a/packet-lmp.c
+++ b/packet-lmp.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-lmp.c,v 1.4 2002/04/25 06:34:41 guy Exp $
+ * $Id: packet-lmp.c,v 1.5 2002/04/29 08:20:09 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -762,13 +762,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 message_type;
guint16 cksum, computed_cksum;
vec_t cksum_vec[1];
- int i, j, k, l, len;
+ int j, k, l, len;
int msg_length;
int obj_length;
int mylen;
int offset2;
- char *objtype;
- int session_off, tempfilt_off;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LMP");
@@ -1412,7 +1410,6 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
default :
- default_class:
proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
"Data (%d bytes)", mylen);
break;
diff --git a/packet-mip.c b/packet-mip.c
index fee40ead6a..51ba305722 100644
--- a/packet-mip.c
+++ b/packet-mip.c
@@ -2,7 +2,7 @@
* Routines for Mobile IP dissection
* Copyright 2000, Stefan Raab <sraab@cisco.com>
*
- * $Id: packet-mip.c,v 1.27 2002/01/24 09:20:49 guy Exp $
+ * $Id: packet-mip.c,v 1.28 2002/04/29 08:20:09 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -275,8 +275,6 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 flags;
nstime_t ident_time;
size_t offset=0;
- tvbuff_t *extensions_tvb;
- size_t dataRemaining;
/* Make entries in Protocol column and Info column on summary display */
diff --git a/packet-ndmp.c b/packet-ndmp.c
index 6e251a4888..f8f5af6d8a 100644
--- a/packet-ndmp.c
+++ b/packet-ndmp.c
@@ -2,7 +2,7 @@
* Routines for NDMP dissection
* 2001 Ronnie Sahlberg (see AUTHORS for email)
*
- * $Id: packet-ndmp.c,v 1.17 2002/04/03 13:24:12 girlich Exp $
+ * $Id: packet-ndmp.c,v 1.18 2002/04/29 08:20:09 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2686,8 +2686,6 @@ dissect_ndmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
int offset = 0;
int len;
- proto_item *ndmp_item = NULL;
- proto_tree *ndmp_tree = NULL;
while (tvb_reported_length_remaining(tvb, offset) != 0) {
/*
diff --git a/packet-pgm.c b/packet-pgm.c
index dc5eb5c3f2..b41fdb4064 100644
--- a/packet-pgm.c
+++ b/packet-pgm.c
@@ -1,7 +1,7 @@
/* packet-pgm.c
* Routines for pgm packet disassembly
*
- * $Id: packet-pgm.c,v 1.15 2002/04/14 23:04:03 guy Exp $
+ * $Id: packet-pgm.c,v 1.16 2002/04/29 08:20:09 guy Exp $
*
* Copyright (c) 2000 by Talarian Corp
*
@@ -343,11 +343,13 @@ static int hf_pgm_opt_parity_prm_prmtgsz = -1;
static int hf_pgm_opt_parity_grp_res = -1;
static int hf_pgm_opt_parity_grp_prmgrp = -1;
+#ifdef PGM_UNUSED_HANDLES
static int hf_pgm_opt_curr_tgsize_type = -1;
static int hf_pgm_opt_curr_tgsize_len = -1;
static int hf_pgm_opt_curr_tgsize_opx = -1;
static int hf_pgm_opt_curr_tgsize_res = -1;
static int hf_pgm_opt_curr_tgsize_prmatgsz = -1;
+#endif
static int hf_pgm_opt_nak_res = -1;
static int hf_pgm_opt_nak_list = -1;
diff --git a/packet-slimp3.c b/packet-slimp3.c
index c8fc22ff8c..41ad92f993 100644
--- a/packet-slimp3.c
+++ b/packet-slimp3.c
@@ -6,7 +6,7 @@
* Adds support for the data packet protocol for the SliMP3
* See www.slimdevices.com for details.
*
- * $Id: packet-slimp3.c,v 1.4 2002/02/02 02:59:23 guy Exp $
+ * $Id: packet-slimp3.c,v 1.5 2002/04/29 08:20:09 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -171,15 +171,10 @@ static void
dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *slimp3_tree = NULL;
- proto_tree *el_tree = NULL;
proto_item *ti = NULL;
- conversation_t *conversation;
gint i1;
gint offset = 0;
guint16 opcode;
- guint16 error;
- guint32 i;
- guint8 subcode;
char addc_str[101];
char *addc_strp;
@@ -455,7 +450,6 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case SLIMP3_DISC_RSP:
if (tree) {
- guint8 fw_ver;
proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_discover_response,
tvb, offset, 1, FALSE);
proto_tree_add_text(slimp3_tree, tvb, offset+2, 4,
@@ -466,7 +460,6 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- guint8 fw_ver = tvb_get_guint8(tvb, offset+2);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Server Address: %s. Server Port: %d",
ip_to_str(tvb_get_ptr(tvb, offset+2, 4)),
tvb_get_ntohs(tvb, offset + 6));
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c
index 5cc1020465..41335ce7f1 100644
--- a/packet-smb-pipe.c
+++ b/packet-smb-pipe.c
@@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
* significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
* Guy Harris 2001
*
- * $Id: packet-smb-pipe.c,v 1.72 2002/03/27 04:27:03 guy Exp $
+ * $Id: packet-smb-pipe.c,v 1.73 2002/04/29 08:20:10 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1097,6 +1097,8 @@ static const item_t lm_data_req_samoemchangepassword[] = {
/*
* Create a subtree for an entry we don't yet know how to dissect.
*/
+
+#if 0
static proto_item *
unknown_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
int offset)
@@ -1107,6 +1109,7 @@ unknown_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} else
return NULL;
}
+#endif
#define API_NetShareEnum 0
#define API_NetShareGetInfo 1
@@ -1951,7 +1954,6 @@ dissect_transact_data(tvbuff_t *tvb, int offset, int convert,
int cptr;
const char *string;
gint string_len;
- const guint8 *bytes;
if (aux_count_p != NULL)
*aux_count_p = 0;
diff --git a/packet-smb.c b/packet-smb.c
index fd5d74623c..22e714a624 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -3,7 +3,7 @@
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* 2001 Rewrite by Ronnie Sahlberg and Guy Harris
*
- * $Id: packet-smb.c,v 1.251 2002/04/28 01:19:27 guy Exp $
+ * $Id: packet-smb.c,v 1.252 2002/04/29 08:20:10 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -323,7 +323,9 @@ static int hf_smb_nt_ioctl_function_code = -1;
static int hf_smb_nt_ioctl_isfsctl = -1;
static int hf_smb_nt_ioctl_flags_root_handle = -1;
static int hf_smb_nt_ioctl_data = -1;
+#ifdef SMB_UNUSED_HANDLES
static int hf_smb_nt_security_information = -1;
+#endif
static int hf_smb_nt_notify_action = -1;
static int hf_smb_nt_notify_watch_tree = -1;
static int hf_smb_nt_notify_stream_write = -1;
@@ -6633,14 +6635,13 @@ dissect_security_information_mask(tvbuff_t *tvb, packet_info *pinfo, proto_tree
return offset;
}
-
+#if 0
static void
free_g_string(void *arg)
{
- GString *gstring = arg;
-
g_string_free(arg, TRUE);
}
+#endif
int
dissect_nt_sid(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, char *name)
@@ -6876,7 +6877,7 @@ dissect_nt_acl(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent
proto_item *item = NULL;
proto_tree *tree = NULL;
int old_offset = offset;
- guint16 revision, size;
+ guint16 revision;
guint32 num_aces;
if(parent_tree){
@@ -11906,7 +11907,6 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
{
guint8 sc, wc;
guint16 od=0, po=0, pc=0, pd=0, dc=0, dd=0, td=0, tp=0;
- gboolean reassembled = FALSE;
smb_info_t *si;
smb_transact2_info_t *t2i = NULL;
guint16 bc;