From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 Nov 2018 10:01:14 +0000 (+0100)
Subject: job: let's remove one comparison and reduce indentation level by one
X-Git-Tag: v240~301^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a69b3872acc279f30528ee2a941bda13dcc1170b;p=thirdparty%2Fsystemd.git

job: let's remove one comparison and reduce indentation level by one
---

diff --git a/src/core/job.c b/src/core/job.c
index bf3db5a887d..3826fb354f4 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -510,28 +510,30 @@ static void job_change_type(Job *j, JobType newtype) {
 }
 
 _pure_ static const char* job_get_begin_status_message_format(Unit *u, JobType t) {
-        const char *format;
         const UnitStatusMessageFormats *format_table;
+        const char *format;
 
         assert(u);
-        assert(IN_SET(t, JOB_START, JOB_STOP, JOB_RELOAD));
 
-        if (t != JOB_RELOAD) {
-                format_table = &UNIT_VTABLE(u)->status_message_formats;
-                if (format_table) {
-                        format = format_table->starting_stopping[t == JOB_STOP];
-                        if (format)
-                                return format;
-                }
+        if (t == JOB_RELOAD)
+                return "Reloading %s.";
+
+        assert(IN_SET(t, JOB_START, JOB_STOP));
+
+        format_table = &UNIT_VTABLE(u)->status_message_formats;
+        if (format_table) {
+                format = format_table->starting_stopping[t == JOB_STOP];
+                if (format)
+                        return format;
         }
 
         /* Return generic strings */
         if (t == JOB_START)
                 return "Starting %s.";
-        else if (t == JOB_STOP)
+        else {
+                assert(t == JOB_STOP);
                 return "Stopping %s.";
-        else
-                return "Reloading %s.";
+        }
 }
 
 static void job_print_begin_status_message(Unit *u, JobType t) {