From ed383eaaa66c64ac2f8fa84d4b1a8c9c179d9636 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Mon, 27 Feb 2023 23:07:31 +0100
Subject: [PATCH] Minor refactor, break out new fn svc_find_by_str()

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/svc.c | 36 +++++++++++++++++++++++++++---------
 src/svc.h |  1 +
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/svc.c b/src/svc.c
index 97ce8f86..fb98f847 100644
--- a/src/svc.c
+++ b/src/svc.c
@@ -371,6 +371,32 @@ svc_t *svc_find(char *name, char *id)
 	return NULL;
 }
 
+/**
+ * svc_find_by_str - Find a service object by name:id
+ * @str: name[:id]
+ *
+ * Like svc_find() but takes 'name[:id]' argument
+ *
+ * Returns:
+ * A pointer to an &svc_t object, or %NULL if not found.
+ */
+svc_t *svc_find_by_str(const char *str)
+{
+	char *name, *id;
+
+	if (!str)
+		return NULL;
+
+	name = strdupa(str);
+	id = strchr(name, ':');
+	if (id)
+		*id++ = 0;
+	else
+		id = "";
+
+	return svc_find(name, id);
+}
+
 /**
  * svc_find_by_pid - Find a service object by its PID
  * @pid: Process ID to match
@@ -644,17 +670,9 @@ int svc_conflicts(svc_t *svc)
 
 	nm = strtok(ptr, ",");
 	while (nm) {
-		char *name, *id;
 		svc_t *s;
 
-		name = strdupa(nm);
-		id = strchr(name, ':');
-		if (id)
-			id++ = 0;
-		else
-			id = "";
-
-		s = svc_find(name, id);
+		s = svc_find_by_str(nm);
 		if (s) {
 			if (s->state >= SVC_STOPPING_STATE)
 				rc = 1;
diff --git a/src/svc.h b/src/svc.h
index 22939852..a66621a6 100644
--- a/src/svc.h
+++ b/src/svc.h
@@ -210,6 +210,7 @@ int	    svc_del	           (svc_t *svc);
 void	    svc_validate	   (svc_t *svc);
 
 svc_t	   *svc_find	           (char *name, char *id);
+svc_t	   *svc_find_by_str        (const char *str);
 svc_t	   *svc_find_by_pid        (pid_t pid);
 svc_t	   *svc_find_by_cond	   (const char *cond);
 svc_t	   *svc_find_by_jobid      (int job, char *id);