PUD: cleanup includes
authorFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 14 Mar 2012 09:33:43 +0000 (10:33 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 14 Mar 2012 14:08:38 +0000 (15:08 +0100)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
22 files changed:
lib/pud/src/configuration.c
lib/pud/src/configuration.h
lib/pud/src/dedup.c
lib/pud/src/dedup.h
lib/pud/src/gpsConversion.c
lib/pud/src/netTools.c
lib/pud/src/networkInterfaces.c
lib/pud/src/posAvg.c
lib/pud/src/posAvg.h
lib/pud/src/pud.c
lib/pud/src/pudOlsrdPlugin.c
lib/pud/src/receiver.c
lib/pud/src/state.h
lib/pud/src/timers.c
lib/pud/src/uplinkGateway.c
lib/pud/wireformat-java/src/main/c/org_olsr_plugin_pud_ClusterLeader.c
lib/pud/wireformat-java/src/main/c/org_olsr_plugin_pud_PositionUpdate.c
lib/pud/wireformat-java/src/main/c/org_olsr_plugin_pud_UplinkMessage.c
lib/pud/wireformat/include/OlsrdPudWireFormat/nodeIdConversion.h
lib/pud/wireformat/include/OlsrdPudWireFormat/wireFormat.h
lib/pud/wireformat/src/nodeIdConversion.c
lib/pud/wireformat/src/wireFormat.c

index bc65f2d..fa9086d 100644 (file)
@@ -2,26 +2,16 @@
 
 /* Plugin includes */
 #include "pud.h"
-#include "netTools.h"
 #include "networkInterfaces.h"
+#include "netTools.h"
 
 /* OLSR includes */
-#include "olsr_types.h"
-#include "olsr_cfg.h"
 
 /* System includes */
-#include <OlsrdPudWireFormat/nodeIdConversion.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
 #include <unistd.h>
+#include <arpa/inet.h>
 #include <nmea/util.h>
+#include <OlsrdPudWireFormat/nodeIdConversion.h>
 
 /*
  * Utility functions
index bc17d2f..a44b2cf 100644 (file)
@@ -5,10 +5,11 @@
 
 /* OLSR includes */
 #include "olsrd_plugin.h"
+#include "olsr_types.h"
 
 /* System includes */
 #include <stdbool.h>
-#include <sys/socket.h>
+#include <stddef.h>
 #include <OlsrdPudWireFormat/wireFormat.h>
 
 /*
index 9f213c7..1eb0d40 100644 (file)
@@ -7,8 +7,6 @@
 
 /* System includes */
 #include <assert.h>
-#include <pthread.h>
-#include <stddef.h>
 
 #ifdef PUD_DUMP_DEDUP
 #include <arpa/inet.h>
index eda0b8d..0e8b1af 100644 (file)
@@ -10,6 +10,7 @@
 /* System includes */
 #include <stdint.h>
 #include <stdbool.h>
+#include <pthread.h>
 
 /* A de-duplication entry holding the information to compare, 18 bytes */
 typedef struct _DeDupEntry {
index 75a8b80..bf991ac 100644 (file)
@@ -3,20 +3,14 @@
 /* Plugin includes */
 #include "pud.h"
 #include "configuration.h"
-#include "compiler.h"
-#include "networkInterfaces.h"
 
 /* OLSR includes */
 #include "olsr.h"
 
 /* System includes */
-#include <nmea/gmath.h>
 #include <nmea/tok.h>
-#include <nmea/info.h>
-#include <netinet/in.h>
-#include <stdio.h>
+#include <nmea/gmath.h>
 #include <arpa/inet.h>
-#include <OlsrdPudWireFormat/wireFormat.h>
 #include <OlsrdPudWireFormat/nodeIdConversion.h>
 
 /* ************************************************************************
index 793a1f0..5925fb8 100644 (file)
@@ -7,10 +7,7 @@
 
 /* System includes */
 #include <assert.h>
-#include <stddef.h>
-#include <string.h>
 #include <sys/ioctl.h>
-#include <errno.h>
 #include <unistd.h>
 
 /**
index 12e16ec..afadd3b 100644 (file)
@@ -6,18 +6,10 @@
 #include "netTools.h"
 
 /* OLSRD includes */
-#include "olsr_cfg.h"
 #include "olsr.h"
-#include "interfaces.h"
 
 /* System includes */
-#include <assert.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <errno.h>
 #include <unistd.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
 
index a29881b..a7555ad 100644 (file)
@@ -8,11 +8,7 @@
 
 /* System includes */
 #include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <nmea/sentence.h>
-#include <nmea/info.h>
 
 /* Defines */
 
index 052b258..baaf3c6 100644 (file)
@@ -7,7 +7,6 @@
 
 /* System includes */
 #include <nmea/info.h>
-#include <pthread.h>
 #include <stdbool.h>
 
 /** Stores an nmeaINFO entry, used in the averaging */
index 043f8e0..7cba8a9 100644 (file)
@@ -1,24 +1,21 @@
 #include "pud.h"
 
 /* Plugin includes */
-#include "configuration.h"
+#include "dedup.h"
 #include "networkInterfaces.h"
-#include "dump.h"
+#include "configuration.h"
 #include "gpsConversion.h"
 #include "receiver.h"
-#include "dedup.h"
-#include "compiler.h"
 #include "state.h"
+#include "dump.h"
 
 /* OLSRD includes */
-#include "ipcalc.h"
-#include "parser.h"
 #include "olsr.h"
+#include "ipcalc.h"
 #include "net_olsr.h"
+#include "parser.h"
 
 /* System includes */
-#include <assert.h>
-#include <sys/socket.h>
 
 /** The size of the buffer in which the received NMEA string is stored */
 #define BUFFER_SIZE_RX_NMEA            2048
index a06f16e..b219029 100644 (file)
@@ -5,11 +5,9 @@
 #include "version.h"
 
 /* OLSRD includes */
-#include "defs.h"
 #include "olsr.h"
 
 /* System includes */
-#include <stdbool.h>
 
 /*
  * OLSR Entrypoints
index 8a2453e..6a365d9 100644 (file)
@@ -2,14 +2,13 @@
 
 /* Plugin includes */
 #include "pud.h"
-#include "gpsConversion.h"
-#include "configuration.h"
-#include "timers.h"
+#include "state.h"
 #include "posAvg.h"
+#include "configuration.h"
+#include "gpsConversion.h"
 #include "networkInterfaces.h"
+#include "timers.h"
 #include "uplinkGateway.h"
-#include "state.h"
-#include "OlsrdPudWireFormat/wireFormat.h"
 #include "dump.h"
 
 /* OLSRD includes */
 #include "net_olsr.h"
 
 /* System includes */
+#include <pthread.h>
 #include <nmea/parser.h>
 #include <nmea/gmath.h>
 #include <nmea/sentence.h>
+#include <OlsrdPudWireFormat/wireFormat.h>
 
 /* Debug includes */
 #if defined(PUD_DUMP_GPS_PACKETS_TX_OLSR) || \
index 12202cd..cff8288 100644 (file)
@@ -2,7 +2,6 @@
 #define _PUD_STATE_H_
 
 /* Plugin includes */
-#include "receiver.h"
 
 /* OLSRD includes */
 
index c552c12..143ac57 100644 (file)
@@ -5,11 +5,8 @@
 
 /* OLSRD includes */
 #include "olsr_cookie.h"
-#include "scheduler.h"
 
 /* System includes */
-#include <stddef.h>
-#include <stdbool.h>
 
 /*
  * OLSR Tx Timer
index 0b3793a..068c86d 100644 (file)
@@ -5,14 +5,9 @@
 /* OLSRD includes */
 #include "gateway.h"
 #include "tc_set.h"
-#include "ipcalc.h"
-#include "olsr_types.h"
 #include "lq_plugin.h"
 
 /* System includes */
-#include <stddef.h>
-#include <stdbool.h>
-#include <sys/socket.h>
 
 /**
  * Determine the speed on which a gateway is chosen
index a247d64..89fa0a2 100644 (file)
@@ -1,7 +1,6 @@
 #include "org_olsr_plugin_pud_ClusterLeader.h"
+
 #include "util.h"
-#include <arpa/inet.h>
-#include <stdbool.h>
 
 /*
  * Class:     org_olsr_plugin_pud_ClusterLeader
index 718b865..c7ef901 100644 (file)
@@ -1,14 +1,8 @@
 #include "org_olsr_plugin_pud_PositionUpdate.h"
-#include "util.h"
 
-#include <OlsrdPudWireFormat/wireFormat.h>
+#include "util.h"
 #include <OlsrdPudWireFormat/nodeIdConversion.h>
 
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-#include <arpa/inet.h>
-
 /*
  * OLSR header
  */
index ac39def..4b59ff4 100644 (file)
@@ -1,10 +1,7 @@
 #ifndef _PUD_NODEIDCONVERSION_H_
 #define _PUD_NODEIDCONVERSION_H_
 
-#include "olsr_protocol.h"
-
 #include <OlsrdPudWireFormat/wireFormat.h>
-#include <stddef.h>
 
 void getNodeTypeStringFromOlsr(int ipVersion,
                PudOlsrPositionUpdate * olsrGpsMessage, char * nodeIdTypeBuffer,
index 13ac241..12a66ba 100644 (file)
@@ -1,15 +1,18 @@
 #ifndef _PUD_WIREFORMAT_H_
 #define _PUD_WIREFORMAT_H_
 
+#include "olsr_types.h"
 #include "olsr_protocol.h"
 
-#include <OlsrdPudWireFormat/compiler.h>
-#include <stdint.h>
+#include <stddef.h>
 #include <stdbool.h>
-#include <time.h>
-#include <math.h>
+#include <stdint.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
+#include <math.h>
+#include <string.h>
 #include <assert.h>
+#include <OlsrdPudWireFormat/compiler.h>
 
 /*
  * Version
index 6a7aa3e..a957eaf 100644 (file)
@@ -1,9 +1,8 @@
 #include <OlsrdPudWireFormat/nodeIdConversion.h>
-#include <OlsrdPudWireFormat/compiler.h>
 
-#include <assert.h>
+#include <stdio.h>
+#include <unistd.h>
 #include <arpa/inet.h>
-#include <net/if.h>
 
 /* ************************************************************************
  * Node Information
index 37e8e66..127739b 100644 (file)
@@ -1,5 +1,6 @@
 #include <OlsrdPudWireFormat/wireFormat.h>
-#include <OlsrdPudWireFormat/compiler.h>
+
+#include <time.h>
 
 /* ************************************************************************
  * Validity Time