From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 24 Jan 2016 16:47:19 +0000 (-0500)
Subject: Merge pull request #2425 from yuwata/journal-remote-v4
X-Git-Tag: v231~735
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce262e5760a22ccbf2430ef8d4c3c7e48a67fd85;p=platform%2Fupstream%2Fsystemd.git

Merge pull request #2425 from yuwata/journal-remote-v4

ZJS: remove unnecessary oom check after strdupa().
---

ce262e5760a22ccbf2430ef8d4c3c7e48a67fd85
diff --cc src/journal-remote/journal-remote.c
index e7003da,04bca11..cfe111f
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@@ -917,7 -927,15 +927,13 @@@ static int remoteserver_init(RemoteServ
                          startswith(arg_url, "http://") ?:
                          arg_url;
  
-                 r = add_source(s, fd, (char*) hostname, false);
+                 hostname = strdupa(hostname);
 -                if (!hostname)
 -                        return log_oom();
+                 if ((p = strchr(hostname, '/')))
+                         *p = '\0';
+                 if ((p = strchr(hostname, ':')))
+                         *p = '\0';
+ 
+                 r = add_source(s, fd, hostname, false);
                  if (r < 0)
                          return r;
          }