From owner-p4-projects@FreeBSD.ORG Sat Jul 5 11:59:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74E011065677; Sat, 5 Jul 2008 11:59:59 +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 38E5C1065675 for ; Sat, 5 Jul 2008 11:59:59 +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 28E008FC18 for ; Sat, 5 Jul 2008 11:59:59 +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 m65Bxx8O000550 for ; Sat, 5 Jul 2008 11:59:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m65Bxx6a000548 for perforce@freebsd.org; Sat, 5 Jul 2008 11:59:59 GMT (envelope-from trasz@freebsd.org) Date: Sat, 5 Jul 2008 11:59:59 GMT Message-Id: <200807051159.m65Bxx6a000548@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 144706 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: Sat, 05 Jul 2008 11:59:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=144706 Change 144706 by trasz@trasz_traszkan on 2008/07/05 11:59:34 Rename two functions to match Darwin. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_entry.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#7 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#3 (text+ko) ==== @@ -186,7 +186,7 @@ * in most cases they wouldn't even get evaluated. */ if (acl_type == ACL_TYPE_NFS4) { - if (acl_create_entry_at_position_np(&acl_new, &entry_new, 0) == -1) { + if (acl_create_entry_np(&acl_new, &entry_new, 0) == -1) { acl_free(acl_new); return (-1); } ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#3 (text) ==== @@ -13,9 +13,9 @@ acl_delete_link_np; acl_delete_fd_np; acl_delete_entry; - acl_delete_entry_at_position_np; + acl_delete_entry_np; acl_create_entry; - acl_create_entry_at_position_np; + acl_create_entry_np; acl_get_entry; acl_free; acl_from_text; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.c#3 (text+ko) ==== @@ -122,7 +122,7 @@ } int -acl_delete_entry_at_position_np(acl_t acl, int offset) +acl_delete_entry_np(acl_t acl, int offset) { struct acl *acl_int; int i; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_entry.c#3 (text+ko) ==== @@ -71,7 +71,7 @@ } int -acl_create_entry_at_position_np(acl_t *acl_p, acl_entry_t *entry_p, int offset) +acl_create_entry_np(acl_t *acl_p, acl_entry_t *entry_p, int offset) { int i; struct acl *acl_int; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#7 (text+ko) ==== @@ -304,9 +304,9 @@ ssize_t acl_copy_ext(void *_buf_p, acl_t _acl, ssize_t _size); acl_t acl_copy_int(const void *_buf_p); int acl_create_entry(acl_t *_acl_p, acl_entry_t *_entry_p); -int acl_create_entry_at_position_np(acl_t *_acl_p, acl_entry_t *_entry_p, int _index); +int acl_create_entry_np(acl_t *_acl_p, acl_entry_t *_entry_p, int _index); int acl_delete_entry(acl_t _acl, acl_entry_t _entry_d); -int acl_delete_entry_at_position_np(acl_t _acl, int _index); +int acl_delete_entry_np(acl_t _acl, int _index); int acl_delete_fd_np(int _filedes, acl_type_t _type); int acl_delete_file_np(const char *_path_p, acl_type_t _type); int acl_delete_link_np(const char *_path_p, acl_type_t _type);