diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-23 16:30:23 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-26 14:08:46 +0100 |
| commit | 49fe5c099639aa2111efb56c6ac609955a279279 (patch) | |
| tree | bff451fbe68b0aa57fe8ad198695384eab264545 /src/journal-remote/journal-upload.c | |
| parent | 52f1552073047195d51901f7e5a5a4fa3189034e (diff) | |
| download | systemd-49fe5c099639aa2111efb56c6ac609955a279279.tar.gz | |
tree-wide: port various places over to STARTSWITH_SET()
Diffstat (limited to 'src/journal-remote/journal-upload.c')
| -rw-r--r-- | src/journal-remote/journal-upload.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index f7b91fddde..70d0fcad4d 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -25,6 +25,7 @@ #include "sigbus.h" #include "signal-util.h" #include "string-util.h" +#include "strv.h" #include "util.h" #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem" @@ -408,7 +409,8 @@ static int setup_uploader(Uploader *u, const char *url, const char *state_file) memzero(u, sizeof(Uploader)); u->input = -1; - if (!(host = startswith(url, "http://")) && !(host = startswith(url, "https://"))) { + host = STARTSWITH_SET(url, "http://", "https://"); + if (!host) { host = url; proto = "https://"; } |