Strip some trailing whitespace; Fix some indentation; Add editor-modelines as needed.

Change-Id: I943153e28f468070d86535abad7be032e1386118
Reviewed-on: https://code.wireshark.org/review/2994
Reviewed-by: Bill Meier <wmeier@newsguy.com>

17 files changed, 90 insertions, 51 deletions

diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index 4f1b79114d..849b4346f9 100644
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.c
@@ -212,7 +212,7 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p
            !dissector_try_string(ros_oid_dissector_table, oid, next_tvb, pinfo, tree, session)){
         proto_item *item;
         proto_tree *next_tree;
-        
+
         next_tree = proto_tree_add_subtree_format(tree, next_tvb, 0, -1, ett_ros_unknown, &item,
                 "ROS: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid);
 
diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c
index 5a1feefcf0..60491e77a8 100644
--- a/epan/dissectors/file-mp4.c
+++ b/epan/dissectors/file-mp4.c
@@ -148,7 +148,7 @@ make_fract(guint x)
     if (x==0)
         return 0.0;
 
-    return (double)(x / exp(log(10.0)*(1+floor(log((double)x)/log(10.0))))); 
+    return (double)(x / exp(log(10.0)*(1+floor(log((double)x)/log(10.0)))));
 }
 
 static gint
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index a750f5d440..918e88212b 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -4491,7 +4491,7 @@ dissect_r3_upstreammfgfield_taskflags (tvbuff_t *tvb, guint32 start_offset, guin
   for (i = 0; i < len; i += 5)
   {
     proto_tree *tf_tree = proto_tree_add_subtree_format(tfg_tree, tvb, i, 5,
-                                               ett_r3taskflagsentry, NULL, 
+                                               ett_r3taskflagsentry, NULL,
                                                "Task Flags (%2d: 0x%06x)",
                                                tvb_get_guint8 (tvb, i + 0),
                                                tvb_get_letohl (tvb, i + 1));
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index 9d14cd33a8..8559f1d5c1 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -214,8 +214,8 @@ dissect_diameter_3gpp_ms_timezone(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
     oct = tvb_get_guint8(tvb, offset);
     sign = (oct & 0x08) ? '-' : '+';
     oct = (oct >> 4) + (oct & 0x07) * 10;
-	hours =  oct / 4;
-	minutes = oct % 4 * 15;
+    hours =  oct / 4;
+    minutes = oct % 4 * 15;
 
     proto_tree_add_text(tree, tvb, offset, 1, "Timezone: GMT %c %d hours %d minutes", sign, hours, minutes);
     offset++;
@@ -224,9 +224,9 @@ dissect_diameter_3gpp_ms_timezone(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
     proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str_const(oct, daylight_saving_time_vals, "Unknown"));
     offset++;
 
-    diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(), "Timezone: GMT %c %d hours %d minutes %s", 
-        sign, 
-        hours, 
+    diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(), "Timezone: GMT %c %d hours %d minutes %s",
+        sign,
+        hours,
         minutes,
         val_to_str_const(oct, daylight_saving_time_vals, "Unknown"));
 
@@ -302,7 +302,7 @@ dissect_diameter_3gpp_feature_list_id(tvbuff_t *tvb, packet_info *pinfo _U_, pro
         diam_sub_dis_inf->feature_list_id = tvb_get_ntohl(tvb,0);
     }
 
-	return 4;
+    return 4;
 }
 
 /* AVP Code: 637 UAR-Flags
@@ -633,7 +633,7 @@ dissect_diameter_3gpp_ipaddr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
 
 }
 
-/* AVP Code: 903 RAI AVP 
+/* AVP Code: 903 RAI AVP
  * 17.7.12 RAI AVP
  * The RAI AVP (AVP Code 909) is of type UTF8String, and contains the Routing Area Identity of the SGSN where the
  * UE is registered. RAI use and structure is specified in 3GPP TS 23.003 [40].
@@ -666,14 +666,14 @@ dissect_diameter_3gpp_rai(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
             tvb_get_string_enc(wmem_packet_scope(), tvb,  3, 3, ENC_UTF_8|ENC_NA), /* MCC 3 digits */
             tvb_get_string_enc(wmem_packet_scope(), tvb,  6, 4, ENC_UTF_8|ENC_NA), /* LCC 4 digits */
             tvb_get_string_enc(wmem_packet_scope(), tvb, 10, 2, ENC_UTF_8|ENC_NA)  /* RAC 2 digits */
-			);
+            );
     }else{
         diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(), "MNC %s, MCC %s, LAC 0x%s, RAC 0x%s",
             tvb_get_string_enc(wmem_packet_scope(), tvb,  0, 3, ENC_UTF_8|ENC_NA), /* MNC 3 digits */
             tvb_get_string_enc(wmem_packet_scope(), tvb,  3, 2, ENC_UTF_8|ENC_NA), /* MCC 2 digits */
             tvb_get_string_enc(wmem_packet_scope(), tvb,  5, 4, ENC_UTF_8|ENC_NA), /* LCC 4 digits */
             tvb_get_string_enc(wmem_packet_scope(), tvb,  9, 2, ENC_UTF_8|ENC_NA)  /* RAC 2 digits */
-			);
+            );
     }
 
     return offset;
@@ -1006,7 +1006,7 @@ proto_reg_handoff_diameter_3gpp(void)
     /* AVP Code: 23 3GPP-MS-TimeZone */
     dissector_add_uint("diameter.3gpp", 23, new_create_dissector_handle(dissect_diameter_3gpp_ms_timezone, proto_diameter_3gpp));
 
-	/* AVP Code: 600 Visited-Network-Identifier */
+    /* AVP Code: 600 Visited-Network-Identifier */
     dissector_add_uint("diameter.3gpp", 600, new_create_dissector_handle(dissect_diameter_3gpp_visited_nw_id, proto_diameter_3gpp));
 
     /* AVP Code: 606 User-Data */
@@ -1238,7 +1238,7 @@ proto_register_diameter_3gpp(void)
             FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
             NULL, HFILL }
         },
-		{ &hf_diameter_3gpp_feature_list1_s6a_flags_bit9,
+        { &hf_diameter_3gpp_feature_list1_s6a_flags_bit9,
             { "Regional Subscription", "diameter.3gpp.feature_list1_s6a_flags_bit9",
             FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
             NULL, HFILL }
@@ -1289,7 +1289,7 @@ proto_register_diameter_3gpp(void)
             FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
             NULL, HFILL }
         },
-		{ &hf_diameter_3gpp_feature_list1_s6a_flags_bit19,
+        { &hf_diameter_3gpp_feature_list1_s6a_flags_bit19,
             { "Allow an MS to perform self location without interaction with the PLMN", "diameter.3gpp.feature_list1_s6a_flags_bit19",
             FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
             NULL, HFILL }
@@ -1731,3 +1731,16 @@ proto_register_diameter_3gpp(void)
     proto_register_field_array(proto_diameter_3gpp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 608e284d76..1c2bc42c48 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -3825,7 +3825,7 @@ dissect_dvbci_payload_lsc(guint32 tag, gint len_field,
                     break;
                 case COMMS_CMD_ID_GET_NEXT_BUFFER:
                     phase_id = tvb_get_guint8(tvb, offset);
-                    proto_tree_add_item(tree, hf_dvbci_phase_id, 
+                    proto_tree_add_item(tree, hf_dvbci_phase_id,
                             tvb, offset, 1, ENC_BIG_ENDIAN);
                     col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL,
                             "received #%d", phase_id);
diff --git a/epan/dissectors/packet-lacp.c b/epan/dissectors/packet-lacp.c
index 558bffb8ac..343ae4d1a9 100644
--- a/epan/dissectors/packet-lacp.c
+++ b/epan/dissectors/packet-lacp.c
@@ -402,7 +402,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
         proto_tree_add_item(lacpdu_tree, hf_lacp_partner_reserved, tvb,
                 offset, 3, ENC_NA);
-        offset += 3; 
+        offset += 3;
 
         /* Collector Type */
 
@@ -691,3 +691,16 @@ proto_reg_handoff_lacp(void)
     lacp_handle = create_dissector_handle(dissect_lacp, proto_lacp);
     dissector_add_uint("slow.subtype", LACP_SUBTYPE, lacp_handle);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index e5db651bfd..51f306dc78 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -5649,7 +5649,7 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d
                 if (!pinfo->fd->flags.visited) {
                     /* Update UE state to this subframe (but before this event is processed) */
                     update_drx_info(pinfo, p_mac_lte_info);
-        
+
                     /* Store 'before' snapshot of UE state for this frame */
                     set_drx_info(pinfo, p_mac_lte_info, TRUE, pdu_instance);
                 }
diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c
index 7faed73596..ff295a24a4 100644
--- a/epan/dissectors/packet-mrcpv2.c
+++ b/epan/dissectors/packet-mrcpv2.c
@@ -1506,7 +1506,7 @@ proto_register_mrcpv2(void)
     };
 
     range_convert_str(&global_mrcpv2_tcp_range, TCP_DEFAULT_RANGE, 65535);
-    mrcpv2_tcp_range = range_empty();	
+    mrcpv2_tcp_range = range_empty();
 
     proto_mrcpv2 = proto_register_protocol(
         "Media Resource Control Protocol Version 2 (MRCPv2)",
@@ -1518,7 +1518,7 @@ proto_register_mrcpv2(void)
 
     mrcpv2_module = prefs_register_protocol(proto_mrcpv2, proto_reg_handoff_mrcpv2);
 
-    prefs_register_obsolete_preference(mrcpv2_module, "tcp.port");	
+    prefs_register_obsolete_preference(mrcpv2_module, "tcp.port");
     prefs_register_range_preference(mrcpv2_module, "tcp.port_range", "MRCPv2 TCP Port",
          "MRCPv2 TCP Ports Range",
          &global_mrcpv2_tcp_range, 65535);
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 92be2e7235..5cb08af752 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -60,7 +60,7 @@ void proto_reg_handoff_pdcp_lte(void);
    - Decipher even if sequence analysis isn't 'OK'?
       - know SN, but might be unsure about HFN.
    - Speed up AES decryption by keeping the crypt handle around for the channel
-     (like ESP decryption in IPSEC dissector) 
+     (like ESP decryption in IPSEC dissector)
    - Add Relay Node user plane data PDU dissection
 */
 
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index 9bc0ba6be9..7788d17e91 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -266,7 +266,7 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p
            !dissector_try_string(ros_oid_dissector_table, oid, next_tvb, pinfo, tree, session)){
         proto_item *item;
         proto_tree *next_tree;
-        
+
         next_tree = proto_tree_add_subtree_format(tree, next_tvb, 0, -1, ett_ros_unknown, &item,
                 "ROS: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid);
 
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 659f4d73ab..b1f38d8003 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -2058,8 +2058,8 @@ static void dissect_sip_route_header(tvbuff_t *tvb, proto_tree *tree, packet_inf
     return;
 }
 
-/* Dissect the details of a Via header 
- * 
+/* Dissect the details of a Via header
+ *
  * Via               =  ( "Via" / "v" ) HCOLON via-parm *(COMMA via-parm)
  * via-parm          =  sent-protocol LWS sent-by *( SEMI via-params )
  * via-params        =  via-ttl / via-maddr
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index cc2920fb64..c6f403d326 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -3122,7 +3122,7 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
     guint32                  k_device_address;
     guint32                  k_bus_id;
 
-        
+
     /* the goal is to get the conversation struct as early as possible
        and store all status values in this struct
        at first, we read the fields required to create/identify
diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c
index ba9983a970..1c62313b38 100644
--- a/epan/dissectors/packet-who.c
+++ b/epan/dissectors/packet-who.c
@@ -58,7 +58,7 @@ RWHOD(8)                 UNIX System Manager's Manual                 RWHOD(8)
            };
  *
  */
- 
+
 void proto_register_who(void);
 void proto_reg_handoff_who(void);
 
@@ -299,3 +299,16 @@ proto_reg_handoff_who(void)
 	who_handle = create_dissector_handle(dissect_who, proto_who);
 	dissector_add_uint("udp.port", UDP_PORT_WHO, who_handle);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/file.c b/file.c
index 53b5e55bb3..819660cf61 100644
--- a/file.c
+++ b/file.c
@@ -2386,7 +2386,7 @@ cf_retap_packets(capture_file *cf)
   if (cf == NULL) {
     return CF_READ_ABORTED;
   }
-  
+
   /* Do we have any tap listeners with filters? */
   filtering_tap_listeners = have_filtering_tap_listeners();
 
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 884a87fcfc..4f10757935 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -7501,7 +7501,7 @@ dissect_PDSubFrameBlock_block(tvbuff_t *tvb, int offset,
     u16RemainingLength = u16BodyLength - 8;
     while (u16RemainingLength >= 4)
     {
-        guint8 Position, 
+        guint8 Position,
                DataLength;
         sub_item = proto_tree_add_item(tree, hf_pn_io_subframe_data, tvb, offset, 4, ENC_BIG_ENDIAN);
         sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_subframe_data);
diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c
index a313be3de3..c9c90800fd 100644
--- a/ui/gtk/voip_calls.c
+++ b/ui/gtk/voip_calls.c
@@ -1010,9 +1010,9 @@ SIPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con
 	if(NULL==tapinfo->callsinfo_hashtable[SIP_HASH]) {
 		/* TODO: check how efficient g_str_hash is for sip call ids */
 		tapinfo->callsinfo_hashtable[SIP_HASH]=g_hash_table_new_full(g_str_hash,
-															g_str_equal,
-															NULL, /* key_destroy_func */
-                                                         	NULL);/* value_destroy_func */
+									     g_str_equal,
+									     NULL, /* key_destroy_func */
+									     NULL);/* value_destroy_func */
 	}
 	/* search the call information in the SIP_HASH */
 	callsinfo = (voip_calls_info_t *)g_hash_table_lookup(tapinfo->callsinfo_hashtable[SIP_HASH], key);
@@ -1087,7 +1087,7 @@ SIPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con
 					callsinfo->call_comment=g_strdup_printf("%s %u",
 										callsinfo->call_comment,
 										pi->response_code/*, pi->reason_phrase*/);
-					
+
 					g_free(old_comment);
 				}
 
@@ -1647,7 +1647,7 @@ q931_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
 				/* get the Q931 Release cause code */
 				if (q931_cause_value != 0xFF) {
 					comment = g_strdup_printf("H225 Q931 Rel Cause (%i):%s", q931_cause_value,
-                                                                  val_to_str_ext_const(q931_cause_value, &q931_cause_code_vals_ext, "<unknown>"));
+								  val_to_str_ext_const(q931_cause_value, &q931_cause_code_vals_ext, "<unknown>"));
 				} else { /* Cause not set */
 					comment = g_strdup("H225 No Q931 Rel Cause");
 				}
@@ -1766,7 +1766,7 @@ q931_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
 			}
 			if (q931_cause_value != 0xFF) {
 				comment = g_strdup_printf("AC_ISDN trunk:%u Q931 Rel Cause (%i):%s", actrace_trunk, q931_cause_value,
-                                                          val_to_str_ext_const(q931_cause_value, &q931_cause_code_vals_ext, "<unknown>"));
+							  val_to_str_ext_const(q931_cause_value, &q931_cause_code_vals_ext, "<unknown>"));
 			} else { /* Cause not set */
 				comment = g_strdup("AC_ISDN No Q931 Rel Cause");
 			}
@@ -3714,21 +3714,21 @@ remove_tap_listener_unistim_calls(void)
 
 /* Telecaster to tap-voip call state mapping */
 static const voip_call_state skinny_tap_voip_state[] = {
-        VOIP_NO_STATE,
-        VOIP_CALL_SETUP,
-        VOIP_COMPLETED,
-        VOIP_RINGING,
-        VOIP_RINGING,
-        VOIP_IN_CALL,
-        VOIP_REJECTED,
-        VOIP_REJECTED,
-        VOIP_IN_CALL,
-        VOIP_IN_CALL,
-        VOIP_COMPLETED,
-        VOIP_COMPLETED,
-        VOIP_CALL_SETUP,
-        VOIP_UNKNOWN,
-        VOIP_REJECTED
+	VOIP_NO_STATE,
+	VOIP_CALL_SETUP,
+	VOIP_COMPLETED,
+	VOIP_RINGING,
+	VOIP_RINGING,
+	VOIP_IN_CALL,
+	VOIP_REJECTED,
+	VOIP_REJECTED,
+	VOIP_IN_CALL,
+	VOIP_IN_CALL,
+	VOIP_COMPLETED,
+	VOIP_COMPLETED,
+	VOIP_CALL_SETUP,
+	VOIP_UNKNOWN,
+	VOIP_REJECTED
 };
 
 static int
@@ -4063,7 +4063,7 @@ VoIPcalls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con
 	callsinfo->call_active_state = pi->call_active_state;
 	if ((callsinfo->call_state != VOIP_COMPLETED) && (pi->call_state == VOIP_COMPLETED))
 		tapinfo->completed_calls++;
-        if (pi->call_state != VOIP_NO_STATE)
+	if (pi->call_state != VOIP_NO_STATE)
 		callsinfo->call_state = pi->call_state;
 	if (pi->call_comment) {
 		g_free(callsinfo->call_comment);
diff --git a/ui/io_graph_item.h b/ui/io_graph_item.h
index 2ded2b582b..7ef15173cf 100644
--- a/ui/io_graph_item.h
+++ b/ui/io_graph_item.h
@@ -1,6 +1,6 @@
 /* io_graph_item.h
  * Definitions and functions for IO graph items
- * 
+ *
  * Copied from gtk/io_stat.c, (c) 2002 Ronnie Sahlberg
  *
  * Wireshark - Network traffic analyzer