From 3b6394697323d4a9dddfdd2bd252b8e37bc7ce04 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Sun, 3 May 2020 11:57:27 +0200 Subject: [PATCH] svc: The 'id' is optional now, lets default it to "" if unset Signed-off-by: Joachim Nilsson --- src/svc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/svc.c b/src/svc.c index 5335c9b7..f3bcdbc6 100644 --- a/src/svc.c +++ b/src/svc.c @@ -300,6 +300,7 @@ svc_t *svc_stop_completed(void) /** * svc_find - Find a service object by its full path name * @cmd: Full path name, e.g., /sbin/syslogd + * @id: Optional instance id * * Returns: * A pointer to an &svc_t object, or %NULL if not found. @@ -308,6 +309,9 @@ svc_t *svc_find(char *cmd, char *id) { svc_t *svc, *iter = NULL; + if (!id) + id = ""; + for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) { if (!strcmp(svc->cmd, cmd) && !strcmp(svc->id, id)) return svc; @@ -338,7 +342,7 @@ svc_t *svc_find_by_pid(pid_t pid) /** * svc_find_by_jobid - Find an service object by its JOB:ID * @job: Job n:o - * @id: Instance id + * @id: Optional instance id * * Returns: * A pointer to an &svc_t object, or %NULL if not found. @@ -347,6 +351,9 @@ svc_t *svc_find_by_jobid(int job, char *id) { svc_t *svc, *iter = NULL; + if (!id) + id = ""; + for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) { if (svc->job == job && !strcmp(svc->id, id)) return svc; @@ -358,7 +365,7 @@ svc_t *svc_find_by_jobid(int job, char *id) /** * svc_find_by_nameid - Find an service object by its basename:ID * @name: Process name to match - * @id: Instance id + * @id: Optional instance id * * Returns: * A pointer to an &svc_t object, or %NULL if not found. @@ -367,6 +374,9 @@ svc_t *svc_find_by_nameid(char *name, char *id) { svc_t *svc, *iter = NULL; + if (!id) + id = ""; + for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) { if (!strcmp(svc->id, id) && !strcmp(name, svc->name)) return svc;