aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2011-04-04 18:41:49 +0000
committerBill Meier <wmeier@newsguy.com>2011-04-04 18:41:49 +0000
commitdb925b3bfb935070f22e47307107e4a10b52cb25 (patch)
treef174c1dd8cb60d534d4d113c7e1352df03dc5835
parent07e325bf63d2ba9a339530708179495c0b5a2427 (diff)
Don't assign to a proto_item * if the value won't be used: Coverity 836;
Also: remove some unneeded #includes. svn path=/trunk/; revision=36460
-rw-r--r--epan/dissectors/packet-ansi_637.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index f732bc2ceb..f8bcfd0420 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -34,9 +34,6 @@
# include "config.h"
#endif
-/* #include <stdlib.h> */
-#include <gmodule.h>
-
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -45,8 +42,6 @@
# include <netinet/in.h>
#endif
-#include <string.h>
-
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/strutil.h>
@@ -558,7 +553,6 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
const gchar *str = NULL;
/*add more translation UCS , IA5 , latin , latin \ hebrew ,gsm 7BIT*/
- proto_item *ucs2_item;
gchar *utf8_text = NULL;
GIConv cd;
GError *l_conv_error = NULL;
@@ -742,11 +736,11 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
utf8_text = g_convert_with_iconv(tvb->real_data + offset, num_fields , cd , NULL , NULL , &l_conv_error);
if(!l_conv_error)
{
- ucs2_item = proto_tree_add_text(tree, tvb, offset, num_fields, "Encoded user data: %s", utf8_text);
+ proto_tree_add_text(tree, tvb, offset, num_fields, "Encoded user data: %s", utf8_text);
}
else
{
- ucs2_item = proto_tree_add_text(tree, tvb, offset, num_fields, "%s", "Failed on iso-8859-8 contact Wireshark developers");
+ proto_tree_add_text(tree, tvb, offset, num_fields, "%s", "Failed on iso-8859-8 contact Wireshark developers");
}
if(utf8_text)
g_free(utf8_text);
@@ -769,11 +763,11 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
utf8_text = g_convert_with_iconv(ansi_637_bigbuf , num_fields , cd , NULL , NULL , &l_conv_error);
if(!l_conv_error)
{
- ucs2_item = proto_tree_add_text(tree, tvb, offset, num_fields, "Encoded user data: %s", utf8_text);
+ proto_tree_add_text(tree, tvb, offset, num_fields, "Encoded user data: %s", utf8_text);
}
else
{
- ucs2_item = proto_tree_add_text(tree, tvb, offset, num_fields, "%s", "Failed on iso-8859-1 contact Wireshark developers");
+ proto_tree_add_text(tree, tvb, offset, num_fields, "%s", "Failed on iso-8859-1 contact Wireshark developers");
}
if(utf8_text)
g_free(utf8_text);