From owner-p4-projects@FreeBSD.ORG Sun Jun 22 18:10:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C3D8106566C; Sun, 22 Jun 2008 18:10:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2374106567C for ; Sun, 22 Jun 2008 18:10:33 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D66CD8FC23 for ; Sun, 22 Jun 2008 18:10:33 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5MIAVUg087598 for ; Sun, 22 Jun 2008 18:10:31 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5MIATdn087595 for perforce@freebsd.org; Sun, 22 Jun 2008 18:10:29 GMT (envelope-from trasz@freebsd.org) Date: Sun, 22 Jun 2008 18:10:29 GMT Message-Id: <200806221810.m5MIATdn087595@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 143927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2008 18:10:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=143927 Change 143927 by trasz@trasz_traszkan on 2008/06/22 18:10:08 Little diff reduction, there should be no functional changes: make acl_set_fd(3) a wrapper around acl_set_fd_np(3), do the same with acl_get_fd(3) and acl_get_fd_np(3). Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.c#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#2 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.c#2 (text+ko) ==== @@ -91,20 +91,7 @@ acl_t acl_get_fd(int fd) { - acl_t aclp; - int error; - - aclp = acl_init(ACL_MAX_ENTRIES); - if (aclp == NULL) - return (NULL); - - error = ___acl_get_fd(fd, ACL_TYPE_ACCESS, &aclp->ats_acl); - if (error) { - acl_free(aclp); - return (NULL); - } - - return (aclp); + return (acl_get_fd_np(fd, ACL_TYPE_ACCESS)); } acl_t ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.c#2 (text+ko) ==== @@ -96,17 +96,7 @@ int acl_set_fd(int fd, acl_t acl) { - int error; - - error = _posix1e_acl_sort(acl); - if (error) { - errno = error; - return(-1); - } - - acl->ats_cur_entry = 0; - - return (___acl_set_fd(fd, ACL_TYPE_ACCESS, &acl->ats_acl)); + return (acl_set_fd_np(fd, acl, ACL_TYPE_ACCESS)); } int