From ab3a3d3f1b79562e17c5698c329a121d95cbf993 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 1 Apr 2005 09:20:39 +0000 Subject: [PATCH] Get rid of an unused variable. Include "packet-gsm_map.h", not "packet-gsm_map.c". Check in the regenerated CAMEL dissector. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13995 f5534014-38df-0310-8fa8-9805f1628bb7 --- asn1/camel/packet-camel-template.c | 3 +-- epan/dissectors/packet-camel.c | 35 +----------------------------- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index f88d4dc3f1..15d89489ce 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -45,7 +45,7 @@ #include "packet-q931.h" #include "packet-e164.h" #include "packet-isup.h" -#include "packet-gsm_map.c" +#include "packet-gsm_map.h" #define PNAME "Camel" #define PSNAME "CAMEL" @@ -489,7 +489,6 @@ dissect_camel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) { proto_item *item=NULL; proto_tree *tree=NULL; - gchar *str = NULL; if (check_col(pinfo->cinfo, COL_PROTOCOL)) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "Camel"); diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 5c917c1832..cfac716963 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -52,6 +52,7 @@ #include "packet-q931.h" #include "packet-e164.h" #include "packet-isup.h" +#include "packet-gsm_map.h" #define PNAME "Camel" #define PSNAME "CAMEL" @@ -621,39 +622,6 @@ static int application_context_version; static int dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset); -static char* -unpack_digits(tvbuff_t *tvb, int offset){ - - int length; - guint8 octet; - int i=0; - char *digit_str; - - length = tvb_length(tvb); - length = length - offset; - digit_str = g_malloc(length+1); - - while ( offset < length ){ - octet = tvb_get_guint8(tvb,offset); - digit_str[i] = ((octet & 0x0f) + 0x30); - i++; - - /* - * unpack second value in byte - */ - octet = octet >> 4; - - if (octet == 0x0f) /* odd number bytes - hit filler */ - break; - - digit_str[i] = ((octet & 0x0f) + 0x30); - i++; - offset++; - - } - digit_str[i]= '\0'; - return digit_str; -} static const true_false_string camel_extension_value = { "No Extension", @@ -6244,7 +6212,6 @@ dissect_camel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) { proto_item *item=NULL; proto_tree *tree=NULL; - gchar *str = NULL; if (check_col(pinfo->cinfo, COL_PROTOCOL)) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "Camel"); -- 2.34.1