From owner-svn-src-all@FreeBSD.ORG  Thu May 21 13:26:53 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0E4CD756;
 Thu, 21 May 2015 13:26:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EF0941D05;
 Thu, 21 May 2015 13:26:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4LDQqLs098545;
 Thu, 21 May 2015 13:26:52 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4LDQqIU098544;
 Thu, 21 May 2015 13:26:52 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201505211326.t4LDQqIU098544@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 21 May 2015 13:26:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r283232 - stable/10/usr.sbin/autofs
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 May 2015 13:26:53 -0000

Author: trasz
Date: Thu May 21 13:26:52 2015
New Revision: 283232
URL: https://svnweb.freebsd.org/changeset/base/283232

Log:
  MFC r279843:
  
  Refactor.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/autofs/common.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/autofs/common.c
==============================================================================
--- stable/10/usr.sbin/autofs/common.c	Thu May 21 13:25:28 2015	(r283231)
+++ stable/10/usr.sbin/autofs/common.c	Thu May 21 13:26:52 2015	(r283232)
@@ -449,6 +449,18 @@ node_expand_defined(struct node *n)
 	return (cumulated_error);
 }
 
+static bool
+node_is_direct_key(const struct node *n)
+{
+
+	if (n->n_parent != NULL && n->n_parent->n_parent == NULL &&
+	    strcmp(n->n_key, "/-") == 0) {
+		return (true);
+	}
+
+	return (false);
+}
+
 bool
 node_is_direct_map(const struct node *n)
 {
@@ -460,11 +472,7 @@ node_is_direct_map(const struct node *n)
 		n = n->n_parent;
 	}
 
-	assert(n->n_key != NULL);
-	if (strcmp(n->n_key, "/-") != 0)
-		return (false);
-
-	return (true);
+	return (node_is_direct_key(n));
 }
 
 bool
@@ -538,11 +546,8 @@ node_path_x(const struct node *n, char *
 	 * Return "/-" for direct maps only if we were asked for path
 	 * to the "/-" node itself, not to any of its subnodes.
 	 */
-	if (n->n_parent->n_parent == NULL &&
-	    strcmp(n->n_key, "/-") == 0 &&
-	    x[0] != '\0') {
+	if (node_is_direct_key(n) && x[0] != '\0')
 		return (x);
-	}
 
 	assert(n->n_key[0] != '\0');
 	path = concat(n->n_key, '/', x);