src: reorder includes alphabetically

Reorder includes alphabetically which makes them easier to follow and find
duplicates.

Signed-off-by: Álvaro Fernández Rojas <[email protected]>

diff --git a/src/config.c b/src/config.c
index d6bbf17e7daed6ae7de1bb77bfbd4adc2a3deffb..61d5532b860bbc349f0a5ec4c507410abe56b4c6 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -59,11 +59,11 @@
  *
  */
 
-#include <string.h>
-#include <resolv.h>
-#include <limits.h>
 #include <arpa/inet.h>
+#include <limits.h>
+#include <resolv.h>
 #include <stdlib.h>
+#include <string.h>
 #include <syslog.h>
 
 #include "config.h"

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 03662704c91d34e581e51681daf1484e4505d18c..1443e4b4ae8cef52efd4e67b95e3071b7cc64d3c 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -13,33 +13,31 @@
  *
  */
 
-#include <time.h>
-#include <fcntl.h>
+#include <arpa/inet.h>
+#include <ctype.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <inttypes.h>
-#include <stdlib.h>
-#include <signal.h>
+#include <libubox/md5.h>
 #include <limits.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <net/ethernet.h>
 #include <resolv.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <syslog.h>
-#include <stdbool.h>
-#include <ctype.h>
-#include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-
-#include <net/if.h>
-#include <net/ethernet.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
 
-#include <libubox/md5.h>
 #include "config.h"
 #include "odhcp6c.h"
 
-
 #define ALL_DHCPV6_RELAYS {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
                0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02}}}
 #define DHCPV6_CLIENT_PORT 546

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index cf786e43e38a060842470d58b912b1c9f32c216d..91f429c910a6af45bde27630f7c3733d32725db4 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -13,27 +13,26 @@
  *
  */
 
-#include <time.h>
-#include <errno.h>
+#include <arpa/inet.h>
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <linux/if_addr.h>
+#include <net/if.h>
+#include <poll.h>
 #include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <syslog.h>
 #include <signal.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include <stdbool.h>
-
-#include <net/if.h>
+#include <syslog.h>
 #include <sys/syscall.h>
-#include <poll.h>
-#include <arpa/inet.h>
-#include <linux/if_addr.h>
+#include <time.h>
+#include <unistd.h>
 
 #include "config.h"
 #include "odhcp6c.h"

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index a3d9b547da6d39ab8820f63f5b908d4bb8f17b42..7df4d14bd9a10d8c001742fb11ec678287e39606 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -12,10 +12,12 @@
  * GNU General Public License for more details.
  *
  */
+
 #pragma once
-#include <stdint.h>
-#include <stdbool.h>
+
 #include <netinet/in.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 #define _unused __attribute__((unused))
 #define _packed __attribute__((packed))

diff --git a/src/ra.c b/src/ra.c
index 01a8b721d719f0e0e545a3ca7471c47490597969..99cbc9e3f32e20fa2155c23a386014cd2fab8222 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -13,27 +13,28 @@
  *
  */
 
+#include <alloca.h>
+#include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
+#include <linux/rtnetlink.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <resolv.h>
 #include <signal.h>
-#include <string.h>
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 #include <syslog.h>
-#include <unistd.h>
-#include <resolv.h>
-#include <alloca.h>
-
-#include <net/if.h>
-#include <arpa/inet.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
+#include <unistd.h>
 
-#include <linux/rtnetlink.h>
+#include "odhcp6c.h"
+#include "ra.h"
 
 #ifndef SOL_NETLINK
 #define SOL_NETLINK 270
@@ -47,9 +48,6 @@
 #define IFF_LOWER_UP 0x10000
 #endif
 
-#include "odhcp6c.h"
-#include "ra.h"
-
 static bool nocarrier = false;
 static bool ptp_link = false;
 

diff --git a/src/ra.h b/src/ra.h
index 9acc8cd971a28a08859a400f454017ebce46b963..34d8cb46b6889a41a1bcda8b49bed6484fb06f1d 100644 (file)
--- a/src/ra.h
+++ b/src/ra.h
@@ -12,8 +12,13 @@
  * GNU General Public License for more details.
  *
  */
+
 #pragma once
 
+#include <netinet/in.h>
+#include <stdbool.h>
+#include <stdint.h>
+
 #define ALL_IPV6_NODES {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}}}
 

diff --git a/src/script.c b/src/script.c
index eaa2fb3af37463bf0cfa484d60cad46e85e75dd7..fba4cde98f16504ed1947c871a6eafc0222a9493 100644 (file)
--- a/src/script.c
+++ b/src/script.c
@@ -13,18 +13,18 @@
  *
  */
 
-#include <stdio.h>
+#include <arpa/inet.h>
+#include <inttypes.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <resolv.h>
+#include <signal.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <signal.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <arpa/inet.h>
 #include <sys/wait.h>
-#include <netinet/in.h>
+#include <unistd.h>
 
 #include "odhcp6c.h"
 

diff --git a/src/ubus.c b/src/ubus.c
index f0758cd1baf62f28a31b7a706a1a84e2343e2daf..af7348964c6eab0f9cf268c0073db6d5f4f53610 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -59,16 +59,17 @@
  *
  */
 
-#include <sys/types.h>
 #include <arpa/inet.h>
+#include <inttypes.h>
+#include <libubox/blobmsg.h>
 #include <resolv.h>
 #include <stdio.h>
+#include <sys/types.h>
 #include <syslog.h>
-#include <inttypes.h>
-#include <libubox/blobmsg.h>
 
-#include "ubus.h"
 #include "config.h"
+#include "odhcp6c.h"
+#include "ubus.h"
 
 #define CHECK(stmt) \
        do { \