Remove unneeded #includes (stdlib, stdio, ctypes, time);

In a few cases: do some whitespace, indentation cleanup & reformatting.

svn path=/trunk/; revision=42632

epan/dissectors/packet-aim-admin.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-adverts.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-bos.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-buddylist.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-chat.c

@@ -28,9 +28,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-chatnav.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-directory.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-email.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-icq.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-invitation.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-location.c

@@ -28,9 +28,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-oft.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-popup.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-signon.c

@@ -28,9 +28,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-sst.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-stats.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-translate.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim-userlookup.c

@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-aim.c

@@ -29,7 +29,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 

epan/dissectors/packet-app-pkix-cert.c

@@ -32,8 +32,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-arcnet.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-artnet.c

@@ -30,10 +30,8 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-#include <time.h>
-#include <string.h>
+#include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>

epan/dissectors/packet-aruba-adp.c

@@ -27,7 +27,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <stdlib.h>
 
 #include <glib.h>
 #include <epan/packet.h>

epan/dissectors/packet-banana.c

@@ -32,8 +32,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-bfd.c

@@ -38,10 +38,8 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/expert.h>
 

epan/dissectors/packet-brdwlk.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-capwap.c

@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
+#include <glib.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>

epan/dissectors/packet-ccsds.c

@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>

epan/dissectors/packet-cell_broadcast.c

@@ -28,12 +28,10 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <string.h>
 #include <glib.h>
+
 #include <epan/packet.h>
 
-#include <epan/emem.h>
 #include <epan/strutil.h>
 #include <epan/asn1.h>
 
@@ -563,8 +561,3 @@ proto_register_cbs(void)
     /* subtree array */
     proto_register_subtree_array(ett, array_length(ett));
 }
-
-void
-proto_reg_handoff_gsm_cbs(void)
-{
-}

epan/dissectors/packet-cgmp.c

@@ -22,11 +22,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
-
-#include <stdlib.h>
+#endif
 
 #include <glib.h>
+
 #include <epan/packet.h>
 
 /*

epan/dissectors/packet-cigi.c

@@ -33,8 +33,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-cimetrics.c

@@ -27,6 +27,8 @@
 # include "config.h"
 #endif
 
+#include <glib.h>
+
 #include <epan/packet.h>
 #include "packet-llc.h"
 #include <epan/oui.h>

epan/dissectors/packet-cisco-sm.c

@@ -43,21 +43,21 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
+#include <glib.h>
 
 #include <epan/packet.h>
 
-#define MESSAGE_TYPE_START				0
-#define MESSAGE_TYPE_STOP				1
-#define MESSAGE_TYPE_ACTIVE				2
-#define MESSAGE_TYPE_STANDBY			3
-#define MESSAGE_TYPE_Q_HOLD_INVOKE		4
-#define MESSAGE_TYPE_Q_HOLD_RESPONSE	5
-#define MESSAGE_TYPE_Q_RESUME_INVOKE	6
-#define MESSAGE_TYPE_Q_RESUME_RESPONSE	7
-#define MESSAGE_TYPE_Q_RESET_INVOKE		8
-#define MESSAGE_TYPE_Q_RESET_RESPONSE	9
-#define MESSAGE_TYPE_PDU				0x8000
+#define MESSAGE_TYPE_START              0
+#define MESSAGE_TYPE_STOP               1
+#define MESSAGE_TYPE_ACTIVE             2
+#define MESSAGE_TYPE_STANDBY            3
+#define MESSAGE_TYPE_Q_HOLD_INVOKE      4
+#define MESSAGE_TYPE_Q_HOLD_RESPONSE    5
+#define MESSAGE_TYPE_Q_RESUME_INVOKE    6
+#define MESSAGE_TYPE_Q_RESUME_RESPONSE  7
+#define MESSAGE_TYPE_Q_RESET_INVOKE     8
+#define MESSAGE_TYPE_Q_RESET_RESPONSE   9
+#define MESSAGE_TYPE_PDU                0x8000
 
 static const value_string sm_message_type_value[] = {
 	{ MESSAGE_TYPE_START,			"Start Message" },
@@ -223,7 +223,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		case SM_PROTOCOL_X101:
 			if (!tree)
 				return;
-			/* XXX Reveres enginered so this may not be correct!!!
+			/* XXX Reverse enginered so this may not be correct!!!
 			 * EISUP - used between Cisco HSI and Cisco PGW devices,
 			 * uses RUDP with default port number 8003.
 			 * Protocol stack is RUDP->Cisco SM->SDP.
@@ -261,7 +261,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		case SM_PROTOCOL_X114:
 			if (!tree)
 				return;
-			/* XXX Reveres enginered so this may not be correct!!! */
+			/* XXX Reverse enginered so this may not be correct!!! */
 			proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
 			length = tvb_get_ntohs(tvb,offset);
 			offset = offset + 2;

epan/dissectors/packet-dccp.c

@@ -52,10 +52,8 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/ipproto.h>
@@ -1428,7 +1426,7 @@ proto_reg_handoff_dccp(void)
     dccp_handle = create_dissector_handle(dissect_dccp, proto_dccp);
     dissector_add_uint("ip.proto", IP_PROTO_DCCP, dccp_handle);
     data_handle = find_dissector("data");
-    dccp_tap = register_tap("dccp");
+    dccp_tap    = register_tap("dccp");
 }
 
 /*

epan/dissectors/packet-dcm.c

@@ -206,14 +206,12 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include <glib.h>
 
-#include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>

epan/dissectors/packet-dhcp-failover.c

@@ -39,8 +39,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-dtp.c

@@ -28,11 +28,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
-
-#include <stdlib.h>
+#endif
 
 #include <glib.h>
+
 #include <epan/packet.h>
 
 /*

epan/dissectors/packet-enttec.c

@@ -30,9 +30,8 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-#include <time.h>
+#include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>

epan/dissectors/packet-exec.c

@@ -31,13 +31,9 @@
 
 #include <glib.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
+#include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/emem.h>
-#include <epan/packet.h>
 #include <epan/prefs.h>
 #include <wsutil/str_util.h>
 

epan/dissectors/packet-fc.c

@@ -30,8 +30,6 @@
 
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-fcct.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-fcels.c

@@ -32,8 +32,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-fcfcs.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-fclctl.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-fcoe.c

@@ -34,8 +34,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-fcsp.c

@@ -28,8 +28,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-g723.c

@@ -29,8 +29,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-gdsdb.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-gift.c

@@ -29,8 +29,8 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/strutil.h>
 

epan/dissectors/packet-git.c

@@ -31,9 +31,9 @@
 #endif
 
 #include <stdio.h>
-#include <stdlib.h>
 
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>

epan/dissectors/packet-gmrp.c

@@ -30,8 +30,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-gnutella.c

@@ -27,11 +27,8 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
-
 #include <epan/packet.h>
 #include "packet-gnutella.h"
 #include "packet-tcp.h"

epan/dissectors/packet-gopher.c

@@ -34,8 +34,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-gsm_a_bssmap.c

@@ -40,7 +40,7 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
+#include <glib.h>
 
 #include <epan/packet.h>
 #include <epan/tap.h>

epan/dissectors/packet-gsm_a_common.c

@@ -31,9 +31,10 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <math.h>
 
+#include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/tap.h>

epan/dissectors/packet-gsm_a_dtap.c

@@ -91,7 +91,7 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
+#include <glib.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>

epan/dissectors/packet-gsm_a_rp.c

@@ -36,7 +36,7 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
+#include <glib.h>
 
 #include <epan/packet.h>
 #include <epan/tap.h>

epan/dissectors/packet-gsm_bsslap.c

@@ -29,8 +29,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-gsm_bssmap_le.c

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
+#include <glib.h>
 
 #include <epan/packet.h>
 #include <epan/tap.h>

epan/dissectors/packet-icp.c

@@ -30,8 +30,8 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 

epan/dissectors/packet-ieee80211.c

@@ -98,7 +98,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 

epan/dissectors/packet-ifcp.c

@@ -34,8 +34,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-igrp.c

@@ -33,10 +33,8 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/ipproto.h>
 

epan/dissectors/packet-ipfc.c

@@ -30,8 +30,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-ipsec.c

@@ -74,7 +74,6 @@ ADD: Additional generic (non-checked) ICV length of 128, 192 and 256.
 #endif
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>

epan/dissectors/packet-ismp.c

@@ -28,8 +28,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-iwarp-ddp-rdmap.c

@@ -31,8 +31,9 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <stdlib.h>
+
 #include <glib.h>
+
 #include <epan/packet.h>
 
 /* DEFINES */

epan/dissectors/packet-laplink.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-llt.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-lsc.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-lwres.c

@@ -28,12 +28,10 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-#include <time.h>
 #include <string.h>
 
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include "packet-dns.h"

epan/dissectors/packet-m3ua.c

@@ -36,9 +36,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-manolito.c

@@ -29,8 +29,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-mesh.c

@@ -28,8 +28,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-mip.c

@@ -30,10 +30,7 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
-#include <time.h>
 
 #include <epan/packet.h>
 #include <epan/sminmpec.h>

epan/dissectors/packet-mmse.c

@@ -37,8 +37,6 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>

epan/dissectors/packet-mpls-pm.c

@@ -32,8 +32,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-mpls-psc.c

@@ -32,8 +32,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-mpls-y1711.c

@@ -41,8 +41,8 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 

epan/dissectors/packet-msdp.c

@@ -29,8 +29,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-mstp.c

@@ -35,8 +35,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-mstp.h

@@ -26,15 +26,6 @@
 #ifndef __MSTP_H__
 #define __MSTP_H__
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-
-#include <epan/packet.h>
-
-
 /**
  * Returns a value string for the BACnet MS/TP Frame Type.
  * @param val

epan/dissectors/packet-multipart.c

@@ -60,15 +60,15 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
-#include <epan/prefs.h>
-#include <glib.h>
 #include <ctype.h>
-#include <epan/base64.h>
-#include <epan/emem.h>
+
+#include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/prefs.h>
+#include <epan/base64.h>
+#include <epan/emem.h>
 
 #include "packet-imf.h"
 

epan/dissectors/packet-nbd.c

@@ -28,18 +28,15 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <epan/prefs.h>
-
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/emem.h>
 #include "packet-tcp.h"
 
-static gint proto_nbd			= -1;
+static gint proto_nbd = -1;
 static int hf_nbd_magic = -1;
 static int hf_nbd_type = -1;
 static int hf_nbd_error = -1;

epan/dissectors/packet-ndp.c

@@ -32,11 +32,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
-
-#include <stdlib.h>
+#endif
 
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/nlpid.h>
 

epan/dissectors/packet-netdump.c

@@ -28,8 +28,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-netsync.c

@@ -30,9 +30,8 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-#include <time.h>
+#include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>

epan/dissectors/packet-nhrp.c

@@ -32,10 +32,10 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/expert.h>

epan/dissectors/packet-nt-tpcp.c

@@ -27,10 +27,10 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h> /* this is for get_hostname and get_udp_port */
 
@@ -77,6 +77,7 @@ static const value_string type_vals[] = {
 /* Version info */
 #define TPCP_VER_1 1
 #define TPCP_VER_2 2
+
 #define TPCP_VER_1_LENGTH 16
 #define TPCP_VER_2_LENGTH 28
 
@@ -103,10 +104,10 @@ static gint ett_tpcp_flags = -1;
 static void
 dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	tpcpdu_t tpcph;
+	tpcpdu_t    tpcph;
 	proto_tree *tpcp_tree = NULL, *field_tree = NULL;
 	proto_item *ti, *tf;
-	guint8 length = TPCP_VER_1_LENGTH;
+	guint8      length    = TPCP_VER_1_LENGTH;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPCP");
 	col_clear(pinfo->cinfo, COL_INFO);
@@ -114,7 +115,7 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	/* need to find out which version!! */
 	tpcph.version = tvb_get_guint8(tvb, 0);
 	/* as version 1 and 2 are so similar use the same structure, just don't use as much for version 1*/
-        /* XXX: Doing a memcpy into a struct is *not* kosher */
+	/* XXX: Doing a memcpy into a struct is *not* kosher */
 	if (tpcph.version == TPCP_VER_1) {
 		length = TPCP_VER_1_LENGTH;
 		tvb_memcpy(tvb, (guint8 *) &tpcph, 0, length);
@@ -129,7 +130,7 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	tpcph.id        = g_ntohs(tpcph.id);
 	tpcph.flags     = g_ntohs(tpcph.flags);
 	tpcph.cport     = g_ntohs(tpcph.cport);
-        tpcph.signature = g_ntohl(tpcph.signature);
+	tpcph.signature = g_ntohl(tpcph.signature);
 
 	if (check_col(pinfo->cinfo, COL_INFO))
 		col_add_fstr(pinfo->cinfo, COL_INFO,"%s id %d CPort %s CIP %s SIP %s",
@@ -233,22 +234,22 @@ proto_register_tpcp(void)
 	};
 
 
-    static gint *ett[] = {
-	&ett_tpcp,
-	&ett_tpcp_flags,
-    };
+	static gint *ett[] = {
+		&ett_tpcp,
+		&ett_tpcp_flags,
+	};
 
-    proto_tpcp = proto_register_protocol("Alteon - Transparent Proxy Cache Protocol",
-		"TPCP", "tpcp");
-    proto_register_field_array(proto_tpcp, hf, array_length(hf));
-    proto_register_subtree_array(ett, array_length(ett));
+	proto_tpcp = proto_register_protocol("Alteon - Transparent Proxy Cache Protocol",
+					     "TPCP", "tpcp");
+	proto_register_field_array(proto_tpcp, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
 }
 
 void
 proto_reg_handoff_tpcp(void)
 {
-    dissector_handle_t tpcp_handle;
+	dissector_handle_t tpcp_handle;
 
-    tpcp_handle = create_dissector_handle(dissect_tpcp, proto_tpcp);
-    dissector_add_uint("udp.port", UDP_PORT_TPCP, tpcp_handle);
+	tpcp_handle = create_dissector_handle(dissect_tpcp, proto_tpcp);
+	dissector_add_uint("udp.port", UDP_PORT_TPCP, tpcp_handle);
 }

epan/dissectors/packet-olsr.c

@@ -34,7 +34,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>

epan/dissectors/packet-openwire.c

@@ -44,12 +44,12 @@
 #endif
 
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include "packet-tcp.h"
-#include <stdlib.h>
 
 static int proto_openwire = -1;
 static int hf_openwire_none = -1;

epan/dissectors/packet-opsi.c

@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-pcli.c

@@ -33,11 +33,8 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <ctype.h>
-#include <time.h>
-
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>

epan/dissectors/packet-per.c

@@ -32,13 +32,12 @@ proper helper routines
 # include "config.h"
 #endif
 
-#include <glib.h>
-#include <epan/packet.h>
-
-#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
+#include <glib.h>
+
+#include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/to_str.h>
 #include <epan/prefs.h>

epan/dissectors/packet-pktgen.c

@@ -33,10 +33,6 @@
 # include "config.h"
 #endif
 
-#if 0
-#include <stdlib.h>
-#endif
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-ptp.c

@@ -45,10 +45,8 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <math.h>
 
-
 #include <glib.h>
 
 #include <epan/packet.h>

epan/dissectors/packet-pvfs2.c

@@ -35,7 +35,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>