diff options
| author | user <user@clank> | 2026-08-17 14:22:38 +0200 |
|---|---|---|
| committer | user <user@clank> | 2026-08-17 14:22:38 +0200 |
| commit | ec91ccffe631ae34b111bf6161fd0e3c487f684c (patch) | |
| tree | 4a9fdbb720d9bf03edd5f538d1d87afd2bf51bfb /src/json.c | |
| parent | sl0ppty: clang-format, and a hook that runs it on what you staged (diff) | |
| download | slosh-ec91ccffe631ae34b111bf6161fd0e3c487f684c.tar.gz slosh-ec91ccffe631ae34b111bf6161fd0e3c487f684c.tar.xz slosh-ec91ccffe631ae34b111bf6161fd0e3c487f684c.zip | |
sl0ppty: clang-format the tree
The bumpy one. `make fmt` over every `.c` and `.h` outside `vendor/`: 32 files,
1,843 lines rewritten, no behaviour changed. Nothing here is worth reading -- the
next commit adds it to `.git-blame-ignore-revs` so `git blame` walks past it.
Two thirds of it is alignment the formatter now owns: trailing comments in a
struct, continuation lines under a signature. The rest is the hand-packed tables
opening up to one entry per line -- `ACTIONS`, `NAMED_KEYS`, `ACTION_HELP`. That
is a real loss of density and a real gain in diffs: adding an action was a reflow
of the block and is now one line. Anything worth keeping packed can be fenced with
`// clang-format off`; nothing was, on the grounds that a table is the thing a
formatter is for.
**One change is not formatting.** `src/config.h` had three trailing comments glued
onto one field:
uint16_t hover_delay_ms; /* how long the pointer must rest to arm a guide */
/* how long an announcement stays up */ /* rows per wheel notch */
-- `toast_ms`'s and `scroll_lines`' comments, landed on their neighbour by an
earlier edit, documenting the wrong things ever since. It is in this commit
because it is what caught it: clang-format could not settle on that line, wrapping
it one way and then re-indenting the wrap on a second pass, so `make fmt` was not
idempotent. The comments are back where they belong and it is.
Verified after the reformat, not before: `make clean && make all` is
warning-free, `make retest` is 1801 checks green, and `make fmt` twice in a row
changes nothing the second time. A formatter that alters behaviour would be worse
than none, so the gate was the whole suite rather than a reading of the diff.
Diffstat (limited to '')
| -rw-r--r-- | src/json.c | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -48,19 +48,19 @@ static void escaped(json_t *j, const char *s, size_t len) { for (size_t i = 0; i < len; i++) { unsigned char c = (unsigned char)s[i]; switch (c) { - case '"': rawz(j, "\\\""); break; - case '\\': rawz(j, "\\\\"); break; - case '\n': rawz(j, "\\n"); break; - case '\r': rawz(j, "\\r"); break; - case '\t': rawz(j, "\\t"); break; - default: - if (c < 0x20) { - char b[8]; - snprintf(b, sizeof b, "\\u%04x", c); - rawz(j, b); - } else { - raw(j, (const char *)&c, 1); /* UTF-8 passes through */ - } + case '"': rawz(j, "\\\""); break; + case '\\': rawz(j, "\\\\"); break; + case '\n': rawz(j, "\\n"); break; + case '\r': rawz(j, "\\r"); break; + case '\t': rawz(j, "\\t"); break; + default: + if (c < 0x20) { + char b[8]; + snprintf(b, sizeof b, "\\u%04x", c); + rawz(j, b); + } else { + raw(j, (const char *)&c, 1); /* UTF-8 passes through */ + } } } rawz(j, "\""); |
