treewide: order includes alphabetically

Unify the header includes by ordering them alphabetically and always
having local headers in a second group below the global ones (separated
by a newline).

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

diff --git a/bindings/cxx/chip.cpp b/bindings/cxx/chip.cpp
index f4c92ef2b902bd6bb486237a643e84c8c9069981..9b825c7b13a879d9329f75e53a78f74f7ae67f1d 100644 (file)
--- a/bindings/cxx/chip.cpp
+++ b/bindings/cxx/chip.cpp
@@ -5,12 +5,11 @@
  * Copyright (C) 2017-2018 Bartosz Golaszewski <bartekgola@gmail.com>
  */
 
+#include <functional>
 #include <gpiod.hpp>
-
+#include <map>
 #include <system_error>
-#include <functional>
 #include <utility>
-#include <map>
 
 namespace gpiod {
 

diff --git a/bindings/cxx/gpiod.hpp b/bindings/cxx/gpiod.hpp
index fd08b17a3e926fc44556a3f4f0cbb604d0c4cc20..b92597f03316a0a0989b9a517d16e3c481ac5eee 100644 (file)
--- a/bindings/cxx/gpiod.hpp
+++ b/bindings/cxx/gpiod.hpp
@@ -8,13 +8,12 @@
 #ifndef __LIBGPIOD_GPIOD_CXX_HPP__
 #define __LIBGPIOD_GPIOD_CXX_HPP__
 
+#include <bitset>
+#include <chrono>
 #include <gpiod.h>
-
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
-#include <bitset>
-#include <chrono>
 
 namespace gpiod {
 

diff --git a/bindings/cxx/iter.cpp b/bindings/cxx/iter.cpp
index 39e738d7ed997dad6e6ea72b9a527e4e60329f06..8c0b9bad246bc14a4397db4c1f9b594bcab66f71 100644 (file)
--- a/bindings/cxx/iter.cpp
+++ b/bindings/cxx/iter.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <gpiod.hpp>
-
 #include <system_error>
 
 namespace gpiod {

diff --git a/bindings/cxx/line.cpp b/bindings/cxx/line.cpp
index 35fef8bdaef606bd43aef256aadf5a969965dd4e..f8d0e622e4a7f22316fc2dbb503db3028b0c316f 100644 (file)
--- a/bindings/cxx/line.cpp
+++ b/bindings/cxx/line.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <gpiod.hpp>
-
 #include <system_error>
 
 namespace gpiod {

diff --git a/bindings/cxx/line_bulk.cpp b/bindings/cxx/line_bulk.cpp
index e52d33dc549ac5c5bba65b080913aa24a1039d53..3006b656a4c7198ea780cb337ef252bcef41e167 100644 (file)
--- a/bindings/cxx/line_bulk.cpp
+++ b/bindings/cxx/line_bulk.cpp
@@ -6,9 +6,8 @@
  */
 
 #include <gpiod.hpp>
-
-#include <system_error>
 #include <map>
+#include <system_error>
 
 namespace gpiod {
 

diff --git a/include/gpiod.h b/include/gpiod.h
index 0181a3dfd797e0fe66c5627e27f1d4953af67a90..26794782e41a21ffa65ac8370e93d2a5d25b4b4b 100644 (file)
--- a/include/gpiod.h
+++ b/include/gpiod.h
@@ -8,8 +8,8 @@
 #ifndef __LIBGPIOD_GPIOD_H__
 #define __LIBGPIOD_GPIOD_H__
 
-#include <stdlib.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <time.h>
 
 #ifdef __cplusplus

diff --git a/src/lib/core.c b/src/lib/core.c
index 7c4f0bf7fb85bd718e41a3b71d02fbee61584a6e..347f92b35857b447e8f3de6c84ebf08e65cdd1cc 100644 (file)
--- a/src/lib/core.c
+++ b/src/lib/core.c
@@ -7,20 +7,19 @@
 
 /* Low-level, core library code. */
 
+#include <errno.h>
+#include <fcntl.h>
 #include <gpiod.h>
-
+#include <linux/gpio.h>
+#include <poll.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <poll.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <sys/sysmacros.h>
-#include <linux/gpio.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 enum {
        LINE_FREE = 0,

diff --git a/src/lib/ctxless.c b/src/lib/ctxless.c
index 17f255fc06d97fedabc6a93f74623403c38d2164..a0681a5aedd46f3ea6435f43dd779cb44042e4e1 100644 (file)
--- a/src/lib/ctxless.c
+++ b/src/lib/ctxless.c
@@ -7,12 +7,12 @@
 
 /* Implementation of the high-level API. */
 
-#include <gpiod.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
+#include <gpiod.h>
 #include <poll.h>
+#include <stdio.h>
+#include <string.h>
 
 int gpiod_ctxless_get_value(const char *device, unsigned int offset,
                            bool active_low, const char *consumer)

diff --git a/src/lib/helpers.c b/src/lib/helpers.c
index 9beea3a84600b990bc11f2f0b67baba553ce4611..479f370cfff9302a1dcc7abbff1d1d19dcd6c420 100644 (file)
--- a/src/lib/helpers.c
+++ b/src/lib/helpers.c
@@ -10,13 +10,11 @@
  * access to neither the internal library data structures nor the kernel UAPI.
  */
 
+#include <ctype.h>
+#include <errno.h>
 #include <gpiod.h>
-
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <errno.h>
 
 static bool isuint(const char *str)
 {

diff --git a/src/lib/iter.c b/src/lib/iter.c
index 5b3d378467afbcbdb3de8db131d92db0c8363e00..a4d883a166cedc99d9e2882e73c4f2aa87b9eb0f 100644 (file)
--- a/src/lib/iter.c
+++ b/src/lib/iter.c
@@ -7,10 +7,9 @@
 
 /* GPIO chip and line iterators. */
 
+#include <dirent.h>
 #include <gpiod.h>
-
 #include <string.h>
-#include <dirent.h>
 
 struct gpiod_chip_iter {
        struct gpiod_chip **chips;

diff --git a/src/tools/gpiodetect.c b/src/tools/gpiodetect.c
index 98e26cdecae80ac4c20aa14edaf29d7b0d9dceba..aa86568e90126c5f6d65f14abfeaab6de7c087c5 100644 (file)
--- a/src/tools/gpiodetect.c
+++ b/src/tools/gpiodetect.c
@@ -5,12 +5,12 @@
  * Copyright (C) 2017-2018 Bartosz Golaszewski <bartekgola@gmail.com>
  */
 
+#include <getopt.h>
 #include <gpiod.h>
-#include "tools-common.h"
-
 #include <stdio.h>
 #include <string.h>
-#include <getopt.h>
+
+#include "tools-common.h"
 
 static const struct option longopts[] = {
        { "help",       no_argument,    NULL,   'h' },

diff --git a/src/tools/gpiofind.c b/src/tools/gpiofind.c
index 76f088991e7f9c572a15cc235ce01439e23dfc58..35cc491753a765397b3a3b4b2e2f3da218681f55 100644 (file)
--- a/src/tools/gpiofind.c
+++ b/src/tools/gpiofind.c
@@ -5,12 +5,12 @@
  * Copyright (C) 2017-2018 Bartosz Golaszewski <bartekgola@gmail.com>
  */
 
+#include <getopt.h>
 #include <gpiod.h>
-#include "tools-common.h"
-
 #include <stdio.h>
 #include <string.h>
-#include <getopt.h>
+
+#include "tools-common.h"
 
 static const struct option longopts[] = {
        { "help",       no_argument,    NULL,   'h' },

diff --git a/src/tools/gpioget.c b/src/tools/gpioget.c
index d942c075c74f97dec03c9fc3878830bebb8ebd1c..196ebeb61e7628a60438441a87e6e5e664f29bb9 100644 (file)
--- a/src/tools/gpioget.c
+++ b/src/tools/gpioget.c
@@ -5,13 +5,13 @@
  * Copyright (C) 2017-2018 Bartosz Golaszewski <bartekgola@gmail.com>
  */
 
+#include <getopt.h>
 #include <gpiod.h>
-#include "tools-common.h"
-
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include <getopt.h>
-#include <limits.h>
+
+#include "tools-common.h"
 
 static const struct option longopts[] = {
        { "help",       no_argument,    NULL,   'h' },

diff --git a/src/tools/gpioinfo.c b/src/tools/gpioinfo.c
index 73dc4e54b0a6eb130270ab273b28ec4c59ea35b7..bb17262b84b244a0f321b1e4e7031bb4b0e2a00e 100644 (file)
--- a/src/tools/gpioinfo.c
+++ b/src/tools/gpioinfo.c
@@ -5,14 +5,14 @@
  * Copyright (C) 2017-2018 Bartosz Golaszewski <bartekgola@gmail.com>
  */
 
+#include <errno.h>
+#include <getopt.h>
 #include <gpiod.h>
-#include "tools-common.h"
-
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdarg.h>
-#include <getopt.h>
-#include <errno.h>
+
+#include "tools-common.h"
 
 typedef bool (*is_set_func)(struct gpiod_line *);
 

diff --git a/src/tools/gpiomon.c b/src/tools/gpiomon.c
index 5dfb388683da97b0a6efa608aa014b2a1f2e3023..0d5fcbde4f53d129811f31bff55acd914c097791 100644 (file)
--- a/src/tools/gpiomon.c
+++ b/src/tools/gpiomon.c
@@ -5,19 +5,19 @@
  * Copyright (C) 2017-2018 Bartosz Golaszewski <bartekgola@gmail.com>
  */
 
+#include <errno.h>
+#include <getopt.h>
 #include <gpiod.h>
-#include "tools-common.h"
-
+#include <limits.h>
+#include <poll.h>
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
-#include <getopt.h>
-#include <signal.h>
 #include <sys/signalfd.h>
-#include <limits.h>
-#include <poll.h>
-#include <errno.h>
 #include <unistd.h>
 
+#include "tools-common.h"
+
 static const struct option longopts[] = {
        { "help",               no_argument,            NULL,   'h' },
        { "version",            no_argument,            NULL,   'v' },

diff --git a/src/tools/gpioset.c b/src/tools/gpioset.c
index bbd9fd1bcc5b31abb0a56c3f9f951d20219418fd..d9977a7f9b641f5efbc135ad4def262287b150ca 100644 (file)
--- a/src/tools/gpioset.c
+++ b/src/tools/gpioset.c
@@ -5,20 +5,20 @@
  * Copyright (C) 2017-2018 Bartosz Golaszewski <bartekgola@gmail.com>
  */
 
+#include <errno.h>
 #include <gpiod.h>
-#include "tools-common.h"
-
+#include <getopt.h>
+#include <limits.h>
+#include <poll.h>
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
-#include <getopt.h>
 #include <sys/select.h>
-#include <signal.h>
 #include <sys/signalfd.h>
-#include <poll.h>
-#include <limits.h>
-#include <errno.h>
 #include <unistd.h>
 
+#include "tools-common.h"
+
 static const struct option longopts[] = {
        { "help",               no_argument,            NULL,   'h' },
        { "version",            no_argument,            NULL,   'v' },

diff --git a/src/tools/tools-common.c b/src/tools/tools-common.c
index 4a7a7764e932a58fb2d7012ef90b0ba598b86e3c..527be1eb086b451c1916d9f80b54f1c661c99fab 100644 (file)
--- a/src/tools/tools-common.c
+++ b/src/tools/tools-common.c
@@ -7,15 +7,15 @@
 
 /* Common code for GPIO tools. */
 
+#include <errno.h>
 #include <gpiod.h>
-#include "tools-common.h"
-
-#include <stdlib.h>
+#include <libgen.h>
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
-#include <libgen.h>
-#include <errno.h>
+
+#include "tools-common.h"
 
 const char * get_progname(void)
 {

diff --git a/tests/gpiod-test.c b/tests/gpiod-test.c
index 8083f1cb9970d33c77aa6a5ab378e3aeabdeb470..c67314332e41cd9ac4817a8368d4af80df99dd2d 100644 (file)
--- a/tests/gpiod-test.c
+++ b/tests/gpiod-test.c
@@ -5,27 +5,27 @@
  * Copyright (C) 2017-2018 Bartosz Golaszewski <bartekgola@gmail.com>
  */
 
-#include "gpiod-test.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
+#include <ctype.h>
 #include <errno.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <poll.h>
-#include <signal.h>
 #include <libgen.h>
 #include <libkmod.h>
 #include <libudev.h>
+#include <poll.h>
 #include <pthread.h>
 #include <regex.h>
-#include <ctype.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/signalfd.h>
 #include <sys/time.h>
-#include <sys/utsname.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 #include <sys/wait.h>
-#include <sys/signalfd.h>
+#include <unistd.h>
+
+#include "gpiod-test.h"
 
 #define NORETURN       __attribute__((noreturn))
 #define MALLOC         __attribute__((malloc))

diff --git a/tests/tests-chip.c b/tests/tests-chip.c
index e199ce79950a6ba8437e0ba0231d2804be63d0c2..0acb5c7b25ccf123465512a76b29b4959ba469a0 100644 (file)
--- a/tests/tests-chip.c
+++ b/tests/tests-chip.c
@@ -7,10 +7,10 @@
 
 /* Test cases for GPIO chip handling. */
 
-#include "gpiod-test.h"
-
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+
+#include "gpiod-test.h"
 
 static void chip_open_good(void)
 {

diff --git a/tests/tests-ctxless.c b/tests/tests-ctxless.c
index 4daab48b85416015467afeebbfc485a30b96a49c..638274fd10c4b743ae514fc2ef07f351db2fc223 100644 (file)
--- a/tests/tests-ctxless.c
+++ b/tests/tests-ctxless.c
@@ -7,10 +7,10 @@
 
 /* Test cases for the high-level API. */
 
-#include "gpiod-test.h"
-
 #include <errno.h>
 
+#include "gpiod-test.h"
+
 static void ctxless_set_get_value(void)
 {
        int rv;

diff --git a/tests/tests-event.c b/tests/tests-event.c
index f91d80fe6c731c11e71ac50d6470f97fc93cd009..93e53a4da89e63b42cb935272d03d3dc00d51eb0 100644 (file)
--- a/tests/tests-event.c
+++ b/tests/tests-event.c
@@ -7,10 +7,10 @@
 
 /* Test cases for GPIO line events. */
 
-#include "gpiod-test.h"
-
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
+
+#include "gpiod-test.h"
 
 static void event_rising_edge_good(void)
 {

diff --git a/tests/tests-gpiodetect.c b/tests/tests-gpiodetect.c
index d7e7f20e09822f1bdf5b9232a5a06935eab9dce7..bd5eeb1d0ff1a56e7e3e9a9065998e67fca32487 100644 (file)
--- a/tests/tests-gpiodetect.c
+++ b/tests/tests-gpiodetect.c
@@ -7,10 +7,10 @@
 
 /* Test cases for the gpiodetect program. */
 
-#include "gpiod-test.h"
-
 #include <stdio.h>
 
+#include "gpiod-test.h"
+
 static void gpiodetect_simple(void)
 {
        test_tool_run("gpiodetect", (char *)NULL);

diff --git a/tests/tests-gpiofind.c b/tests/tests-gpiofind.c
index a5a23fe9efe036a5c737a4c045822ea6ada43a3a..6d8e12ad2a25ab06bd055e5a140206e6b3d59863 100644 (file)
--- a/tests/tests-gpiofind.c
+++ b/tests/tests-gpiofind.c
@@ -7,10 +7,10 @@
 
 /* Test cases for the gpiofind program. */
 
-#include "gpiod-test.h"
-
 #include <stdio.h>
 
+#include "gpiod-test.h"
+
 static void gpiofind_found(void)
 {
        test_tool_run("gpiofind", "gpio-mockup-B-7", (char *)NULL);

diff --git a/tests/tests-gpioinfo.c b/tests/tests-gpioinfo.c
index a7e592c3f6a4ae5cf7a66d365e2aa19bcec27d71..162896f82aea9d1a1d88b01c164a787ed83ee44a 100644 (file)
--- a/tests/tests-gpioinfo.c
+++ b/tests/tests-gpioinfo.c
@@ -7,10 +7,10 @@
 
 /* Test cases for the gpioinfo program. */
 
-#include "gpiod-test.h"
-
 #include <stdio.h>
 
+#include "gpiod-test.h"
+
 static void gpioinfo_dump_all_chips(void)
 {
        test_tool_run("gpioinfo", (char *)NULL);

diff --git a/tests/tests-gpiomon.c b/tests/tests-gpiomon.c
index 615b7d3d3b8c9ad01f810fbb629660b06d4ff110..fd2139151882760adb4cfa1755e0717881f61227 100644 (file)
--- a/tests/tests-gpiomon.c
+++ b/tests/tests-gpiomon.c
@@ -7,11 +7,11 @@
 
 /* Test cases for the gpiomon program. */
 
-#include "gpiod-test.h"
-
 #include <signal.h>
 #include <unistd.h>
 
+#include "gpiod-test.h"
+
 static void gpiomon_single_rising_edge_event(void)
 {
        test_tool_run("gpiomon", "--rising-edge", "--num-events=1",

diff --git a/tests/tests-gpioset.c b/tests/tests-gpioset.c
index 64ca99a8de7968650779dca0ab1afabc1ab85be3..ab7b5147c58423282d4753eace79e0f59a3496cc 100644 (file)
--- a/tests/tests-gpioset.c
+++ b/tests/tests-gpioset.c
@@ -7,11 +7,11 @@
 
 /* Test cases for the gpioset program. */
 
-#include "gpiod-test.h"
-
 #include <signal.h>
 #include <unistd.h>
 
+#include "gpiod-test.h"
+
 static void gpioset_set_lines_and_exit(void)
 {
        unsigned int offsets[8];

diff --git a/tests/tests-line.c b/tests/tests-line.c
index 138538173c645b55b372d6de263dffb80f7cbd5e..32b575aa4865859a62aa5b956cc4044e09c7f37f 100644 (file)
--- a/tests/tests-line.c
+++ b/tests/tests-line.c
@@ -7,10 +7,10 @@
 
 /* GPIO line test cases. */
 
-#include "gpiod-test.h"
-
 #include <errno.h>
 
+#include "gpiod-test.h"
+
 static void line_request_output(void)
 {
        TEST_CLEANUP_CHIP struct gpiod_chip *chip = NULL;

diff --git a/tests/tests-misc.c b/tests/tests-misc.c
index 89ec64a6d93079d2cdd9ef2b06220cbc1b799973..99a80a793dd4e9a3277dbccc1648e8555435c6b4 100644 (file)
--- a/tests/tests-misc.c
+++ b/tests/tests-misc.c
@@ -7,10 +7,10 @@
 
 /* Misc test cases. */
 
-#include "gpiod-test.h"
-
 #include <errno.h>
 
+#include "gpiod-test.h"
+
 static void version_string(void)
 {
        /* Check that gpiod_version_string() returns an actual string. */