From 7cbd849648d41c8b55b5b5fe618b8d20e75db868 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sat, 17 May 2025 12:38:59 -0600 Subject: Sort+align #includes --- cmd/sbc_harness/fs_harness_uptime_txt.c | 4 ++-- cmd/sbc_harness/main.c | 8 ++++---- cmd/sbc_harness/usb_keyboard.c | 2 +- lib9p/core.c | 4 ++-- lib9p/srv.c | 2 +- lib9p/tests/test_server/fs_flush.h | 2 +- lib9p/tests/test_server/fs_shutdown.h | 2 +- lib9p/tests/test_server/fs_whoami.h | 2 +- lib9p/tests/test_server/main.c | 6 +++--- lib9p/tests/testclient-sess.c | 8 ++++---- libcr/include/libcr/coroutine.h | 2 +- libcr_ipc/chan.c | 2 +- libcr_ipc/include/libcr_ipc/chan.h | 2 +- libcr_ipc/rpc.c | 2 +- libdhcp/dhcp_client.c | 2 +- libhw_cr/host_include/libhw/host_alarmclock.h | 4 ++-- libhw_cr/host_util.h | 4 ++-- libhw_cr/rp2040_gpioirq.c | 2 +- libhw_cr/w5500.c | 2 +- libhw_generic/include/libhw/generic/alarmclock.h | 2 +- libhw_generic/include/libhw/generic/net.h | 2 +- libmisc/include/libmisc/hash.h | 4 ++-- libmisc/include/libmisc/log.h | 4 ++-- libmisc/log.c | 2 +- libmisc/map.c | 2 +- libmisc/tests/test_rand.c | 2 +- libusb/usb_common.c | 10 +++++----- 27 files changed, 45 insertions(+), 45 deletions(-) diff --git a/cmd/sbc_harness/fs_harness_uptime_txt.c b/cmd/sbc_harness/fs_harness_uptime_txt.c index 97246ea..339b410 100644 --- a/cmd/sbc_harness/fs_harness_uptime_txt.c +++ b/cmd/sbc_harness/fs_harness_uptime_txt.c @@ -5,9 +5,9 @@ */ #include -#include #include /* for heap_alloc(), free() */ -#include /* for fmt_snprint() */ +#include /* for fmt_snprint() */ +#include #include "fs_harness_uptime_txt.h" diff --git a/cmd/sbc_harness/main.c b/cmd/sbc_harness/main.c index 143bae0..71c39b2 100644 --- a/cmd/sbc_harness/main.c +++ b/cmd/sbc_harness/main.c @@ -8,8 +8,8 @@ #include /* libc: for strlen() */ /* pico-sdk */ -#include /* pico-sdk:pico_stdio_uart: for stdio_uart_init() */ #include /* pico-sdk:hardware_flash: for flash_get_unique_id() */ +#include /* pico-sdk:pico_stdio_uart: for stdio_uart_init() */ /* our OS */ #include @@ -19,9 +19,9 @@ #include /* our application libraries */ +#include #include #include -#include #include /* our utility libraries */ @@ -30,10 +30,10 @@ #include /* local headers */ -#include "usb_keyboard.h" -#include "static.h" #include "fs_harness_flash_bin.h" #include "fs_harness_uptime_txt.h" +#include "static.h" +#include "usb_keyboard.h" /* configuration **************************************************************/ diff --git a/cmd/sbc_harness/usb_keyboard.c b/cmd/sbc_harness/usb_keyboard.c index f0726cb..fc273eb 100644 --- a/cmd/sbc_harness/usb_keyboard.c +++ b/cmd/sbc_harness/usb_keyboard.c @@ -6,9 +6,9 @@ #include +#include #include /* for TUD_ENDPOINT_IN */ #include -#include #include "usb_keyboard.h" diff --git a/lib9p/core.c b/lib9p/core.c index 464b31d..995808f 100644 --- a/lib9p/core.c +++ b/lib9p/core.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include /* for va_* */ -#include /* for strlen(), strnlen(), strncpy(), memcmp(), memset() */ +#include /* for va_* */ +#include /* for strlen(), strnlen(), strncpy(), memcmp(), memset() */ #include /* for assert() */ #include /* for uint32le_decode() */ diff --git a/lib9p/srv.c b/lib9p/srv.c index cd5d3fb..bde77eb 100644 --- a/lib9p/srv.c +++ b/lib9p/srv.c @@ -15,11 +15,11 @@ #include #include #include +#include #include #include #include #include -#include #define LOG_NAME 9P_SRV #include diff --git a/lib9p/tests/test_server/fs_flush.h b/lib9p/tests/test_server/fs_flush.h index a509c4a..2b08850 100644 --- a/lib9p/tests/test_server/fs_flush.h +++ b/lib9p/tests/test_server/fs_flush.h @@ -7,8 +7,8 @@ #ifndef _LIB9P_TESTS_TEST_SERVER_FS_FLUSH_H_ #define _LIB9P_TESTS_TEST_SERVER_FS_FLUSH_H_ -#include #include +#include struct flush_file { char *name; diff --git a/lib9p/tests/test_server/fs_shutdown.h b/lib9p/tests/test_server/fs_shutdown.h index 65956db..6b8683c 100644 --- a/lib9p/tests/test_server/fs_shutdown.h +++ b/lib9p/tests/test_server/fs_shutdown.h @@ -7,8 +7,8 @@ #ifndef _LIB9P_TESTS_TEST_SERVER_FS_SHUTDOWN_H_ #define _LIB9P_TESTS_TEST_SERVER_FS_SHUTDOWN_H_ -#include #include +#include struct shutdown_file { char *name; diff --git a/lib9p/tests/test_server/fs_whoami.h b/lib9p/tests/test_server/fs_whoami.h index 0d3d311..5e1aee9 100644 --- a/lib9p/tests/test_server/fs_whoami.h +++ b/lib9p/tests/test_server/fs_whoami.h @@ -7,8 +7,8 @@ #ifndef _LIB9P_TESTS_TEST_SERVER_FS_WHOAMI_H_ #define _LIB9P_TESTS_TEST_SERVER_FS_WHOAMI_H_ -#include #include +#include struct whoami_file { char *name; diff --git a/lib9p/tests/test_server/main.c b/lib9p/tests/test_server/main.c index 4caff16..f2a73bf 100644 --- a/lib9p/tests/test_server/main.c +++ b/lib9p/tests/test_server/main.c @@ -4,24 +4,24 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include #include +#include #include #include /* for atoi() */ #include #include -#include #include +#include #include #include #include #include -#include "static.h" #include "fs_flush.h" #include "fs_shutdown.h" #include "fs_whoami.h" +#include "static.h" /* configuration **************************************************************/ diff --git a/lib9p/tests/testclient-sess.c b/lib9p/tests/testclient-sess.c index 7cb7f97..eef9d2c 100644 --- a/lib9p/tests/testclient-sess.c +++ b/lib9p/tests/testclient-sess.c @@ -8,14 +8,14 @@ #include #include #include /* for struct sockaddr{,_in} */ -#include /* for atoi() */ +#include /* for atoi() */ #include /* for socket(), connect() */ -#include /* for writev() */ -#include /* for read() */ +#include /* for writev() */ +#include /* for read() */ +#include #include #include -#include #define MAX_MSG_SIZE (8*1024) diff --git a/libcr/include/libcr/coroutine.h b/libcr/include/libcr/coroutine.h index f72dc96..f566074 100644 --- a/libcr/include/libcr/coroutine.h +++ b/libcr/include/libcr/coroutine.h @@ -26,7 +26,7 @@ #ifndef _LIBCR_COROUTINE_H_ #define _LIBCR_COROUTINE_H_ -#include /* for size_t */ +#include /* for size_t */ /* Configuration **************************************************************/ diff --git a/libcr_ipc/chan.c b/libcr_ipc/chan.c index b7ecfc8..b52dab1 100644 --- a/libcr_ipc/chan.c +++ b/libcr_ipc/chan.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include /* for memcpy() */ +#include /* for memcpy() */ #include /* for cid_t, cr_* */ #include diff --git a/libcr_ipc/include/libcr_ipc/chan.h b/libcr_ipc/include/libcr_ipc/chan.h index 09d269f..1755a97 100644 --- a/libcr_ipc/include/libcr_ipc/chan.h +++ b/libcr_ipc/include/libcr_ipc/chan.h @@ -7,7 +7,7 @@ #ifndef _LIBCR_IPC_CHAN_H_ #define _LIBCR_IPC_CHAN_H_ -#include /* for size_t */ +#include /* for size_t */ #include /* for DLIST_DECLARE() */ #include diff --git a/libcr_ipc/rpc.c b/libcr_ipc/rpc.c index fcf51ba..b1b7674 100644 --- a/libcr_ipc/rpc.c +++ b/libcr_ipc/rpc.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include /* for memcpy() */ +#include /* for memcpy() */ #include /* for cid_t, cr_* */ #include diff --git a/libdhcp/dhcp_client.c b/libdhcp/dhcp_client.c index 8e8361d..bf88961 100644 --- a/libdhcp/dhcp_client.c +++ b/libdhcp/dhcp_client.c @@ -86,8 +86,8 @@ #include /* for strlen(), memcpy(), memset() */ -#include #include +#include #define LOG_NAME DHCP #include diff --git a/libhw_cr/host_include/libhw/host_alarmclock.h b/libhw_cr/host_include/libhw/host_alarmclock.h index 3cc43c1..2ddb054 100644 --- a/libhw_cr/host_include/libhw/host_alarmclock.h +++ b/libhw_cr/host_include/libhw/host_alarmclock.h @@ -7,10 +7,10 @@ #ifndef _LIBHW_HOST_ALARMCLOCK_H_ #define _LIBHW_HOST_ALARMCLOCK_H_ -#include /* for clockid_t, timer_t */ +#include /* for clockid_t, timer_t */ -#include #include +#include struct hostclock { clockid_t clock_id; diff --git a/libhw_cr/host_util.h b/libhw_cr/host_util.h index 02c04dc..3f0a671 100644 --- a/libhw_cr/host_util.h +++ b/libhw_cr/host_util.h @@ -7,8 +7,8 @@ #ifndef _LIBHW_CR_HOST_UTIL_H_ #define _LIBHW_CR_HOST_UTIL_H_ -#include /* for struct timespec */ -#include /* for struct timeval */ +#include /* for struct timeval */ +#include /* for struct timespec */ #include /* for {X}S_PER_S */ diff --git a/libhw_cr/rp2040_gpioirq.c b/libhw_cr/rp2040_gpioirq.c index 5b3d616..ecbdb04 100644 --- a/libhw_cr/rp2040_gpioirq.c +++ b/libhw_cr/rp2040_gpioirq.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ +#include /* for irq_set_exclusive_handler() */ #include /* for io_bank0_hw */ -#include /* for irq_set_exclusive_handler() */ #include diff --git a/libhw_cr/w5500.c b/libhw_cr/w5500.c index 77edc49..b7c2ad1 100644 --- a/libhw_cr/w5500.c +++ b/libhw_cr/w5500.c @@ -69,8 +69,8 @@ /* TODO: Write a to avoid w5500.c being * pico-sdk-specific. */ -#include /* pico-sdk:hardware_gpio */ #include "rp2040_gpioirq.h" +#include /* pico-sdk:hardware_gpio */ #include /* for cr_yield() */ diff --git a/libhw_generic/include/libhw/generic/alarmclock.h b/libhw_generic/include/libhw/generic/alarmclock.h index 6ce2513..7f603cb 100644 --- a/libhw_generic/include/libhw/generic/alarmclock.h +++ b/libhw_generic/include/libhw/generic/alarmclock.h @@ -7,7 +7,7 @@ #ifndef _LIBHW_GENERIC_ALARMCLOCK_H_ #define _LIBHW_GENERIC_ALARMCLOCK_H_ -#include /* for uint{n}_t and UINT{n}_C */ +#include /* for uint{n}_t and UINT{n}_C */ #include #include diff --git a/libhw_generic/include/libhw/generic/net.h b/libhw_generic/include/libhw/generic/net.h index 95d32da..04d1082 100644 --- a/libhw_generic/include/libhw/generic/net.h +++ b/libhw_generic/include/libhw/generic/net.h @@ -11,8 +11,8 @@ #include /* for uint{n}_t} */ #include /* for ssize_t */ -#include #include +#include /* Errnos *********************************************************************/ diff --git a/libmisc/include/libmisc/hash.h b/libmisc/include/libmisc/hash.h index 91e6b10..58a895f 100644 --- a/libmisc/include/libmisc/hash.h +++ b/libmisc/include/libmisc/hash.h @@ -1,14 +1,14 @@ /* libmisc/hash.h - General-purpose hash utilities * - * Copyright (C) 2024 Luke T. Shumaker + * Copyright (C) 2024-2025 Luke T. Shumaker * SPDX-License-Identifier: AGPL-3.0-or-later */ #ifndef _LIBMISC_HASH_H_ #define _LIBMISC_HASH_H_ -#include /* for uint{n}_t */ #include /* for size_t */ +#include /* for uint{n}_t */ /* djb2 hash */ typedef uint32_t hash_t; diff --git a/libmisc/include/libmisc/log.h b/libmisc/include/libmisc/log.h index e6dfb52..c40b642 100644 --- a/libmisc/include/libmisc/log.h +++ b/libmisc/include/libmisc/log.h @@ -9,9 +9,9 @@ #include /* for uint8_t */ -#include -#include #include +#include +#include #ifdef NDEBUG #define _LOG_NDEBUG 1 diff --git a/libmisc/log.c b/libmisc/log.c index da4c92e..7e917c6 100644 --- a/libmisc/log.c +++ b/libmisc/log.c @@ -8,8 +8,8 @@ #include /* for static_assert() */ -#include #include +#include struct log_stdout {}; LO_IMPLEMENTATION_H(fmt_dest, struct log_stdout, log_stdout); diff --git a/libmisc/map.c b/libmisc/map.c index cc34c16..d1b2a57 100644 --- a/libmisc/map.c +++ b/libmisc/map.c @@ -7,9 +7,9 @@ #include #include -#include #include #include +#include #include #define FLAG_ITER (UINT8_C(1)<<0) diff --git a/libmisc/tests/test_rand.c b/libmisc/tests/test_rand.c index ecb1c49..1cfbd65 100644 --- a/libmisc/tests/test_rand.c +++ b/libmisc/tests/test_rand.c @@ -6,8 +6,8 @@ #include -#include #include +#include #include "test.h" diff --git a/libusb/usb_common.c b/libusb/usb_common.c index 9d438dc..9b222d6 100644 --- a/libusb/usb_common.c +++ b/libusb/usb_common.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include /* for uint{n}_t types */ -#include /* for size_t */ -#include /* memcpy() */ -#include /* for malloc(), realloc(), reallocarray() */ +#include /* for size_t */ +#include /* for uint{n}_t types */ +#include /* for malloc(), realloc(), reallocarray() */ +#include /* memcpy() */ -#include /* for various tusb_*_t types */ +#include /* for various tusb_*_t types */ #include -- cgit v1.2.3-2-g168b