Skip to content

Commit d7e1923

Browse files
committed
src: order includes per common recommendation
Apply the commonly recommended include ordering across all files. 1. Standard/POSIX headers (alphabetical) 2. System headers with path prefix: sys/, arpa/, linux/, net/ (alphabetical) 3. Third-party library headers: ccan, dbus, json, keyutils, liburing, openssl (alphabetical) 4. Project public headers: libnvme.h, libnvme-mi.h, nvme/... 5. Local/private headers: "..." The changes was prepared by Copilot. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 14828a1 commit d7e1923

90 files changed

Lines changed: 359 additions & 324 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

fabrics.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,26 @@
1919
* Fabrics specification standard.
2020
*/
2121

22+
#include <dirent.h>
2223
#include <errno.h>
23-
#include <getopt.h>
2424
#include <fcntl.h>
25-
#include <stdlib.h>
26-
#include <stdio.h>
27-
#include <stdbool.h>
28-
#include <stdint.h>
29-
#include <unistd.h>
30-
#include <dirent.h>
25+
#include <getopt.h>
3126
#include <inttypes.h>
3227
#include <libgen.h>
33-
#include <sys/stat.h>
28+
#include <stdbool.h>
3429
#include <stddef.h>
30+
#include <stdint.h>
31+
#include <stdio.h>
32+
#include <stdlib.h>
3533
#include <syslog.h>
3634
#include <time.h>
35+
#include <unistd.h>
3736

38-
#include <sys/types.h>
3937
#include <linux/types.h>
4038

39+
#include <sys/stat.h>
40+
#include <sys/types.h>
41+
4142
#include <libnvme.h>
4243

4344
#include "common.h"

libnvme/examples/discover-loop.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
*/
1515
#define __SANE_USERSPACE_TYPES__
1616

17+
#include <errno.h>
1718
#include <stdio.h>
1819
#include <stdlib.h>
1920
#include <string.h>
20-
#include <errno.h>
21-
#include <libnvme.h>
2221

2322
#include <ccan/endian/endian.h>
2423

24+
#include <libnvme.h>
25+
2526
static void print_discover_log(struct nvmf_discovery_log *log)
2627
{
2728
int i, numrec = le64_to_cpu(log->numrec);

libnvme/examples/mi-conf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
#include <stdio.h>
1919
#include <stdlib.h>
2020

21-
#include <libnvme-mi.h>
22-
2321
#include <ccan/array_size/array_size.h>
2422
#include <ccan/endian/endian.h>
2523

2624
#include <dbus/dbus.h>
2725

26+
#include <libnvme-mi.h>
27+
2828
#define MCTP_DBUS_NAME "au.com.codeconstruct.MCTP1"
2929
#define MCTP_DBUS_PATH "/au/com/codeconstruct/mctp1"
3030
#define MCTP_DBUS_EP_IFACE "au.com.codeconstruct.MCTP.Endpoint1"

libnvme/examples/mi-mctp-ae.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,20 @@
1010
#include <assert.h>
1111
#include <ctype.h>
1212
#include <err.h>
13+
#include <errno.h>
14+
#include <poll.h>
15+
#include <stddef.h>
1316
#include <stdio.h>
1417
#include <stdlib.h>
15-
#include <stddef.h>
1618
#include <string.h>
17-
#include <errno.h>
1819
#include <unistd.h> // for usleep
1920

20-
#include <libnvme-mi.h>
21-
#include <poll.h>
21+
#include <sys/select.h>
2222

2323
#include <ccan/array_size/array_size.h>
2424
#include <ccan/endian/endian.h>
25-
#include <sys/select.h>
25+
26+
#include <libnvme-mi.h>
2627

2728
struct app_userdata {
2829
uint32_t count;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
#include <assert.h>
1212
#include <ctype.h>
1313
#include <err.h>
14+
#include <pthread.h>
15+
#include <stddef.h>
1416
#include <stdio.h>
1517
#include <stdlib.h>
16-
#include <stddef.h>
1718
#include <string.h>
18-
#include <pthread.h>
19-
20-
#include <libnvme-mi.h>
2119

2220
#include <ccan/array_size/array_size.h>
2321
#include <ccan/endian/endian.h>
2422

23+
#include <libnvme-mi.h>
24+
2525
void fhexdump(FILE *fp, const unsigned char *buf, int len)
2626
{
2727
const int row_len = 16;

libnvme/examples/mi-mctp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
#include <assert.h>
1414
#include <ctype.h>
1515
#include <err.h>
16+
#include <stddef.h>
1617
#include <stdio.h>
1718
#include <stdlib.h>
18-
#include <stddef.h>
1919
#include <string.h>
2020

21-
#include <libnvme-mi.h>
22-
2321
#include <ccan/array_size/array_size.h>
2422
#include <ccan/endian/endian.h>
2523

24+
#include <libnvme-mi.h>
25+
2626
static void show_port_pcie(struct nvme_mi_read_port_info *port)
2727
{
2828
printf(" PCIe max payload: 0x%x\n", 0x80 << port->pcie.mps);

libnvme/examples/telemetry-listen.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,22 @@
1111
* is observed with controller telemetry data, read the log and save it to a
1212
* file in /var/log/ with the device's unique name and epoch timestamp.
1313
*/
14-
#include "nvme/tree.h"
1514
#include <fcntl.h>
1615
#include <stdbool.h>
1716
#include <stdio.h>
1817
#include <stdlib.h>
1918
#include <string.h>
20-
#include <unistd.h>
2119
#include <time.h>
22-
#include <libnvme.h>
20+
#include <unistd.h>
21+
2322
#include <sys/stat.h>
2423

2524
#include <ccan/endian/endian.h>
2625

26+
#include <libnvme.h>
27+
28+
#include "nvme/tree.h"
29+
2730
struct events {
2831
nvme_ctrl_t c;
2932
int uevent_fd;

libnvme/src/nvme/base64.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
* Author: Hannes Reinecke <[email protected]>
88
*/
99

10+
#include <errno.h>
1011
#include <stdint.h>
1112
#include <string.h>
12-
#include <errno.h>
13-
#include <sys/types.h>
1413

1514
static const char base64_table[65] =
1615
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

libnvme/src/nvme/cleanup.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
#define __CLEANUP_H
44

55
#include <dirent.h>
6+
#include <netdb.h>
67
#include <stdio.h>
78
#include <stdlib.h>
89
#include <unistd.h>
9-
#include <sys/types.h>
10+
1011
#include <sys/socket.h>
11-
#include <netdb.h>
12+
#include <sys/types.h>
1213

1314
#include "fabrics.h"
1415

libnvme/src/nvme/cmds.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
#pragma once
1212

13+
#include <endian.h>
14+
#include <errno.h>
15+
#include <string.h>
16+
1317
#include <nvme/ioctl.h>
1418
#include <nvme/types.h>
1519

16-
#include <string.h>
17-
#include <errno.h>
18-
#include <endian.h>
19-
2020
enum nvme_cmd_dword_fields {
2121
NVME_DEVICE_SELF_TEST_CDW10_STC_SHIFT = 0,
2222
NVME_DEVICE_SELF_TEST_CDW10_STC_MASK = 0xf,

0 commit comments

Comments
 (0)