picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

journal-remote: shorten code a bit by using strcspn()

This commit is contained in:
Lennart Poettering 2018-11-23 16:52:26 +01:00
parent da9fc98ded
commit 15d121b0e2
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/journal-remote/journal-remote-main.c
View File

@ -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)