From 597adff2bbe35636705287c287c5d0bf6d907aae Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Thu, 28 Jan 2016 08:29:00 +0100 Subject: [PATCH] Replace all le32 "not" negations with le32_not(...). --- include/ntfs-3g/endians.h | 2 ++ libntfs-3g/acls.c | 30 +++++++++++++++--------------- libntfs-3g/attrib.c | 2 +- libntfs-3g/dir.c | 2 +- libntfs-3g/inode.c | 2 +- libntfs-3g/reparse.c | 2 +- libntfs-3g/security.c | 6 +++--- ntfsprogs/ntfsinfo.c | 32 ++++++++++++++++---------------- 8 files changed, 40 insertions(+), 38 deletions(-) diff --git a/include/ntfs-3g/endians.h b/include/ntfs-3g/endians.h index ee8e66ce..66c0fa81 100644 --- a/include/ntfs-3g/endians.h +++ b/include/ntfs-3g/endians.h @@ -344,4 +344,6 @@ #define le16_not(a) (~(a)) +#define le32_not(a) (~(a)) + #endif /* defined _NTFS_ENDIANS_H */ diff --git a/libntfs-3g/acls.c b/libntfs-3g/acls.c index ddfee648..fe479bdc 100644 --- a/libntfs-3g/acls.c +++ b/libntfs-3g/acls.c @@ -775,7 +775,7 @@ int ntfs_inherit_acl(const ACL *oldacl, ACL *newacl, memcpy(pnewace,poldace,acesz); /* reencode GENERIC_ALL */ if (!le32_andz(pnewace->mask, GENERIC_ALL)) { - pnewace->mask = le32_and(pnewace->mask, ~GENERIC_ALL); + pnewace->mask = le32_and(pnewace->mask, le32_not(GENERIC_ALL)); if (fordir) pnewace->mask = le32_or(pnewace->mask, le32_or(OWNER_RIGHTS, le32_or(DIR_READ, @@ -802,7 +802,7 @@ int ntfs_inherit_acl(const ACL *oldacl, ACL *newacl, pnewace->mask = le32_or(pnewace->mask, le32_or(OWNER_RIGHTS, le32_or(FILE_READ, FILE_EXEC))); - pnewace->mask = le32_and(pnewace->mask, ~(le32_or(GENERIC_READ, + pnewace->mask = le32_and(pnewace->mask, le32_not(le32_or(GENERIC_READ, le32_or(GENERIC_EXECUTE, le32_or(WRITE_DAC, le32_or(WRITE_OWNER, @@ -817,7 +817,7 @@ int ntfs_inherit_acl(const ACL *oldacl, ACL *newacl, else pnewace->mask = le32_or(pnewace->mask, le32_or(OWNER_RIGHTS, FILE_WRITE)); - pnewace->mask = le32_and(pnewace->mask, ~(le32_or(GENERIC_WRITE, + pnewace->mask = le32_and(pnewace->mask, le32_not(le32_or(GENERIC_WRITE, le32_or(WRITE_DAC, le32_or(WRITE_OWNER, FILE_DELETE_CHILD))))); @@ -2531,7 +2531,7 @@ static int buildacls(char *secattr, int offs, mode_t mode, int isdir, denials = le32_or(denials, FILE_READ); } } - denials = le32_and(denials, ~grants); + denials = le32_and(denials, le32_not(grants)); if (!le32_cmpz(denials)) { pdace->type = ACCESS_DENIED_ACE_TYPE; pdace->size = cpu_to_le16(usidsz + 8); @@ -2618,7 +2618,7 @@ static int buildacls(char *secattr, int offs, mode_t mode, int isdir, if (mode & S_IROTH) denials = le32_or(denials, FILE_READ); } - denials = le32_and(denials, ~(le32_or(grants, OWNER_RIGHTS))); + denials = le32_and(denials, le32_not(le32_or(grants, OWNER_RIGHTS))); if (!le32_cmpz(denials)) { pdace->type = ACCESS_DENIED_ACE_TYPE; pdace->size = cpu_to_le16(gsidsz + 8); @@ -3258,9 +3258,9 @@ static int build_std_permissions(const char *securattr, allowown = le32_or(allowown, le32_or(allowgrp, allowall)); allowgrp = le32_or(allowgrp, allowall); return (merge_permissions(isdir, - le32_and(allowown, ~(le32_or(denyown, denyall))), - le32_and(allowgrp, ~(le32_or(denygrp, denyall))), - le32_and(allowall, ~denyall), + le32_and(allowown, le32_not(le32_or(denyown, denyall))), + le32_and(allowgrp, le32_not(le32_or(denygrp, denyall))), + le32_and(allowall, le32_not(denyall)), special)); } @@ -3337,9 +3337,9 @@ static int build_owngrp_permissions(const char *securattr, if (!grppresent) allowgrp = allowall; return (merge_permissions(isdir, - le32_and(allowown, ~(le32_or(denyown, denyall))), - le32_and(allowgrp, ~(le32_or(denygrp, denyall))), - le32_and(allowall, ~denyall), + le32_and(allowown, le32_not(le32_or(denyown, denyall))), + le32_and(allowgrp, le32_not(le32_or(denygrp, denyall))), + le32_and(allowall, le32_not(denyall)), special)); } @@ -3494,7 +3494,7 @@ static int build_ownadmin_permissions(const char *securattr, for (nace = 0; nace < acecnt; nace++) { pace = (const ACCESS_ALLOWED_ACE*)&securattr[offace]; if (!(pace->flags & INHERIT_ONLY_ACE) - && le32_andz(~pace->mask, le32_or(ROOT_OWNER_UNMARK, ROOT_GROUP_UNMARK))) { + && le32_andz(le32_not(pace->mask), le32_or(ROOT_OWNER_UNMARK, ROOT_GROUP_UNMARK))) { if ((ntfs_same_sid(usid, &pace->sid) || ntfs_same_sid(ownersid, &pace->sid)) && ((!le32_andz(pace->mask, WRITE_OWNER) && firstapply))) { @@ -3533,9 +3533,9 @@ static int build_ownadmin_permissions(const char *securattr, allowgrp = le32_or(allowgrp, allowall); } return (merge_permissions(isdir, - le32_and(allowown, ~(le32_or(denyown, denyall))), - le32_and(allowgrp, ~(le32_or(denygrp, denyall))), - le32_and(allowall, ~denyall), + le32_and(allowown, le32_not(le32_or(denyown, denyall))), + le32_and(allowgrp, le32_not(le32_or(denygrp, denyall))), + le32_and(allowall, le32_not(denyall)), special)); } diff --git a/libntfs-3g/attrib.c b/libntfs-3g/attrib.c index 9803c959..dc188a6a 100644 --- a/libntfs-3g/attrib.c +++ b/libntfs-3g/attrib.c @@ -102,7 +102,7 @@ static void NAttrSetFlag(ntfs_attr *na, FILE_ATTR_FLAGS flag) static void NAttrClearFlag(ntfs_attr *na, FILE_ATTR_FLAGS flag) { if (le32_eq(na->type, AT_DATA) && na->name == AT_UNNAMED) - na->ni->flags = le32_and(na->ni->flags, ~flag); + na->ni->flags = le32_and(na->ni->flags, le32_not(flag)); } #define GenNAttrIno(func_name, flag) \ diff --git a/libntfs-3g/dir.c b/libntfs-3g/dir.c index e8cb6c37..8204413b 100644 --- a/libntfs-3g/dir.c +++ b/libntfs-3g/dir.c @@ -2169,7 +2169,7 @@ static int ntfs_link_i(ntfs_inode *ni, ntfs_inode *dir_ni, const ntfschar *name, && (!le16_eq(name[1], const_cpu_to_le16('.')))) ni->flags = le32_or(ni->flags, FILE_ATTR_HIDDEN); else - ni->flags = le32_and(ni->flags, ~FILE_ATTR_HIDDEN); + ni->flags = le32_and(ni->flags, le32_not(FILE_ATTR_HIDDEN)); } /* Create FILE_NAME attribute. */ diff --git a/libntfs-3g/inode.c b/libntfs-3g/inode.c index 66e5d684..cc62355c 100644 --- a/libntfs-3g/inode.c +++ b/libntfs-3g/inode.c @@ -870,7 +870,7 @@ static int ntfs_inode_sync_file_name(ntfs_inode *ni, ntfs_inode *dir_ni) /* Update flags and file size. */ fnx = (FILE_NAME_ATTR *)ictx->data; fnx->file_attributes = - le32_or(le32_and(fnx->file_attributes, ~FILE_ATTR_VALID_FLAGS), + le32_or(le32_and(fnx->file_attributes, le32_not(FILE_ATTR_VALID_FLAGS)), le32_and(ni->flags, FILE_ATTR_VALID_FLAGS)); if (!le16_andz(ni->mrec->flags, MFT_RECORD_IS_DIRECTORY)) fnx->data_size = fnx->allocated_size diff --git a/libntfs-3g/reparse.c b/libntfs-3g/reparse.c index efe71596..1b304002 100644 --- a/libntfs-3g/reparse.c +++ b/libntfs-3g/reparse.c @@ -1210,7 +1210,7 @@ int ntfs_remove_ntfs_reparse_data(ntfs_inode *ni) res = ntfs_attr_rm(na); if (!res) { ni->flags = le32_and(ni->flags, - ~FILE_ATTR_REPARSE_POINT); + le32_not(FILE_ATTR_REPARSE_POINT)); NInoFileNameSetDirty(ni); } else { /* diff --git a/libntfs-3g/security.c b/libntfs-3g/security.c index 5ae58fc6..4f8c95fe 100644 --- a/libntfs-3g/security.c +++ b/libntfs-3g/security.c @@ -2949,7 +2949,7 @@ int ntfs_set_owner_mode(struct SECURITY_CONTEXT *scx, ntfs_inode *ni, /* adjust Windows read-only flag */ if (!isdir) { if (mode & S_IWUSR) - ni->flags = le32_and(ni->flags, ~FILE_ATTR_READONLY); + ni->flags = le32_and(ni->flags, le32_not(FILE_ATTR_READONLY)); else ni->flags = le32_or(ni->flags, FILE_ATTR_READONLY); NInoFileNameSetDirty(ni); @@ -4449,7 +4449,7 @@ int ntfs_set_ntfs_attrib(ntfs_inode *ni, } } if (!res) { - ni->flags = le32_or(le32_and(ni->flags, ~settable), + ni->flags = le32_or(le32_and(ni->flags, le32_not(settable)), le32_and(cpu_to_le32(attrib), settable)); NInoFileNameSetDirty(ni); NInoSetDirty(ni); @@ -5054,7 +5054,7 @@ BOOL ntfs_set_file_attributes(struct SECURITY_API *scapi, } } if (!res) { - ni->flags = le32_or(le32_and(ni->flags, ~settable), + ni->flags = le32_or(le32_and(ni->flags, le32_not(settable)), le32_and(cpu_to_le32(attrib), settable)); NInoSetDirty(ni); NInoFileNameSetDirty(ni); diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c index 17a7b042..c0727b4d 100644 --- a/ntfsprogs/ntfsinfo.c +++ b/ntfsprogs/ntfsinfo.c @@ -516,71 +516,71 @@ static void ntfs_dump_flags(const char *indent, ATTR_TYPES type, le32 flags) printf("%sFile attributes:\t", indent); if (!le32_andz(flags, FILE_ATTR_READONLY)) { printf(" READONLY"); - flags = le32_and(flags, ~FILE_ATTR_READONLY); + flags = le32_and(flags, le32_not(FILE_ATTR_READONLY)); } if (!le32_andz(flags, FILE_ATTR_HIDDEN)) { printf(" HIDDEN"); - flags = le32_and(flags, ~FILE_ATTR_HIDDEN); + flags = le32_and(flags, le32_not(FILE_ATTR_HIDDEN)); } if (!le32_andz(flags, FILE_ATTR_SYSTEM)) { printf(" SYSTEM"); - flags = le32_and(flags, ~FILE_ATTR_SYSTEM); + flags = le32_and(flags, le32_not(FILE_ATTR_SYSTEM)); } if (!le32_andz(flags, FILE_ATTR_DIRECTORY)) { printf(" DIRECTORY"); - flags = le32_and(flags, ~FILE_ATTR_DIRECTORY); + flags = le32_and(flags, le32_not(FILE_ATTR_DIRECTORY)); } if (!le32_andz(flags, FILE_ATTR_ARCHIVE)) { printf(" ARCHIVE"); - flags = le32_and(flags, ~FILE_ATTR_ARCHIVE); + flags = le32_and(flags, le32_not(FILE_ATTR_ARCHIVE)); } if (!le32_andz(flags, FILE_ATTR_DEVICE)) { printf(" DEVICE"); - flags = le32_and(flags, ~FILE_ATTR_DEVICE); + flags = le32_and(flags, le32_not(FILE_ATTR_DEVICE)); } if (!le32_andz(flags, FILE_ATTR_NORMAL)) { printf(" NORMAL"); - flags = le32_and(flags, ~FILE_ATTR_NORMAL); + flags = le32_and(flags, le32_not(FILE_ATTR_NORMAL)); } if (!le32_andz(flags, FILE_ATTR_TEMPORARY)) { printf(" TEMPORARY"); - flags = le32_and(flags, ~FILE_ATTR_TEMPORARY); + flags = le32_and(flags, le32_not(FILE_ATTR_TEMPORARY)); } if (!le32_andz(flags, FILE_ATTR_SPARSE_FILE)) { printf(" SPARSE_FILE"); - flags = le32_and(flags, ~FILE_ATTR_SPARSE_FILE); + flags = le32_and(flags, le32_not(FILE_ATTR_SPARSE_FILE)); } if (!le32_andz(flags, FILE_ATTR_REPARSE_POINT)) { printf(" REPARSE_POINT"); - flags = le32_and(flags, ~FILE_ATTR_REPARSE_POINT); + flags = le32_and(flags, le32_not(FILE_ATTR_REPARSE_POINT)); } if (!le32_andz(flags, FILE_ATTR_COMPRESSED)) { printf(" COMPRESSED"); - flags = le32_and(flags, ~FILE_ATTR_COMPRESSED); + flags = le32_and(flags, le32_not(FILE_ATTR_COMPRESSED)); } if (!le32_andz(flags, FILE_ATTR_OFFLINE)) { printf(" OFFLINE"); - flags = le32_and(flags, ~FILE_ATTR_OFFLINE); + flags = le32_and(flags, le32_not(FILE_ATTR_OFFLINE)); } if (!le32_andz(flags, FILE_ATTR_NOT_CONTENT_INDEXED)) { printf(" NOT_CONTENT_INDEXED"); - flags = le32_and(flags, ~FILE_ATTR_NOT_CONTENT_INDEXED); + flags = le32_and(flags, le32_not(FILE_ATTR_NOT_CONTENT_INDEXED)); } if (!le32_andz(flags, FILE_ATTR_ENCRYPTED)) { printf(" ENCRYPTED"); - flags = le32_and(flags, ~FILE_ATTR_ENCRYPTED); + flags = le32_and(flags, le32_not(FILE_ATTR_ENCRYPTED)); } /* We know that FILE_ATTR_I30_INDEX_PRESENT only exists on $FILE_NAME, and in case we are wrong, let it appear as UNKNOWN */ if (le32_eq(type, AT_FILE_NAME)) { if (!le32_andz(flags, FILE_ATTR_I30_INDEX_PRESENT)) { printf(" I30_INDEX"); - flags = le32_and(flags, ~FILE_ATTR_I30_INDEX_PRESENT); + flags = le32_and(flags, le32_not(FILE_ATTR_I30_INDEX_PRESENT)); } } if (!le32_andz(flags, FILE_ATTR_VIEW_INDEX_PRESENT)) { printf(" VIEW_INDEX"); - flags = le32_and(flags, ~FILE_ATTR_VIEW_INDEX_PRESENT); + flags = le32_and(flags, le32_not(FILE_ATTR_VIEW_INDEX_PRESENT)); } if (!le32_cmpz(flags)) printf(" UNKNOWN: 0x%08x", (unsigned int)le32_to_cpu(flags));