[openssh-commits] [openssh] 02/09: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit b9903ee8ee8671b447fc260c2bee3761e26c7227
Author: millert at openbsd.org <millert at openbsd.org>
Date:   Tue Oct 24 19:41:45 2017 +0000

    upstream commit
    
    Kill dead store and some spaces vs. tabs indent in
    parse_user_host_path(). Noticed by markus@
    
    Upstream-ID: 114fec91dadf9af46c7c94fd40fc630ea2de8200
---
 misc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/misc.c b/misc.c
index 7f1d4256..cb8bf5c1 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.115 2017/10/23 05:08:00 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.116 2017/10/24 19:41:45 millert Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * 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)
 	if (pathp != NULL)
 		*pathp = NULL;
 
-	sdup = tmp = xstrdup(s);
+	sdup = xstrdup(s);
 
 	/* Check for remote syntax: [user@]host:[path] */
 	if ((tmp = colon(sdup)) == NULL)
@@ -530,11 +530,11 @@ parse_user_host_path(const char *s, char **userp, char **hostp, char **pathp)
 	if (hostp != NULL) {
 		*hostp = host;
 		host = NULL;
-        }
+	}
 	if (pathp != NULL) {
 		*pathp = path;
 		path = NULL;
-        }
+	}
 	ret = 0;
 out:
 	free(sdup);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.