From 38cb303e93cd6529fb20fa80f324e15529ff8b53 Mon Sep 17 00:00:00 2001 From: jmcp Date: Thu, 14 Jan 2010 21:32:36 -0800 Subject: backout 6855420: needs more work --- usr/src/lib/libdevinfo/devinfo_devperm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'usr/src/lib/libdevinfo/devinfo_devperm.c') diff --git a/usr/src/lib/libdevinfo/devinfo_devperm.c b/usr/src/lib/libdevinfo/devinfo_devperm.c index d802783def..e2716af8d3 100644 --- a/usr/src/lib/libdevinfo/devinfo_devperm.c +++ b/usr/src/lib/libdevinfo/devinfo_devperm.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -269,8 +269,8 @@ logindevperm(const char *ttyn, uid_t uid, gid_t gid, void (*errmsg)(char *)) * devpath: Absolute path to /dev link * devfs_path: Returns malloced string: /devices path w/out "/devices" */ -int -devfs_resolve_link(char *devpath, char **devfs_path) +static int +resolve_link(char *devpath, char **devfs_path) { char contents[PATH_MAX + 1]; char stage_link[PATH_MAX + 1]; @@ -313,7 +313,7 @@ devfs_resolve_link(char *devpath, char **devfs_path) (void) strcat(stage_link, contents); } - return (devfs_resolve_link(stage_link, devfs_path)); + return (resolve_link(stage_link, devfs_path)); } if (devfs_path) { @@ -339,7 +339,7 @@ check_driver_match(char *path, char *line) char saveline[MAX_LINELEN]; char *p; - if (devfs_resolve_link(path, &devfs_path) == 0) { + if (resolve_link(path, &devfs_path) == 0) { char *p; char pwd_buf[PATH_MAX]; di_node_t node; -- cgit v1.2.3