Get rid of some unnecessary settings of "pinfo->current_proto" - if the

dissector is called only through a handle or dissector table, the code
that handles those calls sets it for you.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3480 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-bacapp.c b/packet-bacapp.c
index aa00c2b52e467dffef0f23b5dc025b2383caa16c..f455c604160ccb8fd4bf13367ed74c2ed479776f 100644 (file)
--- a/packet-bacapp.c
+++ b/packet-bacapp.c
@@ -2,7 +2,7 @@
  * Routines for BACnet (APDU) dissection
  * Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
  *
- * $Id: packet-bacapp.c,v 1.2 2001/04/20 20:34:28 guy Exp $
+ * $Id: packet-bacapp.c,v 1.3 2001/05/30 07:48:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -78,7 +78,6 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8 bacapp_type;
        tvbuff_t *next_tvb;
 
-       pinfo->current_proto = "BACapp";
        if (check_col(pinfo->fd, COL_PROTOCOL))
                col_set_str(pinfo->fd, COL_PROTOCOL, "BACnet-APDU");
        if (check_col(pinfo->fd, COL_INFO))

diff --git a/packet-bacnet.c b/packet-bacnet.c
index 998650bb31c5b1660e0066ea5462d5056078740e..c5ea2731b69832dd2838a1944356d8ffd50284f3 100644 (file)
--- a/packet-bacnet.c
+++ b/packet-bacnet.c
@@ -2,7 +2,7 @@
  * Routines for BACnet (NPDU) dissection
  * Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
  *
- * $Id: packet-bacnet.c,v 1.2 2001/04/20 20:34:28 guy Exp $
+ * $Id: packet-bacnet.c,v 1.3 2001/05/30 07:48:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -197,8 +197,6 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8 j;
        tvbuff_t *next_tvb;
 
-       pinfo->current_proto = "BACnet";
-
        if (check_col(pinfo->fd, COL_PROTOCOL)) 
                col_set_str(pinfo->fd, COL_PROTOCOL, "BACnet-NPDU");
 

diff --git a/packet-bgp.c b/packet-bgp.c
index 69667357338341813b46a34dd7bb0ef67f09487c..0fc3c7fb7893309f2032e724a01f2f183c5a980a 100644 (file)
--- a/packet-bgp.c
+++ b/packet-bgp.c
@@ -2,7 +2,7 @@
  * Routines for BGP packet dissection.
  * Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org>
  *
- * $Id: packet-bgp.c,v 1.36 2001/05/16 18:52:35 guy Exp $
+ * $Id: packet-bgp.c,v 1.37 2001/05/30 07:48:23 guy Exp $
  * 
  * Supports:
  * RFC1771 A Border Gateway Protocol 4 (BGP-4)
@@ -1336,7 +1336,6 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     int           hlen;          /* BGP header length                */
     char          *typ;          /* BGP message type                 */
 
-    pinfo->current_proto = "BGP";
     if (check_col(pinfo->fd, COL_PROTOCOL))
        col_set_str(pinfo->fd, COL_PROTOCOL, "BGP");
     if (check_col(pinfo->fd, COL_INFO))

diff --git a/packet-bvlc.c b/packet-bvlc.c
index 148002c5d648966d9c19ec747d8829657f7d7bc4..9527f3d7a401d37f34cf90abe8a8465b14de2d38 100644 (file)
--- a/packet-bvlc.c
+++ b/packet-bvlc.c
@@ -2,7 +2,7 @@
  * Routines for BACnet/IP (BVLL, BVLC) dissection
  * Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
  *
- * $Id: packet-bvlc.c,v 1.2 2001/04/20 20:34:28 guy Exp $
+ * $Id: packet-bvlc.c,v 1.3 2001/05/30 07:48:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -128,8 +128,6 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint16 bvlc_result;
        tvbuff_t *next_tvb;
 
-       pinfo->current_proto = "BACnet virtual link control";
-
        if (check_col(pinfo->fd, COL_PROTOCOL))
                col_set_str(pinfo->fd, COL_PROTOCOL, "BVLC");