Don't assign to a proto_item * if the value won't be used: Coverity 829 & 830;

Fix a minor bug wherein a number of proto_tree_add_...() used the wrong tree: Coverity 831;
Remove some unneeded #includes.

svn path=/trunk/; revision=36456

1 files changed, 102 insertions, 105 deletions

diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 974c9b33fd..2149fc3726 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -7,17 +7,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -31,9 +31,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>
@@ -94,8 +91,8 @@ static gint pref_amr_mode = AMR_NB;
 /* static gboolean octet_aligned = TRUE; */
 
 static const value_string amr_encoding_type_value[] = {
-	{0,		"RFC 3267"}, 
-	{1,		"RFC 3267 bandwidth-efficient mode"}, 
+	{0,		"RFC 3267"},
+	{1,		"RFC 3267 bandwidth-efficient mode"},
 	{2,		"AMR IF 1"},
 	{3,		"AMR IF 2"},
 	{ 0,	NULL }
@@ -104,7 +101,7 @@ static const value_string amr_encoding_type_value[] = {
 
 /* Table 1a of 3GPP TS 26.201*/
 static const value_string amr_nb_codec_mode_vals[] = {
-	{0,		"AMR 4,75 kbit/s"}, 
+	{0,		"AMR 4,75 kbit/s"},
 	{1,		"AMR 5,15 kbit/s"},
 	{2,		"AMR 5,90 kbit/s"},
 	{3,		"AMR 6,70 kbit/s (PDC-EFR)"},
@@ -148,13 +145,13 @@ static value_string_ext amr_wb_codec_mode_vals_ext = VALUE_STRING_EXT_INIT(amr_w
 
 /* Ref 3GPP TS 26.101 table 1a for AMR-NB*/
 
-/* From RFC3267 chapter 4.3.1 
+/* From RFC3267 chapter 4.3.1
 CMR (4 bits): Indicates a codec mode request sent to the speech
       encoder at the site of the receiver of this payload.  The value of
       the CMR field is set to the frame type index of the corresponding
       speech mode being requested.  The frame type index may be 0-7 for
       AMR, as defined in Table 1a in [2], or 0-8 for AMR-WB, as defined
-      in Table 1a in [3GPP TS 26.201].  CMR value 15 indicates that no 
+      in Table 1a in [3GPP TS 26.201].  CMR value 15 indicates that no
       mode request is present, and other values are for future use.
 */
 static const value_string amr_nb_codec_mode_request_vals[] = {
@@ -173,7 +170,7 @@ static const value_string amr_nb_codec_mode_request_vals[] = {
 	{12,	"Illegal Frametype - For future use"},
 	{13,	"Illegal Frametype - For future use"},
 	{14,	"Illegal Frametype - For future use"},
-	{15,	"No mode request"}, 
+	{15,	"No mode request"},
 	{ 0,	NULL }
 };
 static value_string_ext amr_nb_codec_mode_request_vals_ext = VALUE_STRING_EXT_INIT(amr_nb_codec_mode_request_vals);
@@ -195,24 +192,24 @@ static const value_string amr_wb_codec_mode_request_vals[] = {
 	{12,		"Illegal Frametype - For future use"},
 	{13,		"Illegal Frametype - For future use"},
 	{14,		"Illegal Frametype - For future use"},
-	{15,		"No mode request"}, 
+	{15,		"No mode request"},
 	{ 0,	NULL }
 };
 static value_string_ext amr_wb_codec_mode_request_vals_ext = VALUE_STRING_EXT_INIT(amr_wb_codec_mode_request_vals);
 
 static const true_false_string toc_f_bit_vals = {
-  "Followed by another speech frame",
-  "Last frame in this payload"
+	"Followed by another speech frame",
+	"Last frame in this payload"
 };
 
 static const true_false_string toc_q_bit_vals = {
-  "Ok",
-  "Severely damaged frame"
+	"Ok",
+	"Severely damaged frame"
 };
 
 static const true_false_string amr_sti_vals = {
-  "SID_UPDATE",
-  "SID_FIRST"
+	"SID_UPDATE",
+	"SID_FIRST"
 };
 
 /* See 3GPP TS 26.101 chapter 4 for AMR-NB IF1 */
@@ -275,10 +272,10 @@ static void
 dissect_amr_nb_if2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
 	guint8 octet;
-	
+
 	proto_tree_add_item(tree, hf_amr_nb_if2_ft, tvb, offset, 1, FALSE);
 	octet = tvb_get_guint8(tvb,offset) & 0x0f;
-	
+
 	if (octet == AMR_NB_SID) {
 		proto_tree_add_text(tree, tvb, offset+1, 3, "Speech data");
 		proto_tree_add_item(tree, hf_amr_if2_sti, tvb, offset+4, 1, FALSE);
@@ -297,10 +294,10 @@ static void
 dissect_amr_wb_if2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
 	guint8 octet;
-	
+
 	proto_tree_add_item(tree, hf_amr_wb_if2_ft, tvb, offset, 1, FALSE);
 	octet = (tvb_get_guint8(tvb,offset) & 0xf0) >> 4;
-	
+
 	if (octet == AMR_WB_SID) {
 		proto_tree_add_text(tree, tvb, offset+1, 4, "Speech data");
 		proto_tree_add_item(tree, hf_amr_if2_sti, tvb, offset+5, 1, FALSE);
@@ -324,26 +321,26 @@ dissect_amr_be(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint amr
 	int bits_used_for_frames = 0;
 	int bytes_needed_for_frames;
 	guint8 f_bit, q_bit;
-	
+
 	/* Number of bits per frame for AMR-NB, see Table 1 RFC3267*/
 	/* Values taken for GSM-EFR SID, TDMA-EFR SID and PDC-EFR SID from 3GPP 26.101 Table A.1b */
 
 	/*               Frame type     0   1   2   3   4   5   6   7  8  9  10 11 12 13 14 15 */
 	unsigned char Framebits_NB[] = {95,103,118,134,148,159,204,244,39,43,38,37, 0, 0, 0, 0};
-	
+
 	/* Number of bits per frame for AMR-WB, see 3GPP TS 26.201 Table 2*/
 	/*               Frame type     0   1   2   3   4   5   6   7   8   9  10 11 12 13 14 15 */
 	unsigned int Framebits_WB[] = {132,177,253,285,317,365,397,461,477,40,0, 0, 0, 0, 0, 0,};
 
-	
+
 	/* Chapter 4.3 */
 
 	bitcount = 3;
 	if (amr_mode==AMR_NB)
-		item = proto_tree_add_bits_item(tree, hf_amr_nb_cmr, tvb, bit_offset, 4, FALSE);
-	else    
-		item = proto_tree_add_bits_item(tree, hf_amr_wb_cmr, tvb, bit_offset, 4, FALSE);	
-	    
+		proto_tree_add_bits_item(tree, hf_amr_nb_cmr, tvb, bit_offset, 4, FALSE);
+	else
+		proto_tree_add_bits_item(tree, hf_amr_wb_cmr, tvb, bit_offset, 4, FALSE);
+
 	bit_offset+=4;
 	/* In bandwidth-efficient mode, a ToC entry takes the following format:
 	 *
@@ -371,12 +368,12 @@ dissect_amr_be(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint amr
 			item = proto_tree_add_bits_item(tree, hf_amr_nb_toc_ft, tvb, bit_offset, 4, FALSE);
 		else
 			item = proto_tree_add_bits_item(tree, hf_amr_wb_toc_ft, tvb, bit_offset, 4, FALSE);
-		    	    
+
 		bit_offset+=4;
 		bitcount += 4;
 		if (amr_mode==AMR_NB)
 			bits_used_for_frames +=Framebits_NB[ft];
-		else    
+		else
 			bits_used_for_frames +=Framebits_WB[ft];
 		/* Check Q bit */
 		q_bit = tvb_get_bits8(tvb, bit_offset, 1);
@@ -385,30 +382,30 @@ dissect_amr_be(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint amr
 		bitcount += 1;
 		if (q_bit==1)
 			proto_item_append_text(item, " / Frame OK");
-		else    
+		else
 			proto_item_append_text(item, " / Frame damaged");
 	} while ((f_bit==1) && (tvb_reported_length_remaining(tvb, bitcount/8)>2));
-	
+
 	if (bits_used_for_frames>0)
 		bytes_needed_for_frames = 1 + (bitcount+bits_used_for_frames)/8-bitcount/8;
-	else     
+	else
 		bytes_needed_for_frames = 0;
 
-	/* Check if we have enough data available for our frames */    
+	/* Check if we have enough data available for our frames */
 	if (tvb_reported_length_remaining(tvb, bitcount/8)<bytes_needed_for_frames)	{
 		item = proto_tree_add_text(tree, tvb, bitcount/8, bytes_needed_for_frames, "Error:");
 		proto_item_append_text(item, " %d Bytes available, %d would be needed!",
 				       tvb_reported_length_remaining(tvb, bitcount/8),
 				       bytes_needed_for_frames);
 		expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Not enough data for the frames according to TOC");
-	}			    
+	}
 	else {
 		item = proto_tree_add_text(tree, tvb, bitcount/8, bytes_needed_for_frames, "Frame Data");
 		proto_item_append_text(item, " (%d Bytes)",bytes_needed_for_frames);
-	}    
-	
+	}
+
 	bitcount+=bits_used_for_frames;
-	
+
 	if (tvb_reported_length_remaining(tvb, (bitcount+8)/8)>0)	{
 		item = proto_tree_add_text(tree, tvb, bitcount/8, tvb_reported_length_remaining(tvb, bitcount/8), "Error:");
 		proto_item_append_text(item, " %d Bytes remaining - should be 0!",tvb_reported_length_remaining(tvb, (bitcount+8)/8));
@@ -417,15 +414,15 @@ dissect_amr_be(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint amr
 		/* Now check the paddings */
 		if (bitcount%8 != 0)	{
 			if ( (1 << (8 -(bitcount%8)-1)) & tvb_get_guint8(tvb,bitcount/8) )
-				item = proto_tree_add_text(tree, tvb, bitcount/8, 1, "Padding bits correct");
+				proto_tree_add_text(tree, tvb, bitcount/8, 1, "Padding bits correct");
 			else	{
 				item = proto_tree_add_text(tree, tvb, bitcount/8, 1, "Padding bits error");
 				expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Padding bits error - MUST be 0");
-			}    
+			}
+
+		}
+	}
 
-		}	    
-	}    
-	
 }
 /* Code to actually dissect the packets */
 static void
@@ -460,23 +457,23 @@ dissect_amr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint amr
 			if (amr_mode==AMR_NB)
 			    dissect_amr_nb_if1(tvb, pinfo, amr_tree);
 			else
-			    dissect_amr_wb_if1(tvb, pinfo, amr_tree);    
+			    dissect_amr_wb_if1(tvb, pinfo, amr_tree);
 			return;
 		case 3: /* AMR IF2 */
 			if (amr_mode==AMR_NB)
 			    dissect_amr_nb_if2(tvb, pinfo, amr_tree);
 			else
-			    dissect_amr_wb_if2(tvb, pinfo, amr_tree);    
+			    dissect_amr_wb_if2(tvb, pinfo, amr_tree);
 			return;
 		default:
 			break;
 		}
-		
+
 		if (amr_mode==AMR_NB)
 			proto_tree_add_bits_item(amr_tree, hf_amr_nb_cmr, tvb, bit_offset, 4, FALSE);
 		else
 			proto_tree_add_bits_item(amr_tree, hf_amr_wb_cmr, tvb, bit_offset, 4, FALSE);
-		    
+
 		bit_offset+=4;
 		octet = tvb_get_guint8(tvb,offset) & 0x0f;
 		if ( octet != 0  ){
@@ -509,20 +506,20 @@ dissect_amr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint amr
 		octet = tvb_get_guint8(tvb,offset);
 		toc_item = proto_tree_add_text(amr_tree, tvb, offset, -1, "Payload Table of Contents");
 		toc_tree = proto_item_add_subtree(toc_item, ett_amr_toc);
-		
+
 		first_time = TRUE;
 		while ((( octet& 0x80 ) == 0x80)||(first_time == TRUE)){
 			first_time = FALSE;
-			octet = tvb_get_guint8(tvb,offset);	
-			
-			proto_tree_add_bits_item(amr_tree, hf_amr_toc_f, tvb, bit_offset, 1, FALSE);
+			octet = tvb_get_guint8(tvb,offset);
+
+			proto_tree_add_bits_item(toc_tree, hf_amr_toc_f, tvb, bit_offset, 1, FALSE);
 			bit_offset++;
 			if (amr_mode==AMR_NB)
-				proto_tree_add_bits_item(amr_tree, hf_amr_nb_toc_ft, tvb, bit_offset, 4, FALSE);
+				proto_tree_add_bits_item(toc_tree, hf_amr_nb_toc_ft, tvb, bit_offset, 4, FALSE);
 			else
-				proto_tree_add_bits_item(amr_tree, hf_amr_wb_toc_ft, tvb, bit_offset, 4, FALSE);
+				proto_tree_add_bits_item(toc_tree, hf_amr_wb_toc_ft, tvb, bit_offset, 4, FALSE);
 			bit_offset+=4;
-			proto_tree_add_bits_item(amr_tree, hf_amr_toc_q, tvb, bit_offset, 1, FALSE);
+			proto_tree_add_bits_item(toc_tree, hf_amr_toc_q, tvb, bit_offset, 1, FALSE);
 			bit_offset++;
 			/* 2 pading bits */
 			bit_offset+=2;
@@ -557,32 +554,32 @@ dissect_amr_wb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
 typedef struct _amr_capability_t {
-  const gchar *id;
-  const gchar *name;
-  new_dissector_t content_pdu;
+	const gchar *id;
+	const gchar *name;
+	new_dissector_t content_pdu;
 } amr_capability_t;
 
 static amr_capability_t amr_capability_tab[] = {
-  /* ITU-T H.241 (05/2006), 8.3 H.264 capabilities */
-  { "GenericCapability/0.0.8.245.1.1.1", "H.245 - GSM AMR Capability Identifier", NULL },
-  { "GenericCapability/0.0.8.245.1.1.1/collapsing/0", "maxAl-sduAudioFrames", NULL },
-  { "GenericCapability/0.0.8.245.1.1.1/collapsing/1", "bitRate", NULL },
-  { "GenericCapability/0.0.8.245.1.1.1/collapsing/2", "gsmAmrComfortNoise", NULL },
-  { "GenericCapability/0.0.8.245.1.1.1/collapsing/3", "gsmEfrComfortNoise", NULL },
-  { "GenericCapability/0.0.8.245.1.1.1/collapsing/4", "is-641ComfortNoise", NULL },
-  { "GenericCapability/0.0.8.245.1.1.1/collapsing/5", "pdcEFRComfortNoise", NULL },
-  /* ITU-T Rec. G.722.2/Annex F (11/2002) */
-  { "GenericCapability/0.0.7.7222.1.0/collapsing/0", "maxAl-sduFrames", NULL },
-  { "GenericCapability/0.0.7.7222.1.0/collapsing/1", "bitRate", NULL },
-  { "GenericCapability/0.0.7.7222.1.0/collapsing/2", "octetAlign", NULL },
-  { "GenericCapability/0.0.7.7222.1.0/collapsing/3", "modeSet", NULL },
-  { "GenericCapability/0.0.7.7222.1.0/collapsing/4", "modeChangePeriod", NULL },
-  { "GenericCapability/0.0.7.7222.1.0/collapsing/5", "modeChangeNeighbour", NULL },
-  { "GenericCapability/0.0.7.7222.1.0/collapsing/6", "crc", NULL },
-  { "GenericCapability/0.0.7.7222.1.0/collapsing/7", "robustSorting", NULL },
-  { "GenericCapability/0.0.7.7222.1.0/collapsing/8", "interleaving", NULL },
-  { NULL, NULL, NULL },
-};      
+	/* ITU-T H.241 (05/2006), 8.3 H.264 capabilities */
+	{ "GenericCapability/0.0.8.245.1.1.1", "H.245 - GSM AMR Capability Identifier", NULL },
+	{ "GenericCapability/0.0.8.245.1.1.1/collapsing/0", "maxAl-sduAudioFrames", NULL },
+	{ "GenericCapability/0.0.8.245.1.1.1/collapsing/1", "bitRate", NULL },
+	{ "GenericCapability/0.0.8.245.1.1.1/collapsing/2", "gsmAmrComfortNoise", NULL },
+	{ "GenericCapability/0.0.8.245.1.1.1/collapsing/3", "gsmEfrComfortNoise", NULL },
+	{ "GenericCapability/0.0.8.245.1.1.1/collapsing/4", "is-641ComfortNoise", NULL },
+	{ "GenericCapability/0.0.8.245.1.1.1/collapsing/5", "pdcEFRComfortNoise", NULL },
+	/* ITU-T Rec. G.722.2/Annex F (11/2002) */
+	{ "GenericCapability/0.0.7.7222.1.0/collapsing/0", "maxAl-sduFrames", NULL },
+	{ "GenericCapability/0.0.7.7222.1.0/collapsing/1", "bitRate", NULL },
+	{ "GenericCapability/0.0.7.7222.1.0/collapsing/2", "octetAlign", NULL },
+	{ "GenericCapability/0.0.7.7222.1.0/collapsing/3", "modeSet", NULL },
+	{ "GenericCapability/0.0.7.7222.1.0/collapsing/4", "modeChangePeriod", NULL },
+	{ "GenericCapability/0.0.7.7222.1.0/collapsing/5", "modeChangeNeighbour", NULL },
+	{ "GenericCapability/0.0.7.7222.1.0/collapsing/6", "crc", NULL },
+	{ "GenericCapability/0.0.7.7222.1.0/collapsing/7", "robustSorting", NULL },
+	{ "GenericCapability/0.0.7.7222.1.0/collapsing/8", "interleaving", NULL },
+	{ NULL, NULL, NULL },
+};
 
 static amr_capability_t *find_cap(const gchar *id) {
 	amr_capability_t *ftr = NULL;
@@ -595,10 +592,10 @@ static amr_capability_t *find_cap(const gchar *id) {
 }
 
 static void
-dissect_amr_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree) 
+dissect_amr_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree)
 {
 	asn1_ctx_t *actx;
-	amr_capability_t *ftr = NULL; 
+	amr_capability_t *ftr = NULL;
 
 	actx = get_asn1_ctx(pinfo->private_data);
 	DISSECTOR_ASSERT(actx != NULL);
@@ -628,25 +625,25 @@ proto_reg_handoff_amr(void)
 
 	if (!amr_prefs_initialized) {
 		dissector_handle_t amr_name_handle;
-		amr_capability_t *ftr; 
+		amr_capability_t *ftr;
 
 		amr_handle = find_dissector("amr");
 		amr_wb_handle = find_dissector("amr-wb");
 		dissector_add_string("rtp_dyn_payload_type","AMR", amr_handle);
 		dissector_add_string("rtp_dyn_payload_type","AMR-WB", amr_wb_handle);
 
-		/* 
+		/*
 		 * Register H.245 Generic parameter name(s)
 		 */
 		amr_name_handle = create_dissector_handle(dissect_amr_name, proto_amr);
 		for (ftr=amr_capability_tab; ftr->id; ftr++) {
-			if (ftr->name) 
+			if (ftr->name)
 				dissector_add_string("h245.gef.name", ftr->id, amr_name_handle);
 			if (ftr->content_pdu)
 				dissector_add_string("h245.gef.content", ftr->id, new_create_dissector_handle(ftr->content_pdu, proto_amr));
 		}
 		/*	Activate the next line for testing with the randpkt tool
-			dissector_add_uint("udp.port", 55555, amr_handle); 
+			dissector_add_uint("udp.port", 55555, amr_handle);
 		*/
 		amr_prefs_initialized = TRUE;
 	} else {
@@ -659,7 +656,7 @@ proto_reg_handoff_amr(void)
 	if ( dynamic_payload_type > 95 ){
 		dissector_add_uint("rtp.pt", dynamic_payload_type, amr_handle);
 	}
-	
+
 }
 
 /* this format is require because a script is used to build the C function
@@ -668,7 +665,7 @@ proto_reg_handoff_amr(void)
 
 void
 proto_register_amr(void)
-{                 
+{
 
 	module_t *amr_module;
 
@@ -676,47 +673,47 @@ proto_register_amr(void)
 	static hf_register_info hf[] = {
 		{ &hf_amr_nb_cmr,
 			{ "CMR",           "amr.nb.cmr",
-			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_nb_codec_mode_request_vals_ext, 0x0,          
+			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_nb_codec_mode_request_vals_ext, 0x0,
 			"codec mode request", HFILL }
 		},
 		{ &hf_amr_wb_cmr,
 			{ "CMR",           "amr.wb.cmr",
-			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_wb_codec_mode_request_vals_ext, 0x0,          
+			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_wb_codec_mode_request_vals_ext, 0x0,
 			"codec mode request", HFILL }
 		},
 		{ &hf_amr_reserved,
 			{ "Reserved",           "amr.reserved",
-			FT_UINT8, BASE_DEC, NULL, 0x0f,          
+			FT_UINT8, BASE_DEC, NULL, 0x0f,
 			"Reserved bits", HFILL }
 		},
 		{ &hf_amr_toc_f,
 			{ "F bit",           "amr.toc.f",
-			FT_BOOLEAN, BASE_NONE, TFS(&toc_f_bit_vals), 0x0,          
+			FT_BOOLEAN, BASE_NONE, TFS(&toc_f_bit_vals), 0x0,
 			NULL, HFILL }
 		},
 		{ &hf_amr_nb_toc_ft,
 			{ "FT bits",           "amr.nb.toc.ft",
-			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_nb_codec_mode_request_vals_ext, 0x0,          
+			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_nb_codec_mode_request_vals_ext, 0x0,
 			"Frame type index", HFILL }
 		},
 		{ &hf_amr_wb_toc_ft,
 			{ "FT bits",           "amr.wb.toc.ft",
-			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_wb_codec_mode_request_vals_ext, 0x0,          
+			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_wb_codec_mode_request_vals_ext, 0x0,
 			"Frame type index", HFILL }
 		},
 		{ &hf_amr_toc_q,
 			{ "Q bit",           "amr.toc.q",
-			FT_BOOLEAN, BASE_NONE, TFS(&toc_q_bit_vals), 0x0,          
+			FT_BOOLEAN, BASE_NONE, TFS(&toc_q_bit_vals), 0x0,
 			"Frame quality indicator bit", HFILL }
 		},
 		{ &hf_amr_nb_if1_ft,
 			{ "Frame Type",           "amr.nb.if1.ft",
-			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_nb_codec_mode_vals_ext, 0xf0,          
+			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_nb_codec_mode_vals_ext, 0xf0,
 			NULL, HFILL }
 		},
 		{ &hf_amr_wb_if1_ft,
 			{ "Frame Type",           "amr.wb.if1.ft",
-			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_wb_codec_mode_vals_ext, 0xf0,          
+			FT_UINT8, BASE_DEC|BASE_EXT_STRING, &amr_wb_codec_mode_vals_ext, 0xf0,
 			NULL, HFILL }
 		},
 		{ &hf_amr_nb_if1_mode_req,
@@ -731,7 +728,7 @@ proto_register_amr(void)
 		},
 		{ &hf_amr_if1_sti,
 			{ "SID Type Indicator",           "amr.if1.sti",
-			FT_BOOLEAN, 8, TFS(&amr_sti_vals), 0x10,          
+			FT_BOOLEAN, 8, TFS(&amr_sti_vals), 0x10,
 			NULL, HFILL }
 		},
 		{ &hf_amr_nb_if1_sti_mode_ind,
@@ -766,7 +763,7 @@ proto_register_amr(void)
 		},
 		{ &hf_amr_if2_sti,
 			{ "SID Type Indicator",           "amr.if2.sti",
-			FT_BOOLEAN, 8, TFS(&amr_sti_vals), 0x80,          
+			FT_BOOLEAN, 8, TFS(&amr_sti_vals), 0x80,
 			NULL, HFILL }
 		},
 		{ &hf_amr_nb_if2_sti_mode_ind,
@@ -781,7 +778,7 @@ proto_register_amr(void)
 		},
 		{ &hf_amr_if1_fqi,
 			{ "FQI",           "amr.fqi",
-			FT_BOOLEAN, 8, TFS(&toc_q_bit_vals), 0x08,          
+			FT_BOOLEAN, 8, TFS(&toc_q_bit_vals), 0x08,
 			"Frame quality indicator bit", HFILL }
 		},
 	};
@@ -793,7 +790,7 @@ proto_register_amr(void)
 	};
 	static enum_val_t encoding_types[] = {
 		{"RFC 3267 Byte aligned", "RFC 3267 octet aligned", 0},
-		{"RFC 3267 Bandwidth-efficient", "RFC 3267 BW-efficient", 1}, 
+		{"RFC 3267 Bandwidth-efficient", "RFC 3267 BW-efficient", 1},
 		{"AMR IF1", "AMR IF1", 2},
 		{"AMR IF2", "AMR IF2", 3},
 		{NULL, NULL, -1}
@@ -801,7 +798,7 @@ proto_register_amr(void)
 
 	static enum_val_t modes[] = {
 		{"AMR-NB", "Narrowband AMR", AMR_NB},
-		{"AMR-WB", "Wideband AMR", AMR_WB}, 
+		{"AMR-WB", "Wideband AMR", AMR_WB},
 		{NULL, NULL, -1}
 	};
 
@@ -812,12 +809,12 @@ proto_register_amr(void)
 	proto_register_field_array(proto_amr, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 	/* Register a configuration option for port */
-	
+
 	amr_module = prefs_register_protocol(proto_amr, proto_reg_handoff_amr);
 
 	prefs_register_uint_preference(amr_module, "dynamic.payload.type",
 				       "AMR dynamic payload type",
-				       "The dynamic payload type which will be interpreted as AMR" 
+				       "The dynamic payload type which will be interpreted as AMR"
 				       "; The value must be greater than 95",
 				       10,
 				       &temp_dynamic_payload_type);
@@ -831,7 +828,7 @@ proto_register_amr(void)
 				       "The AMR mode",
 				       "The AMR mode",
 				       &pref_amr_mode, modes, AMR_NB);
-	
+
 	register_dissector("amr", dissect_amr, proto_amr);
 	register_dissector("amr-wb", dissect_amr_wb, proto_amr);
 	register_dissector("amr_if1_nb", dissect_amr_nb_if1, proto_amr);
@@ -840,6 +837,6 @@ proto_register_amr(void)
 	register_dissector("amr_if2_wb", dissect_amr_wb_if2, proto_amr);
 
 	oid_add_from_string("G.722.2 (AMR-WB) audio capability","0.0.7.7222.1.0");
-	
+
 
 }