]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: move assert before actual use of the variable
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 26 Jun 2019 09:52:57 +0000 (11:52 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 26 Jun 2019 14:24:48 +0000 (16:24 +0200)
No point in using u->id first, and doing assert(u) later.
-std=c89 strikes again.

src/core/unit-printf.c

index 72391ace3a95c19e5b10b1ccd945581b2e8a30de..ffa12d8a929f1ac27d61b306b9bba9395fc05e1b 100644 (file)
@@ -244,6 +244,10 @@ int unit_full_printf(Unit *u, const char *format, char **ret) {
          * before or after the relevant configuration setting. Hence: don't add them.
          */
 
+        assert(u);
+        assert(format);
+        assert(ret);
+
         const Specifier table[] = {
                 { 'n', specifier_string,                   u->id },
                 { 'N', specifier_prefix_and_instance,      NULL },
@@ -281,9 +285,5 @@ int unit_full_printf(Unit *u, const char *format, char **ret) {
                 {}
         };
 
-        assert(u);
-        assert(format);
-        assert(ret);
-
         return specifier_printf(format, table, u, ret);
 }