opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Declared mapping data as const in a few interfaces

N2009_11_14_FIXES
jpandre 2008-09-09 15:26:38 +00:00
parent 5770560fab
commit a675f60863
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/ntfs-3g/acls.h
View File

@ -156,10 +156,12 @@ BOOL ntfs_is_user_sid(const SID *usid);
int ntfs_sid_size(const SID * sid);
unsigned int ntfs_attr_size(const char *attr);
const SID *ntfs_find_usid(struct MAPPING *usermapping, uid_t uid, SID *pdefsid);
const SID *ntfs_find_gsid(struct MAPPING *groupmapping, gid_t gid, SID *pdefsid);
uid_t ntfs_find_user(struct MAPPING *usermapping, const SID *usid);
gid_t ntfs_find_group(struct MAPPING *groupmapping, const SID * gsid);
const SID *ntfs_find_usid(const struct MAPPING *usermapping,
uid_t uid, SID *pdefsid);
const SID *ntfs_find_gsid(const struct MAPPING *groupmapping,
gid_t gid, SID *pdefsid);
uid_t ntfs_find_user(const struct MAPPING *usermapping, const SID *usid);
gid_t ntfs_find_group(const struct MAPPING *groupmapping, const SID * gsid);
const SID *ntfs_acl_owner(const char *secattr);
#if POSIXACLS
@ -171,12 +173,13 @@ struct POSIX_SECURITY *ntfs_build_inherited_posix(
const struct POSIX_SECURITY *pxdesc, mode_t mode, BOOL isdir);
struct POSIX_SECURITY *ntfs_replace_acl(const struct POSIX_SECURITY *oldpxdesc,
const struct POSIX_ACL *newacl, int count, BOOL deflt);
struct POSIX_SECURITY *ntfs_build_permissions_posix(struct MAPPING *mapping[],
struct POSIX_SECURITY *ntfs_build_permissions_posix(
struct MAPPING* const mapping[],
const char *securattr,
const SID *usid, const SID *gsid, ntfs_inode *ni);
struct POSIX_SECURITY *ntfs_merge_descr_posix(const struct POSIX_SECURITY *first,
const struct POSIX_SECURITY *second);
char *ntfs_build_descr_posix(struct MAPPING *mapping[],
char *ntfs_build_descr_posix(struct MAPPING* const mapping[],
struct POSIX_SECURITY *pxdesc,
int isdir, const SID *usid, const SID *gsid);

27
libntfs-3g/acls.c
View File

@ -398,10 +398,10 @@ static u32 findimplicit(const SID *xsid, const SID *pattern, int parity)
* Returns NULL if not found
*/
const SID *ntfs_find_usid(struct MAPPING *usermapping,
const SID *ntfs_find_usid(const struct MAPPING* usermapping,
uid_t uid, SID *defusid)
{
struct MAPPING *p;
const struct MAPPING *p;
const SID *sid;
le32 leauth;
u32 uauth;
@ -442,10 +442,10 @@ const SID *ntfs_find_usid(struct MAPPING *usermapping,
* Returns 0 (root) if not found
*/
const SID *ntfs_find_gsid(struct MAPPING *groupmapping,
const SID *ntfs_find_gsid(const struct MAPPING* groupmapping,
gid_t gid, SID *defgsid)
{
struct MAPPING *p;
const struct MAPPING *p;
const SID *sid;
le32 leauth;
u32 uauth;
@ -486,10 +486,10 @@ const SID *ntfs_find_gsid(struct MAPPING *groupmapping,
* Returns 0 (root) if not found
*/
uid_t ntfs_find_user(struct MAPPING *usermapping, const SID *usid)
uid_t ntfs_find_user(const struct MAPPING* usermapping, const SID *usid)
{
uid_t uid;
struct MAPPING *p;
const struct MAPPING *p;
p = usermapping;
while (p && p->xid && !ntfs_same_sid(usid, p->sid))
@ -509,10 +509,10 @@ uid_t ntfs_find_user(struct MAPPING *usermapping, const SID *usid)
* Returns 0 (root) if not found
*/
gid_t ntfs_find_group(struct MAPPING *groupmapping, const SID * gsid)
gid_t ntfs_find_group(const struct MAPPING* groupmapping, const SID * gsid)
{
gid_t gid;
struct MAPPING *p;
const struct MAPPING *p;
int gsidsz;
gsidsz = ntfs_sid_size(gsid);
@ -1789,8 +1789,8 @@ static BOOL build_group_denials_grant(ACL *pacl,
*
*/
static int buildacls_posix(struct MAPPING* mapping[],
char *secattr, int offs, struct POSIX_SECURITY *pxdesc,
static int buildacls_posix(struct MAPPING* const mapping[],
char *secattr, int offs, const struct POSIX_SECURITY *pxdesc,
int isdir, const SID *usid, const SID *gsid)
{
struct BUILD_CONTEXT aceset[2], *pset;
@ -2431,7 +2431,7 @@ static int buildacls(char *secattr, int offs, mode_t mode, int isdir,
* returns descriptor in allocated memory, must free() after use
*/
char *ntfs_build_descr_posix(struct MAPPING *mapping[],
char *ntfs_build_descr_posix(struct MAPPING* const mapping[],
struct POSIX_SECURITY *pxdesc,
int isdir, const SID *usid, const SID *gsid)
{
@ -3289,7 +3289,7 @@ const SID *ntfs_acl_owner(const char *securattr)
*/
static uid_t find_tenant(struct MAPPING *mapping[],
static uid_t find_tenant(struct MAPPING *const mapping[],
const char *securattr)
{
const SECURITY_DESCRIPTOR_RELATIVE *phead;
@ -3338,7 +3338,8 @@ static uid_t find_tenant(struct MAPPING *mapping[],
* be a a poor approximation of what was expected
*/
struct POSIX_SECURITY *ntfs_build_permissions_posix(struct MAPPING *mapping[],
struct POSIX_SECURITY *ntfs_build_permissions_posix(
struct MAPPING *const mapping[],
const char *securattr,
const SID *usid, const SID *gsid, ntfs_inode *ni)
{