clang-format: Add include block configs, reformat

Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2021-02-06 14:46:16 +09:00
parent 57c4ddd00d
commit 5e5627cd0b
6 changed files with 31 additions and 7 deletions

View file

@ -7,3 +7,23 @@ AllowShortFunctionsOnASingleLine: false
AlignConsecutiveMacros: true
IndentCaseLabels: true
ColumnLimit: 100
IncludeBlocks: Regroup
# Include block order goes like this
# - config.h style files, including ../config.h
# - system headers (<>)
# - All m1n1 headers, starting with the "this file" header, rest sorted
# - 3rd party code headers
# - build artifact headers (stuff outside of src/)
IncludeCategories:
- Regex: '^"(\.\./)*config\.h"$'
Priority: -2
- Regex: '^<'
Priority: -1
- Regex: '^"\.\./'
Priority: 3
- Regex: '/'
Priority: 2
- Regex: '.*'
Priority: 0
SortPriority: 1

View file

@ -3,10 +3,11 @@
#ifndef XDT_H
#define XDT_H
#include "types.h"
#include <stddef.h>
#include <stdint.h>
#include "types.h"
#define ADT_ERR_NOTFOUND 1
#define ADT_ERR_BADOFFSET 4
#define ADT_ERR_BADPATH 5

View file

@ -5,7 +5,6 @@
#include "adt.h"
#include "exception.h"
#include "kboot.h"
#include "libfdt/libfdt.h"
#include "malloc.h"
#include "memory.h"
#include "smp.h"
@ -13,6 +12,8 @@
#include "utils.h"
#include "xnuboot.h"
#include "libfdt/libfdt.h"
static void *dt = NULL;
static int dt_bufsize = 0;
static char *bootargs = NULL;

View file

@ -4,14 +4,15 @@
#include "kboot.h"
#include "malloc.h"
#include "memory.h"
#include "minilzlib/minlzma.h"
#include "smp.h"
#include "tinf/tinf.h"
#include "types.h"
#include "uart.h"
#include "utils.h"
#include "xnuboot.h"
#include "minilzlib/minlzma.h"
#include "tinf/tinf.h"
int proxy_process(ProxyRequest *request, ProxyReply *reply)
{
enum exc_guard_t guard_save = exc_guard;

View file

@ -1,12 +1,12 @@
/* SPDX-License-Identifier: MIT */
#include <stdarg.h>
#include "utils.h"
#include "types.h"
#include "uart.h"
#include "vsprintf.h"
#include <stdarg.h>
static char ascii(char s)
{
if (s < 0x20)

View file

@ -93,9 +93,10 @@
* 2.5 printf(3S) man page.
*/
#include "types.h"
#include <stdarg.h>
#include "types.h"
#define VA_START(ap, last) va_start(ap, last)
#define VA_SHIFT(ap, value, type) /* No-op for ANSI C. */