From eca8c46c2bbe0edd2bbe51ca88762dd06858464f Mon Sep 17 00:00:00 2001 From: trasz Date: Thu, 21 May 2015 13:18:02 +0000 Subject: MFC r279806: Minor optimization/cleanup in node_path(); no functional changes. --- usr.sbin/autofs/common.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'usr.sbin/autofs') diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c index 8ace69d..8c455c4 100644 --- a/usr.sbin/autofs/common.c +++ b/usr.sbin/autofs/common.c @@ -561,7 +561,6 @@ static char * node_path_x(const struct node *n, char *x) { char *path; - size_t len; if (n->n_parent == NULL) return (x); @@ -580,14 +579,6 @@ node_path_x(const struct node *n, char *x) path = separated_concat(n->n_key, x, '/'); free(x); - /* - * Strip trailing slash. - */ - len = strlen(path); - assert(len > 0); - if (path[len - 1] == '/') - path[len - 1] = '\0'; - return (node_path_x(n->n_parent, path)); } @@ -598,8 +589,19 @@ node_path_x(const struct node *n, char *x) char * node_path(const struct node *n) { + char *path; + size_t len; + + path = node_path_x(n, checked_strdup("")); + + /* + * Strip trailing slash, unless the whole path is "/". + */ + len = strlen(path); + if (len > 1 && path[len - 1] == '/') + path[len - 1] = '\0'; - return (node_path_x(n, checked_strdup(""))); + return (path); } static char * -- cgit v1.1