diff options
author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-12 20:17:43 +0000 |
---|---|---|
committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-12 20:17:43 +0000 |
commit | ebc1bc3a6cd4d2ded09ef61bf2d9cb108c989d6e (patch) | |
tree | b29d7d235fb2eb96c66d10b3c582936ee030cb90 | |
parent | edb4fdbd8ed9edcd7bc1961f20aaa1472d70f79e (diff) |
Remove some unneeded 'if(pinfo)' tests;
Remove some unneeded forward refs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39809 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | epan/dissectors/packet-componentstatus.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-fractalgeneratorprotocol.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-netperfmeter.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-pingpongprotocol.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-scriptingservice.c | 10 |
5 files changed, 10 insertions, 32 deletions
diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c index 94482a35f1..8ad89b4926 100644 --- a/epan/dissectors/packet-componentstatus.c +++ b/epan/dissectors/packet-componentstatus.c @@ -232,10 +232,8 @@ dissect_componentstatusprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto return(0); } - /* pinfo is NULL only if dissect_componentstatusprotocol_message is called from dissect_error cause */ - if (pinfo) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ComponentStatusProtocol"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ComponentStatusProtocol"); + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index fba74b334a..b01bb3e7bc 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.c @@ -61,10 +61,6 @@ static int hf_buffer = -1; /* Initialize the subtree pointers */ static gint ett_fractalgeneratorprotocol = -1; -static void -dissect_fractalgeneratorprotocol_message(tvbuff_t *, packet_info *, proto_tree *); - - /* Dissectors for messages. This is specific to FractalGeneratorProtocol */ #define MESSAGE_TYPE_LENGTH 1 #define MESSAGE_FLAGS_LENGTH 1 @@ -155,7 +151,7 @@ dissect_fractalgeneratorprotocol_message(tvbuff_t *message_tvb, packet_info *pin guint8 type; type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET); - if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) { + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown FractalGeneratorProtocol type")); } proto_tree_add_item(fractalgeneratorprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN); @@ -177,9 +173,7 @@ dissect_fractalgeneratorprotocol(tvbuff_t *message_tvb, packet_info *pinfo, prot proto_item *fractalgeneratorprotocol_item; proto_tree *fractalgeneratorprotocol_tree; - /* pinfo is NULL only if dissect_fractalgeneratorprotocol_message is called from dissect_error cause */ - if (pinfo) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FractalGeneratorProtocol"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FractalGeneratorProtocol"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c index d1a50e9f05..5ccbb8db21 100644 --- a/epan/dissectors/packet-netperfmeter.c +++ b/epan/dissectors/packet-netperfmeter.c @@ -374,7 +374,7 @@ dissect_npmp_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *npmp guint8 type; type = tvb_get_guint8(message_tvb, offset_message_type); - if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) { + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown NetPerfMeterProtocol type")); } @@ -417,9 +417,7 @@ dissect_npmp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_item *npmp_item; proto_tree *npmp_tree; - /* pinfo is NULL only if dissect_npmp_message is called from dissect_error cause */ - if (pinfo) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NetPerfMeterProtocol"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NetPerfMeterProtocol"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c index 8623f2289b..becec467c3 100644 --- a/epan/dissectors/packet-pingpongprotocol.c +++ b/epan/dissectors/packet-pingpongprotocol.c @@ -54,10 +54,6 @@ static int hf_pong_data = -1; /* Initialize the subtree pointers */ static gint ett_pingpongprotocol = -1; -static void -dissect_pingpongprotocol_message(tvbuff_t *, packet_info *, proto_tree *); - - /* Dissectors for messages. This is specific to PingPongProtocol */ #define MESSAGE_TYPE_LENGTH 1 #define MESSAGE_FLAGS_LENGTH 1 @@ -127,7 +123,7 @@ dissect_pingpongprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, prot guint8 type; type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET); - if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) { + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown PingPongProtocol type")); } proto_tree_add_item(pingpongprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN); @@ -149,9 +145,7 @@ dissect_pingpongprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree * proto_item *pingpongprotocol_item; proto_tree *pingpongprotocol_tree; - /* pinfo is NULL only if dissect_pingpongprotocol_message is called from dissect_error cause */ - if (pinfo) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PingPongProtocol"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PingPongProtocol"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c index 8d72f901f3..40a150a5ef 100644 --- a/epan/dissectors/packet-scriptingservice.c +++ b/epan/dissectors/packet-scriptingservice.c @@ -53,10 +53,6 @@ static int hf_environment_u_bit = -1; static gint ett_ssprotocol = -1; static gint ett_environment_flags = -1; -static guint -dissect_ssprotocol_message(tvbuff_t *, packet_info *, proto_tree *); - - /* Dissectors for messages. This is specific to ScriptingServiceProtocol */ #define MESSAGE_TYPE_LENGTH 1 #define MESSAGE_FLAGS_LENGTH 1 @@ -124,7 +120,7 @@ dissect_ssprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree guint total_length; type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET); - if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) { + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown SSP type: %u")); } proto_tree_add_item(ssprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN); @@ -182,9 +178,7 @@ dissect_ssprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_item *ssprotocol_item; proto_tree *ssprotocol_tree; - /* pinfo is NULL only if dissect_ssprotocol_message is called from dissect_error cause */ - if (pinfo) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSP"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ |