From b8954c679ba5134af359ecaa3ec9a28ef36111fd Mon Sep 17 00:00:00 2001
From: Thomas Voss <mail@thomasvoss.com>
Date: Thu, 28 Dec 2023 20:11:48 +0100
Subject: More shuffling

---
 cbs.h | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/cbs.h b/cbs.h
index c282c99..3a24b30 100644
--- a/cbs.h
+++ b/cbs.h
@@ -56,28 +56,6 @@
 #	define ATTR_FMT
 #endif
 
-/* Get the number of items in the array a */
-#define lengthof(a) (sizeof(a) / sizeof(*(a)))
-
-/* Clear (but not free) the command c.  Useful for reusing the same command
-   struct to minimize allocations. */
-#define cmdclr(c) \
-	do { \
-		(c)->len = 0; \
-		*(c)->argv = NULL; \
-	} while (0)
-
-/* Struct representing a CLI command that various functions act on.  You will
-   basically always want to zero-initialize variables of this type before use.
-
-   After executing a command, you can reuse the already allocated buffer this
-   command holds by calling cmdclr().  When you’re really done with an object of
-   this type, remember to call free() on .argv. */
-struct cmd {
-	char **argv;
-	size_t len, cap;
-};
-
 /* Internal global versions of argc and argv, so our functions and macros can
    access them from anywhere. */
 static int __cbs_argc;
@@ -102,6 +80,20 @@ ATTR_FMT noreturn static void diex(const char *, ...);
    be the first thing called in main() with argc and argv passed. */
 static void cbsinit(int, char **);
 
+/* Get the number of items in the array a */
+#define lengthof(a) (sizeof(a) / sizeof(*(a)))
+
+/* Struct representing a CLI command that various functions act on.  You will
+   basically always want to zero-initialize variables of this type before use.
+
+   After executing a command, you can reuse the already allocated buffer this
+   command holds by calling cmdclr().  When you’re really done with an object of
+   this type, remember to call free() on .argv. */
+struct cmd {
+	char **argv;
+	size_t len, cap;
+};
+
 /* cmdadd() adds the variadic string arguments to the given command.
    Alternatively, the cmdaddv() function adds the n strings pointed to by p to
    the given command. */
@@ -109,6 +101,14 @@ static void cmdaddv(struct cmd *, char **p, size_t n);
 #define cmdadd(cmd, ...) \
 	cmdaddv(cmd, ((char *[]){__VA_ARGS__}), lengthof(((char *[]){__VA_ARGS__})))
 
+/* Clear (but not free) the command c.  Useful for reusing the same command
+   struct to minimize allocations. */
+#define cmdclr(c) \
+	do { \
+		(c)->len = 0; \
+		*(c)->argv = NULL; \
+	} while (0)
+
 /* The cmdexec() function executes the given command and waits for it to
    terminate, returning its exit code.  The cmdexeca() function executes the
    given command and returns immediately, returning its process ID.
-- 
cgit v1.2.3