Fix for bug 1350: Add return value for

dissect_ansi_map_sms_originationrestrictions()

Also close a couple of comments, remove one /* embedded in a comment,
remove a couple unused variables (still lots of unused params in there),
and fix indentation of some proto_item and proto_tree variable declarations.

svn path=/trunk/; revision=20730

1 files changed, 85 insertions, 85 deletions

diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index 14627521c7..c641c9e2bd 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -416,7 +416,6 @@ static void
 update_saved_invokedata(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb){
   struct amsi_map_invokedata_t *ansi_map_saved_invokedata;
   struct tcap_private_t *p_private_tcap;
-  guint32 framenum = (guint32)pinfo->fd->num;
   address* src = &(pinfo->src);
   address* dst = &(pinfo->dst);
   guint8 *src_str;
@@ -681,8 +680,8 @@ static void
 dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	char		*digit_str;
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_mintype);
@@ -699,8 +698,8 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 	guint8 b1,b2,b3,b4;
 	int offset = 0;
 	char		*digit_str;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_digitstype);
@@ -826,8 +825,8 @@ static const value_string ansi_map_sub_addr_type_vals[]  = {
 static void 
 dissect_ansi_map_subaddress(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -841,7 +840,7 @@ dissect_ansi_map_subaddress(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  * 6.5.2.2 ActionCode
  * Table 114 ActionCode value
  *
-/* 6.5.2.2 ActionCode(TIA/EIA-41.5-D, page 5-129) */
+ * 6.5.2.2 ActionCode(TIA/EIA-41.5-D, page 5-129) */
 
 static const value_string ansi_map_ActionCode_vals[]  = {
     {   0, "Not used"},
@@ -920,8 +919,8 @@ static void
 dissect_ansi_map_alertcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -1075,8 +1074,8 @@ static void
 dissect_ansi_map_announcementcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -1131,8 +1130,8 @@ static void
 dissect_ansi_map_authorizationperiod(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -1153,8 +1152,8 @@ static void
 dissect_ansi_map_billingid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -1185,8 +1184,8 @@ static void
 dissect_ansi_map_callingfeaturesindicator(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
 	int length; 
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	length = tvb_length_remaining(tvb,offset); 
 	item = get_ber_last_created_item();
@@ -1342,8 +1341,8 @@ static void
 dissect_ansi_map_cdmacallmode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
 	int length; 
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	length = tvb_length_remaining(tvb,offset); 
 
@@ -1396,8 +1395,8 @@ dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 
 	int offset = 0;
 	int length; 
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	length = tvb_length_remaining(tvb,offset);
 
@@ -1468,8 +1467,8 @@ static const true_false_string ansi_map_CDMAStationClassMark_dmi_bool_val  = {
 static void
 dissect_ansi_map_cdmastationclassmark(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_cdmastationclassmark);
@@ -1499,8 +1498,8 @@ static const value_string ansi_map_ChannelData_dtx_vals[]  = {
 static void
 dissect_ansi_map_channeldata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_channeldata);
@@ -1529,8 +1528,8 @@ static const true_false_string ansi_map_ConfidentialityModes_bool_val  = {
 static void
 dissect_ansi_map_confidentialitymodes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_confidentialitymodes);
@@ -1556,8 +1555,8 @@ dissect_ansi_map_confidentialitymodes(tvbuff_t *tvb, packet_info *pinfo, proto_t
 static void
 dissect_ansi_map_controlchanneldata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_controlchanneldata);
@@ -1614,8 +1613,8 @@ static void
 dissect_ansi_map_deniedauthorizationperiod(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -1648,8 +1647,8 @@ static void
 dissect_ansi_map_extendedmscid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_extendedmscid);
@@ -1666,8 +1665,8 @@ static void
 dissect_ansi_map_extendedsystemmytypecode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_extendedsystemmytypecode);
@@ -1704,8 +1703,8 @@ static void
 dissect_ansi_map_handoffstate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_handoffstate);
@@ -1719,8 +1718,8 @@ static void
 dissect_ansi_map_intermsccircuitid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 	guint8 octet, octet2;
 
 	item = get_ber_last_created_item();
@@ -1748,8 +1747,8 @@ static void
 dissect_ansi_map_messagewaitingnotificationcount(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -1785,8 +1784,8 @@ static void
 dissect_ansi_map_messagewaitingnotificationtype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -1806,8 +1805,8 @@ dissect_ansi_map_messagewaitingnotificationtype(tvbuff_t *tvb, packet_info *pinf
 static void
 dissect_ansi_map_mscid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_mscid);
@@ -1822,8 +1821,8 @@ dissect_ansi_map_mscid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 static void
 dissect_ansi_map_mslocation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_mscid);
@@ -1842,8 +1841,8 @@ dissect_ansi_map_mslocation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 static void
 dissect_ansi_map_nampscallmode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_mscid);
@@ -1880,8 +1879,8 @@ static const value_string ansi_map_NAMPSChannelData_ccinidicator_vals[]  = {
 static void
 dissect_ansi_map_nampschanneldata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_mscid);
@@ -1950,8 +1949,8 @@ static const value_string ansi_map_onetimefeatureindicator_cnar_vals[]  = {
 static void
 dissect_ansi_map_onetimefeatureindicator(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_mscid);
@@ -2126,8 +2125,8 @@ static void
 dissect_ansi_map_originationtriggers(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_originationtriggers);
@@ -2231,8 +2230,8 @@ static void
 dissect_ansi_map_pacaindicator(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_pacaindicator);
@@ -2255,8 +2254,8 @@ static void
 dissect_ansi_map_pc_ssn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 	guint8 b1,b2,b3,b4;
 
 	item = get_ber_last_created_item();
@@ -2284,8 +2283,8 @@ static void
 dissect_ansi_map_pilotbillingid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -2423,11 +2422,13 @@ static const true_false_string ansi_map_SMS_OriginationRestrictions_fmc_bool_val
   "Force Indirect",
   "No effect"
 };
+
+static void
 dissect_ansi_map_sms_originationrestrictions(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_sms_originationrestrictions);
@@ -2521,8 +2522,8 @@ static void
 dissect_ansi_map_systemcapabilities(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_systemcapabilities);
@@ -2614,8 +2615,8 @@ static void
 dissect_ansi_map_terminationtriggers(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_transactioncapability);
@@ -2710,8 +2711,8 @@ static void
 dissect_ansi_map_transactioncapability(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_transactioncapability);
@@ -2853,15 +2854,15 @@ static void
 dissect_ansi_map_cdmaserviceoption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 	guint16 so;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_cdmaserviceoption);
 
 	so = tvb_get_ntohs(tvb,offset);
-    proto_tree_add_uint_format(subtree, hf_ansi_map_cdmaserviceoption,
+	proto_tree_add_uint_format(subtree, hf_ansi_map_cdmaserviceoption,
 					       tvb, offset, 2, so,
 					       "CDMAServiceOption: %u %s", so,
 					       rval_to_str(so,cdmaserviceoption_vals ,"Unknown"));
@@ -3060,8 +3061,8 @@ Messages (see TSB74) type specific field for this connection reference. */
 dissect_ansi_map_secondintermsccircuitid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_billingid);
@@ -3162,9 +3163,8 @@ static const true_false_string ansi_map_Availability_bool_val  = {
 static void
 dissect_ansi_map_callingpartyname(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
-	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_callingpartyname);
@@ -3215,8 +3215,8 @@ static void
 dissect_ansi_map_triggercapability(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_triggercapability);
@@ -3298,8 +3298,8 @@ static void
 dissect_ansi_map_winoperationscapability(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_winoperationscapability);
@@ -3323,8 +3323,8 @@ static void
 dissect_ansi_map_controlnetworkid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
 
 	int offset = 0;
-    proto_item *item;
-    proto_tree *subtree;
+	proto_item *item;
+	proto_tree *subtree;
 
 	item = get_ber_last_created_item();
 	subtree = proto_item_add_subtree(item, ett_controlnetworkid);
@@ -3390,7 +3390,7 @@ static const value_string ansi_ACGEncountered_cntrl_type_vals[]  = {
 	{	0, NULL }
 };
 
-/* 6.5.2.fw ControlType N.S0023-0 v 1.0 *
+/* 6.5.2.fw ControlType N.S0023-0 v 1.0 */