d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor optimization/cleanup in node_path(); no functional changes.

Browse Source 
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2015-03-09 11:59:58 +00:00
parent 9ae74daa19
commit 8822ff21ce
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.sbin/autofs/common.c
View File

@ -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;
return (node_path_x(n, checked_strdup("")));
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 (path);
}
static char *