diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-07-27 12:27:28 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-08-03 10:05:10 +0200 |
commit | 04499a70fbff3f6b798028473f5c9234a53eaa2d (patch) | |
tree | ec7a851e163ee20ba5211c16a86f1c251543e0a7 /src/core/mount.c | |
parent | c7cfde640d2b32ff1eb893d1fcd291c25cd421e7 (diff) | |
download | systemd-04499a70fbff3f6b798028473f5c9234a53eaa2d.tar.gz |
Drop the text argument from assert_not_reached()
In general we almost never hit those asserts in production code, so users see
them very rarely, if ever. But either way, we just need something that users
can pass to the developers.
We have quite a few of those asserts, and some have fairly nice messages, but
many are like "WTF?" or "???" or "unexpected something". The error that is
printed includes the file location, and function name. In almost all functions
there's at most one assert, so the function name alone is enough to identify
the failure for a developer. So we don't get much extra from the message, and
we might just as well drop them.
Dropping them makes our code a tiny bit smaller, and most importantly, improves
development experience by making it easy to insert such an assert in the code
without thinking how to phrase the argument.
Diffstat (limited to 'src/core/mount.c')
-rw-r--r-- | src/core/mount.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index 608ead5bc4..fb8f72e257 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1223,7 +1223,7 @@ static int mount_stop(Unit *u) { return 0; default: - assert_not_reached("Unexpected state."); + assert_not_reached(); } } @@ -1383,7 +1383,7 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { else if (code == CLD_DUMPED) f = MOUNT_FAILURE_CORE_DUMP; else - assert_not_reached("Unknown code"); + assert_not_reached(); if (IN_SET(m->state, MOUNT_REMOUNTING, MOUNT_REMOUNTING_SIGKILL, MOUNT_REMOUNTING_SIGTERM)) mount_set_reload_result(m, f); @@ -1465,7 +1465,7 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { break; default: - assert_not_reached("Uh, control process died at wrong time."); + assert_not_reached(); } /* Notify clients about changed exit status */ @@ -1541,7 +1541,7 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user break; default: - assert_not_reached("Timeout at wrong time."); + assert_not_reached(); } return 0; |