]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: check argc/argv uncoditionally
authorFrantisek Sumsal <frantisek@sumsal.cz>
Sun, 30 Jan 2022 14:49:27 +0000 (15:49 +0100)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 31 Jan 2022 11:00:40 +0000 (20:00 +0900)
as `assert()` might be dropped with `-DNDEBUG`.

Follow-up to cf3095a and 1637e75.

src/core/main.c
src/shared/main-func.h

index fba9a4a8ec3caed7370f0435dac2e80c3c91989e..f347b74b11c451fca04bf5830ece111424ea8040 100644 (file)
@@ -2726,7 +2726,7 @@ int main(int argc, char *argv[]) {
         Manager *m = NULL;
         FDSet *fds = NULL;
 
-        assert(argc > 0 && !isempty(argv[0]));
+        assert_se(argc > 0 && !isempty(argv[0]));
 
         /* SysV compatibility: redirect init → telinit */
         redirect_telinit(argc, argv);
index 09103bace96e2a492f596a6e1f3095310b174876..81a5c1813cb37b18613bd51aed17999b447536b0 100644 (file)
@@ -15,7 +15,7 @@
 #define _DEFINE_MAIN_FUNCTION(intro, impl, ret)                         \
         int main(int argc, char *argv[]) {                              \
                 int r;                                                  \
-                assert(argc > 0 && !isempty(argv[0]));                  \
+                assert_se(argc > 0 && !isempty(argv[0]));               \
                 save_argc_argv(argc, argv);                             \
                 intro;                                                  \
                 r = impl;                                               \