diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-11-19 03:53:33 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-11-19 03:53:33 +0000 |
| commit | 69f30a1f1273896a24a5475bc7b167d545356e3a (patch) | |
| tree | f9554e81e50a82f3331f885396f7a7ff0665397c /packet-smb-browse.c | |
| parent | 2030e7e74b477c9880e16b43c41cc21f2bb253aa (diff) | |
"dissect_mailslot_browse()", "dissect_mailslot_lanman()", and
"dissect_smb_logon()" always return TRUE, so just get rid of their
return value.
"call_dissector()" automatically calls the data dissector if the
protocol for the dissector being called is disabled, so we don't have to
check its result and call the data dissector if it returns 0.
svn path=/trunk/; revision=9027
Diffstat (limited to 'packet-smb-browse.c')
| -rw-r--r-- | packet-smb-browse.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/packet-smb-browse.c b/packet-smb-browse.c index 2c864f0030..26bba10705 100644 --- a/packet-smb-browse.c +++ b/packet-smb-browse.c @@ -2,7 +2,7 @@ * Routines for SMB Browser packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-browse.c,v 1.33 2003/11/16 23:17:21 guy Exp $ + * $Id: packet-smb-browse.c,v 1.34 2003/11/19 03:53:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -563,7 +563,7 @@ dissect_smb_server_type_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, } -static gboolean +static void dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) { int offset = 0; @@ -793,8 +793,6 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr offset += namelen; break; } - - return TRUE; } /* @@ -814,7 +812,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr * * XXX - what other browser packets go out to that mailslot? */ -static gboolean +static void dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) { int offset = 0; @@ -898,8 +896,6 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr offset += namelen; break; } - - return TRUE; } void @@ -1164,8 +1160,8 @@ proto_register_smb_browse(void) proto_register_field_array(proto_smb_browse, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - new_register_dissector("mailslot_browse", dissect_mailslot_browse, + register_dissector("mailslot_browse", dissect_mailslot_browse, proto_smb_browse); - new_register_dissector("mailslot_lanman", dissect_mailslot_lanman, + register_dissector("mailslot_lanman", dissect_mailslot_lanman, proto_smb_browse); } |