Hi,
Here is a small patch to remove some #if/#endif's
used for compile time flag DEBUG_CALL_SUB_DISSECTORS.
This has already been replaced by runtime edit-protocols
selection posted earlier.
/Frank..
--
EUS/SV/Z Frank Singleton ASO Americas BSS
Office : +1 972 583 3251 ECN 800 33251
Mobile : +1 214 228 0874 Amateur Radio: VK3FCS/KM5WS
Email : frank.singleton@xxxxxxxxxxxx
Hardware: HP Omnibook 4150 running Redhat Linux 7.1 (2.4.3-12 kernel).
--- ../ethereal-2001-07-05/packet-giop.c Tue Jul 3 18:30:01 2001
+++ ../ethereal-2001-07-05.updated/packet-giop.c Thu Jul 5 14:55:47 2001
@@ -9,7 +9,7 @@
* Frank Singleton <frank.singleton@xxxxxxxxxxxx>
* Trevor Shepherd <eustrsd@xxxxxxxxxxxxxxx>
*
- * $Id: packet-giop.c,v 1.41 2001/07/03 23:30:01 guy Exp $
+ * $Id: packet-giop.c,v 1.3 2001/07/05 19:55:47 frank Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@xxxxxxxxxxxx>
@@ -317,12 +317,6 @@
#define DEBUG 0
-/*
- * To allow calling (or not) of subdissectors, for testing buggy stuff.
- * TODO - make this a runtime option in GUI
- */
-
-#define DEBUG_CALL_SUB_DISSECTORS 1
/*
@@ -2976,7 +2970,6 @@
* fails, try the heuristic method.
*/
-#if DEBUG_CALL_SUB_DISSECTORS
if(entry->repoid) {
exres = try_explicit_giop_dissector(tvb,pinfo,clnp_tree, &offset, header, entry->operation, entry->repoid );
@@ -2989,7 +2982,6 @@
}
-#endif
break;
case LOCATION_FORWARD:
@@ -3419,7 +3411,6 @@
header->req_id = request_id; /* save for sub dissector */
repoid = get_repoid_from_objkey(giop_objkey_hash,objkey,objkey_len);
-#if DEBUG_CALL_SUB_DISSECTORS
if(repoid) {
exres = try_explicit_giop_dissector(tvb,pinfo,tree,&offset,header,operation,repoid);
@@ -3431,7 +3422,6 @@
try_heuristic_giop_dissector(tvb,pinfo,tree,&offset,header,operation);
}
-#endif
g_free( print_objkey );
g_free( objkey );
@@ -3563,7 +3553,6 @@
* fails, try the heuristic method.
*/
-#if DEBUG_CALL_SUB_DISSECTORS
if(repoid) {
exres = try_explicit_giop_dissector(tvb,pinfo,tree,&offset,header,operation,repoid);
@@ -3576,7 +3565,6 @@
}
-#endif
g_free(operation);
g_free(reserved);
