From 9a8b55737fba4bb387fb1501effff688f57b3c3f Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Mon, 18 Dec 2017 11:03:15 +0100
Subject: [PATCH] Move svc_status() + svc_dirtystr() to header file as static
 inline

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 src/svc.c | 64 -----------------------------------------------------
 src/svc.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/src/svc.c b/src/svc.c
index 054b8b05..39ed62e0 100644
--- a/src/svc.c
+++ b/src/svc.c
@@ -561,70 +561,6 @@ int svc_enabled(svc_t *svc)
 	return 1;
 }
 
-char *svc_status(svc_t *svc)
-{
-	switch (svc->state) {
-	case SVC_HALTED_STATE:
-		switch (svc->block) {
-		case SVC_BLOCK_NONE:
-			return "halted";
-
-		case SVC_BLOCK_MISSING:
-			return "missing";
-
-		case SVC_BLOCK_CRASHING:
-			return "crashed";
-
-		case SVC_BLOCK_USER:
-			return "stopped";
-
-		case SVC_BLOCK_BUSY:
-			return "busy";
-
-		case SVC_BLOCK_RESTARTING:
-			return "restart";
-		}
-
-	case SVC_DONE_STATE:
-		return "done";
-
-	case SVC_STOPPING_STATE:
-		switch (svc->type) {
-		case SVC_TYPE_INETD_CONN:
-		case SVC_TYPE_RUN:
-		case SVC_TYPE_TASK:
-			return "active";
-
-		default:
-			return "stopping";
-		}
-
-	case SVC_WAITING_STATE:
-		return "waiting";
-
-	case SVC_READY_STATE:
-		return "ready";
-
-	case SVC_RUNNING_STATE:
-		return "running";
-
-	default:
-		return "UNKNOWN";
-	}
-}
-
-const char *svc_dirtystr(svc_t *svc)
-{
-	if (svc_is_removed(svc))
-		return "removed";
-	if (svc_is_updated(svc))
-		return "updated";
-	if (svc_is_changed(svc))
-		return "UNKNOWN";
-
-	return "clean";
-}
-
 /* Same base service, return unique ID */
 int svc_next_id(char *cmd)
 {
diff --git a/src/svc.h b/src/svc.h
index c359e41d..4f6623ab 100644
--- a/src/svc.h
+++ b/src/svc.h
@@ -176,8 +176,6 @@ int	    svc_clean_bootstrap    (svc_t *svc);
 void	    svc_prune_bootstrap	   (void);
 
 int         svc_enabled            (svc_t *svc);
-char       *svc_status             (svc_t *svc);
-const char *svc_dirtystr           (svc_t *svc);
 int         svc_next_id            (char  *cmd);
 int         svc_is_unique          (svc_t *svc);
 
@@ -210,6 +208,70 @@ static inline void svc_missing     (svc_t *svc) { svc->block = SVC_BLOCK_MISSING
 static inline void svc_restarting  (svc_t *svc) { svc->block = SVC_BLOCK_RESTARTING; }
 static inline void svc_crashing    (svc_t *svc) { svc->block = SVC_BLOCK_CRASHING; }
 
+static inline char *svc_status(svc_t *svc)
+{
+	switch (svc->state) {
+	case SVC_HALTED_STATE:
+		switch (svc->block) {
+		case SVC_BLOCK_NONE:
+			return "halted";
+
+		case SVC_BLOCK_MISSING:
+			return "missing";
+
+		case SVC_BLOCK_CRASHING:
+			return "crashed";
+
+		case SVC_BLOCK_USER:
+			return "stopped";
+
+		case SVC_BLOCK_BUSY:
+			return "busy";
+
+		case SVC_BLOCK_RESTARTING:
+			return "restart";
+		}
+
+	case SVC_DONE_STATE:
+		return "done";
+
+	case SVC_STOPPING_STATE:
+		switch (svc->type) {
+		case SVC_TYPE_INETD_CONN:
+		case SVC_TYPE_RUN:
+		case SVC_TYPE_TASK:
+			return "active";
+
+		default:
+			return "stopping";
+		}
+
+	case SVC_WAITING_STATE:
+		return "waiting";
+
+	case SVC_READY_STATE:
+		return "ready";
+
+	case SVC_RUNNING_STATE:
+		return "running";
+
+	default:
+		return "UNKNOWN";
+	}
+}
+
+static inline const char *svc_dirtystr(svc_t *svc)
+{
+	if (svc_is_removed(svc))
+		return "removed";
+	if (svc_is_updated(svc))
+		return "updated";
+	if (svc_is_changed(svc))
+		return "UNKNOWN";
+
+	return "clean";
+}
+
 #endif /* FINIT_SVC_H_ */
 
 /**