nvme-cli: clean up and order includes across all source files

fabrics.c

@@ -19,25 +19,26 @@
  * Fabrics specification standard.
  */
 
+#include <dirent.h>
 #include <errno.h>
-#include <getopt.h>
 #include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <dirent.h>
+#include <getopt.h>
 #include <inttypes.h>
 #include <libgen.h>
-#include <sys/stat.h>
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <syslog.h>
 #include <time.h>
+#include <unistd.h>
 
-#include <sys/types.h>
 #include <linux/types.h>
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <libnvme.h>
 
 #include "common.h"

libnvme/examples/discover-loop.c

@@ -14,14 +14,15 @@
  */
 #define __SANE_USERSPACE_TYPES__
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <libnvme.h>
 
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
 static void print_discover_log(struct nvmf_discovery_log *log)
 {
 	int i, numrec = le64_to_cpu(log->numrec);

libnvme/examples/mi-conf.c

@@ -18,13 +18,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libnvme-mi.h>
-
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 
 #include <dbus/dbus.h>
 
+#include <libnvme-mi.h>
+
 #define MCTP_DBUS_NAME "au.com.codeconstruct.MCTP1"
 #define MCTP_DBUS_PATH "/au/com/codeconstruct/mctp1"
 #define MCTP_DBUS_EP_IFACE "au.com.codeconstruct.MCTP.Endpoint1"

libnvme/examples/mi-mctp-ae.c

@@ -10,19 +10,20 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
+#include <poll.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h> // for usleep
 
-#include <libnvme-mi.h>
-#include <poll.h>
+#include <sys/select.h>
 
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
-#include <sys/select.h>
+
+#include <libnvme-mi.h>
 
 struct app_userdata {
 	uint32_t count;

libnvme/examples/mi-mctp-csi-test.c

@@ -11,17 +11,17 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <pthread.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <pthread.h>
-
-#include <libnvme-mi.h>
 
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 
+#include <libnvme-mi.h>
+
 void fhexdump(FILE *fp, const unsigned char *buf, int len)
 {
 	const int row_len = 16;

libnvme/examples/mi-mctp.c

@@ -13,16 +13,16 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 
-#include <libnvme-mi.h>
-
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 
+#include <libnvme-mi.h>
+
 static void show_port_pcie(struct nvme_mi_read_port_info *port)
 {
 	printf("    PCIe max payload: 0x%x\n", 0x80 << port->pcie.mps);

libnvme/examples/telemetry-listen.c

@@ -11,19 +11,22 @@
  * is observed with controller telemetry data, read the log and save it to a
  * file in /var/log/ with the device's unique name and epoch timestamp.
  */
-#include "nvme/tree.h"
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <time.h>
-#include <libnvme.h>
+#include <unistd.h>
+
 #include <sys/stat.h>
 
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
+#include "nvme/tree.h"
+
 struct events {
 	nvme_ctrl_t c;
 	int uevent_fd;

libnvme/src/nvme/base64.c

@@ -7,10 +7,9 @@
  * Author: Hannes Reinecke <hare@suse.de>
  */
 
+#include <errno.h>
 #include <stdint.h>
 #include <string.h>
-#include <errno.h>
-#include <sys/types.h>
 
 static const char base64_table[65] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

libnvme/src/nvme/cleanup.h

@@ -3,12 +3,13 @@
 #define __CLEANUP_H
 
 #include <dirent.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
+
 #include <sys/socket.h>
-#include <netdb.h>
+#include <sys/types.h>
 
 #include "fabrics.h"
 

libnvme/src/nvme/cmds.h

@@ -10,13 +10,13 @@
 
 #pragma once
 
+#include <endian.h>
+#include <errno.h>
+#include <string.h>
+
 #include <nvme/ioctl.h>
 #include <nvme/types.h>
 
-#include <string.h>
-#include <errno.h>
-#include <endian.h>
-
 enum nvme_cmd_dword_fields {
 	NVME_DEVICE_SELF_TEST_CDW10_STC_SHIFT			= 0,
 	NVME_DEVICE_SELF_TEST_CDW10_STC_MASK			= 0xf,

libnvme/src/nvme/crc32.h

@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 uint32_t crc32(uint32_t crc, const void *buf, size_t len);

libnvme/src/nvme/fabrics.c

@@ -7,29 +7,29 @@
  * 	    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  */
 
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <fnmatch.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <fnmatch.h>
-#include <dirent.h>
-#include <inttypes.h>
 
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <netdb.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <net/if.h>
 
+#include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 #include <ccan/list/list.h>
-#include <ccan/array_size/array_size.h>
 #include <ccan/str/str.h>
 
 #include <libnvme.h>

libnvme/src/nvme/filters.c

@@ -6,9 +6,9 @@
  * Authors: Keith Busch <keith.busch@wdc.com>
  * 	    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  */
+#include <dirent.h>
 #include <stdio.h>
 #include <string.h>
-#include <dirent.h>
 
 #include <libnvme.h>
 

libnvme/src/nvme/generate-accessors.c

@@ -27,21 +27,20 @@
  *   ./generate-accessors private.h
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <getopt.h>
+#include <glob.h>
+#include <libgen.h>
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
-#include <getopt.h>
-#include <glob.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <libgen.h>
-#include <stdio.h>
-#include <ctype.h>
 
 #ifdef NVME_HAVE_SENDFILE
 #include <sys/sendfile.h>

libnvme/src/nvme/ioctl.c

@@ -8,22 +8,21 @@
  */
 #include <errno.h>
 #include <fcntl.h>
-#ifdef CONFIG_LIBURING
-#include <liburing.h>
-#endif
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <inttypes.h>
 
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+
+#ifdef CONFIG_LIBURING
+#include <liburing.h>
+#endif
 
 #include <ccan/build_assert/build_assert.h>
-#include <ccan/minmax/minmax.h>
 #include <ccan/endian/endian.h>
+#include <ccan/minmax/minmax.h>
 
 #include <libnvme.h>
 

libnvme/src/nvme/json.c

@@ -6,9 +6,9 @@
  * Authors: Hannes Reinecke <hare@suse.de>
  */
 
+#include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #include <json.h>
 

libnvme/src/nvme/lib.c

@@ -7,16 +7,17 @@
  *	    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  */
 
+#include <fcntl.h>
+#include <libgen.h>
+#include <strings.h>
+
+#include <sys/ioctl.h>
+
 #include <libnvme.h>
 
 #include "cleanup.h"
 #include "private.h"
 
-#include <libgen.h>
-#include <strings.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-
 static bool nvme_mi_probe_enabled_default(void)
 {
 	char *val;

libnvme/src/nvme/lib.h

@@ -8,8 +8,8 @@
  */
 #pragma once
 
-#include <stdio.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <syslog.h>
 
 #include <nvme/lib-types.h>

libnvme/src/nvme/linux.c

@@ -7,17 +7,19 @@
  * 	    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  */
 
+#include <errno.h>
+#include <fcntl.h>
+#ifndef _GNU_SOURCE
+#include <libgen.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <unistd.h>
 
 #include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/stat.h>
 
 #ifdef CONFIG_OPENSSL
 #include <openssl/evp.h>