summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authormillert@openbsd.org <millert@openbsd.org>2017-10-24 19:41:45 +0000
committerDamien Miller <djm@mindrot.org>2017-10-25 11:22:24 +1100
commitb9903ee8ee8671b447fc260c2bee3761e26c7227 (patch)
tree5efb5405d45ea37c792a79ac838c30b00a477412 /misc.c
parent0869627e00f4ee2a038cb62d7bd9ffad405e1800 (diff)
upstream commit
Kill dead store and some spaces vs. tabs indent in parse_user_host_path(). Noticed by markus@ Upstream-ID: 114fec91dadf9af46c7c94fd40fc630ea2de8200
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc.c b/misc.c
index 7f1d42567..cb8bf5c14 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.115 2017/10/23 05:08:00 djm Exp $ */ 1/* $OpenBSD: misc.c,v 1.116 2017/10/24 19:41:45 millert Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -498,7 +498,7 @@ parse_user_host_path(const char *s, char **userp, char **hostp, char **pathp)
498 if (pathp != NULL) 498 if (pathp != NULL)
499 *pathp = NULL; 499 *pathp = NULL;
500 500
501 sdup = tmp = xstrdup(s); 501 sdup = xstrdup(s);
502 502
503 /* Check for remote syntax: [user@]host:[path] */ 503 /* Check for remote syntax: [user@]host:[path] */
504 if ((tmp = colon(sdup)) == NULL) 504 if ((tmp = colon(sdup)) == NULL)
@@ -530,11 +530,11 @@ parse_user_host_path(const char *s, char **userp, char **hostp, char **pathp)
530 if (hostp != NULL) { 530 if (hostp != NULL) {
531 *hostp = host; 531 *hostp = host;
532 host = NULL; 532 host = NULL;
533 } 533 }
534 if (pathp != NULL) { 534 if (pathp != NULL) {
535 *pathp = path; 535 *pathp = path;
536 path = NULL; 536 path = NULL;
537 } 537 }
538 ret = 0; 538 ret = 0;
539out: 539out:
540 free(sdup); 540 free(sdup);