Merge pull request #218 from liuming50/fix-some-string-comparing-issues

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2022-02-07 07:04:10 +01:00
committed by GitHub
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -722,7 +722,7 @@ static int show_status(char *arg)
for (svc = client_svc_iterator(1); svc; svc = client_svc_iterator(0)) {
svc_ident(svc, ident, sizeof(ident));
if (string_match(ident, arg))
if (string_compare(ident, arg))
num++;
if (string_case_compare(ident, arg))
exact++;
@@ -797,7 +797,7 @@ static int show_status(char *arg)
char *lvls;
svc_ident(svc, ident, sizeof(ident));
if (num && !string_match(ident, arg))
if (num && !string_compare(ident, arg))
continue;
printf("%-*d ", pw, svc->pid);
@@ -995,7 +995,7 @@ static int cmd_parse(int argc, char *argv[], struct cmd *command)
if (!cmd_cond(&command[i]))
continue;
if (!string_match(command[i].cmd, argv[0]))
if (!string_compare(command[i].cmd, argv[0]))
continue;
if (command[i].ctx)
+1 -1
View File
@@ -256,7 +256,7 @@ svc_t *svc_named_iterator(svc_t **iter, int first, char *cmd)
for (svc = svc_iterator(iter, first); svc; svc = svc_iterator(iter, 0)) {
char *name = svc->name;
if (!strncmp(name, cmd, strlen(name)))
if (string_compare(name, cmd))
return svc;
}