From 15d121b0e2c391d7ab5bd05b92c16682191ad001 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Nov 2018 16:52:26 +0100 Subject: [PATCH] journal-remote: shorten code a bit by using strcspn() --- src/journal-remote/journal-remote-main.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 02078dcb4a..c46e0acdd3 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -614,15 +614,14 @@ static int create_remoteserver( if (arg_url) { const char *url; - char *hostname, *p; + char *hostname; if (!strstr(arg_url, "/entries")) { if (endswith(arg_url, "/")) url = strjoina(arg_url, "entries"); else url = strjoina(arg_url, "/entries"); - } - else + } else url = strdupa(arg_url); log_info("Spawning curl %s...", url); @@ -634,11 +633,7 @@ static int create_remoteserver( if (!hostname) hostname = arg_url; - hostname = strdupa(hostname); - if ((p = strchr(hostname, '/'))) - *p = '\0'; - if ((p = strchr(hostname, ':'))) - *p = '\0'; + hostname = strndupa(hostname, strcspn(hostname, "/:")); r = journal_remote_add_source(s, fd, hostname, false); if (r < 0)