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

Replace all le16 zero "and" test conditions with le16_andz(...).

edge.strict_endians
Erik Larsson 2016-01-28 08:28:47 +01:00
parent 35c72761c7
commit 1b7bfaa133
18 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libntfs-3g/attrib.c
View File

@ -480,7 +480,7 @@ ntfs_attr *ntfs_attr_open(ntfs_inode *ni, const ATTR_TYPES type,
/* a file may be sparse though its unnamed data is not (cf $UsnJrnl) */
if (le32_eq(na->type, AT_DATA) && na->name == AT_UNNAMED &&
((!le16_andz(a->flags, ATTR_IS_SPARSE) && !NAttrSparse(na)) ||
(!(a->flags & ATTR_IS_ENCRYPTED) != !NAttrEncrypted(na)))) {
(le16_andz(a->flags, ATTR_IS_ENCRYPTED) != !NAttrEncrypted(na)))) {
errno = EIO;
ntfs_log_perror("Inode %lld has corrupt attribute flags "
"(0x%x <> 0x%x)",(unsigned long long)ni->mft_no,
@ -5446,7 +5446,7 @@ static int ntfs_attr_update_meta(ATTR_RECORD *a, ntfs_attr *na, MFT_RECORD *m,
/* Check whether attribute becomes sparse, unless check is delayed. */
if ((holes != HOLES_DELAY)
&& sparse
&& !(a->flags & (ATTR_IS_SPARSE | ATTR_IS_COMPRESSED))) {
&& le16_andz(a->flags, ATTR_IS_SPARSE | ATTR_IS_COMPRESSED)) {
/*
* Move attribute to another mft record, if attribute is too
* small to add compressed_size field to it and we have no
@ -5495,7 +5495,7 @@ static int ntfs_attr_update_meta(ATTR_RECORD *a, ntfs_attr *na, MFT_RECORD *m,
/* Attribute no longer sparse. */
if (!sparse && !le16_andz(a->flags, ATTR_IS_SPARSE) &&
!(a->flags & ATTR_IS_COMPRESSED)) {
le16_andz(a->flags, ATTR_IS_COMPRESSED)) {
NAttrClearSparse(na);
a->flags &= ~ATTR_IS_SPARSE;
@ -5586,10 +5586,10 @@ retry:
*/
if ((holes != HOLES_DELAY)
&& (!NAttrFullyMapped(na) || from_vcn)
&& !(na->data_flags & ATTR_IS_COMPRESSED)) {
&& le16_andz(na->data_flags, ATTR_IS_COMPRESSED)) {
BOOL changed;
if (!(na->data_flags & ATTR_IS_SPARSE)) {
if (le16_andz(na->data_flags, ATTR_IS_SPARSE)) {
int sparse = 0;
runlist_element *xrl;
@ -6109,7 +6109,7 @@ static int ntfs_non_resident_attr_shrink(ntfs_attr *na, const s64 newsize)
/* If the attribute now has zero size, make it resident. */
if (!newsize) {
if (!(na->data_flags & ATTR_IS_ENCRYPTED)
if (le16_andz(na->data_flags, ATTR_IS_ENCRYPTED)
&& ntfs_attr_make_resident(na, ctx)) {
/* If couldn't make resident, just continue. */
if (errno != EPERM)

6
libntfs-3g/dir.c
View File

@ -352,7 +352,7 @@ u64 ntfs_inode_lookup_by_name(ntfs_inode *dir_ni,
* ENOENT, unless we have got the mft reference of a matching name
* cached in mref in which case return mref.
*/
if (!(ie->ie_flags & INDEX_ENTRY_NODE)) {
if (le16_andz(ie->ie_flags, INDEX_ENTRY_NODE)) {
ntfs_attr_put_search_ctx(ctx);
if (mref)
return mref;
@ -1132,7 +1132,7 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64 *pos,
return -1;
}
if (!(dir_ni->mrec->flags & MFT_RECORD_IS_DIRECTORY)) {
if (le16_andz(dir_ni->mrec->flags, MFT_RECORD_IS_DIRECTORY)) {
errno = ENOTDIR;
return -1;
}
@ -1791,7 +1791,7 @@ int ntfs_check_empty_dir(ntfs_inode *ni)
ntfs_attr *na;
int ret = 0;
if (!(ni->mrec->flags & MFT_RECORD_IS_DIRECTORY))
if (le16_andz(ni->mrec->flags, MFT_RECORD_IS_DIRECTORY))
return 0;
na = ntfs_attr_open(ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4);

4
libntfs-3g/efs.c
View File

@ -164,7 +164,7 @@ static int fixup_loop(ntfs_inode *ni)
ntfs_log_error("can't open DATA Attribute\n");
res = -1;
}
if (na && !(ctx->attr->flags & ATTR_IS_ENCRYPTED)) {
if (na && le16_andz(ctx->attr->flags, ATTR_IS_ENCRYPTED)) {
if (!NAttrNonResident(na)
&& ntfs_attr_make_non_resident(na, ctx)) {
/*
@ -290,7 +290,7 @@ int ntfs_set_efs_info(ntfs_inode *ni, const char *value, size_t size,
}
if (!res) {
/* Don't handle AT_DATA Attribute(s) if inode is a directory */
if (!(ni->mrec->flags & MFT_RECORD_IS_DIRECTORY)) {
if (le16_andz(ni->mrec->flags, MFT_RECORD_IS_DIRECTORY)) {
/* iterate over AT_DATA attributes */
/* set encrypted flag, truncate attribute to match padding bytes */

6
libntfs-3g/index.c
View File

@ -552,7 +552,7 @@ static int ntfs_ie_lookup(const void *key, const int key_len,
* presence of a child node and if not present return with errno ENOENT,
* otherwise we will keep searching in another index block.
*/
if (!(ie->ie_flags & INDEX_ENTRY_NODE)) {
if (le16_andz(ie->ie_flags, INDEX_ENTRY_NODE)) {
ntfs_log_debug("Index entry wasn't found.\n");
*ie_out = ie;
errno = ENOENT;
@ -1302,7 +1302,7 @@ static int ntfs_ih_insert(INDEX_HEADER *ih, INDEX_ENTRY *orig_ie, VCN new_vcn,
if (!ie)
return STATUS_ERROR;
if (!(ie->ie_flags & INDEX_ENTRY_NODE))
if (le16_andz(ie->ie_flags, INDEX_ENTRY_NODE))
if (ntfs_ie_add_vcn(&ie))
goto out;
@ -1344,7 +1344,7 @@ static int ntfs_ir_insert_median(ntfs_index_context *icx, INDEX_ENTRY *median,
new_size = le32_to_cpu(icx->ir->index.index_length) +
le16_to_cpu(median->length);
if (!(median->ie_flags & INDEX_ENTRY_NODE))
if (le16_andz(median->ie_flags, INDEX_ENTRY_NODE))
new_size += sizeof(VCN);
ret = ntfs_ir_make_space(icx, new_size);

4
libntfs-3g/inode.c
View File

@ -175,7 +175,7 @@ static ntfs_inode *ntfs_inode_real_open(ntfs_volume *vol, const MFT_REF mref)
goto out;
if (ntfs_file_record_read(vol, mref, &ni->mrec, NULL))
goto err_out;
if (!(ni->mrec->flags & MFT_RECORD_IN_USE)) {
if (le16_andz(ni->mrec->flags, MFT_RECORD_IN_USE)) {
errno = ENOENT;
goto err_out;
}
@ -512,7 +512,7 @@ int ntfs_inode_close(ntfs_inode *ni)
if (ni->vol && ni->vol->nidata_cache
&& ((ni->mft_no == FILE_root)
|| ((ni->mft_no >= FILE_first_user)
&& !(ni->mrec->flags & MFT_RECORD_IS_4)))) {
&& le16_andz(ni->mrec->flags, MFT_RECORD_IS_4)))) {
/* If we have dirty metadata, write it out. */
dirty = NInoDirty(ni) || NInoAttrListDirty(ni);
if (dirty) {

2
libntfs-3g/logfile.c
View File

@ -682,7 +682,7 @@ BOOL ntfs_is_logfile_clean(ntfs_attr *log_na, RESTART_PAGE_HEADER *rp)
* we assume there was an unclean shutdown.
*/
if (!le16_eq(ra->client_in_use_list, LOGFILE_NO_CLIENT) &&
!(ra->flags & RESTART_VOLUME_IS_CLEAN)) {
le16_andz(ra->flags, RESTART_VOLUME_IS_CLEAN)) {
ntfs_log_error("The disk contains an unclean file system (%d, "
"%d).\n", le16_to_cpu(ra->client_in_use_list),
le16_to_cpu(ra->flags));

2
libntfs-3g/reparse.c
View File

@ -450,7 +450,7 @@ static BOOL valid_reparse_data(ntfs_inode *ni,
offs = le16_to_cpu(mount_point_data->subst_name_offset);
lth = le16_to_cpu(mount_point_data->subst_name_length);
/* consistency checks */
if (!(ni->mrec->flags & MFT_RECORD_IS_DIRECTORY)
if (le16_andz(ni->mrec->flags, MFT_RECORD_IS_DIRECTORY)
|| ((size_t)((sizeof(REPARSE_POINT)
+ sizeof(struct MOUNT_POINT_REPARSE_DATA)
+ offs + lth)) > size))

6
libntfs-3g/security.c
View File

@ -725,7 +725,7 @@ static le32 entersecurityattr(ntfs_volume *vol,
psii = (struct SII*)entry;
}
if (psii
&& !(psii->flags & INDEX_ENTRY_END)) {
&& le16_andz(psii->flags, INDEX_ENTRY_END)) {
/* save first key and */
/* available position */
keyid = psii->keysecurid;
@ -4927,10 +4927,10 @@ int ntfs_set_file_security(struct SECURITY_API *scapi,
/* if selected, owner and group must be present or defaulted */
missing = ((selection & OWNER_SECURITY_INFORMATION)
&& le32_cmpz(phead->owner)
&& !(phead->control & SE_OWNER_DEFAULTED))
&& le16_andz(phead->control, SE_OWNER_DEFAULTED))
|| ((selection & GROUP_SECURITY_INFORMATION)
&& le32_cmpz(phead->group)
&& !(phead->control & SE_GROUP_DEFAULTED));
&& le16_andz(phead->control, SE_GROUP_DEFAULTED));
if (!missing
&& !le16_andz(phead->control, SE_SELF_RELATIVE)
&& ntfs_valid_descr(attr, attrsz)) {

8
ntfsprogs/mkntfs.c
View File

@ -2506,7 +2506,7 @@ static int upgrade_to_large_index(MFT_RECORD *m, const char *name,
ia_val->index.allocated_size = cpu_to_le32(index_block_size -
(sizeof(INDEX_ALLOCATION) - sizeof(INDEX_HEADER)));
/* Find the last entry in the index root and save it in re. */
while ((char*)re < re_end && !(re->ie_flags & INDEX_ENTRY_END)) {
while ((char*)re < re_end && le16_andz(re->ie_flags, INDEX_ENTRY_END)) {
/* Next entry in index root. */
re = (INDEX_ENTRY*)((char*)re + le16_to_cpu(re->length));
}
@ -2742,7 +2742,7 @@ static int insert_index_entry_in_res_dir_index(INDEX_ENTRY *idx, u32 idx_size,
*/
if (le32_eq(type, AT_FILE_NAME)) {
while (((u8*)idx_entry < (u8*)idx_end) &&
!(idx_entry->ie_flags & INDEX_ENTRY_END)) {
le16_andz(idx_entry->ie_flags, INDEX_ENTRY_END)) {
/*
i = ntfs_file_values_compare(&idx->key.file_name,
&idx_entry->key.file_name, 1,
@ -2787,7 +2787,7 @@ do_next:
}
} else if (le32_eq(type, AT_UNUSED)) { /* case view */
while (((u8*)idx_entry < (u8*)idx_end) &&
!(idx_entry->ie_flags & INDEX_ENTRY_END)) {
le16_andz(idx_entry->ie_flags, INDEX_ENTRY_END)) {
i = ntfs_index_keys_compare((u8*)idx + 0x10,
(u8*)idx_entry + 0x10,
le16_to_cpu(idx->key_length),
@ -3036,7 +3036,7 @@ static int insert_file_link_in_dir_index(INDEX_BLOCK *idx, leMFT_REF file_ref,
* Loop until we exceed valid memory (corruption case) or until we
* reach the last entry.
*/
while ((char*)ie < index_end && !(ie->ie_flags & INDEX_ENTRY_END)) {
while ((char*)ie < index_end && le16_andz(ie->ie_flags, INDEX_ENTRY_END)) {
#if 0
#ifdef DEBUG
ntfs_log_debug("file_name_attr1->file_name_length = %i\n",

8
ntfsprogs/ntfsclone.c
View File

@ -1086,7 +1086,7 @@ static void wipe_index_entry_timestams(INDEX_ENTRY *e)
le64 timestamp = timespec2ntfs(zero_time);
/* FIXME: can fall into infinite loop if corrupted */
while (!(e->ie_flags & INDEX_ENTRY_END)) {
while (le16_andz(e->ie_flags, INDEX_ENTRY_END)) {
e->key.file_name.creation_time = timestamp;
e->key.file_name.last_data_change_time = timestamp;
@ -1202,7 +1202,7 @@ static void wipe_index_root_timestamps(ATTR_RECORD *attr, le64 timestamp)
entry = (INDEX_ENTRY *)((u8 *)iroot +
le32_to_cpu(iroot->index.entries_offset) + 0x10);
while (!(entry->ie_flags & INDEX_ENTRY_END)) {
while (le16_andz(entry->ie_flags, INDEX_ENTRY_END)) {
if (le32_eq(iroot->type, AT_FILE_NAME)) {
@ -1385,7 +1385,7 @@ static void wipe_mft(char *mrec, u32 mrecsz, u64 mft_no)
image.ni = &ni;
ntfs_mst_post_read_fixup_warn((NTFS_RECORD*)mrec,mrecsz,FALSE);
wipe_unused_mft_data(&ni);
if (!(((MFT_RECORD*)mrec)->flags & MFT_RECORD_IN_USE)) {
if (le16_andz(((MFT_RECORD*)mrec)->flags, MFT_RECORD_IN_USE)) {
wipe_unused_mft(&ni);
} else {
/* ctx with no ntfs_inode prevents from searching external attrs */
@ -1955,7 +1955,7 @@ static int walk_clusters(ntfs_volume *volume, struct ntfs_walk_cluster *walk)
continue;
}
deleted_inode = !(ni->mrec->flags & MFT_RECORD_IN_USE);
deleted_inode = le16_andz(ni->mrec->flags, MFT_RECORD_IN_USE);
if (deleted_inode && !opt.metadata_image) {

2
ntfsprogs/ntfscp.c
View File

@ -930,7 +930,7 @@ int main(int argc, char *argv[])
dir_ni = ntfs_inode_open(vol, FILE_root);
}
if (dir_ni) {
if (!(dir_ni->mrec->flags & MFT_RECORD_IS_DIRECTORY)) {
if (le16_andz(dir_ni->mrec->flags, MFT_RECORD_IS_DIRECTORY)) {
/* Remove the last '/' for estetic reasons. */
dirname_last_whack[0] = 0;
ntfs_log_error("The file '%s' already exists "

2
ntfsprogs/ntfsdecrypt.c
View File

@ -1448,7 +1448,7 @@ static int ntfs_feed_encrypt(ntfs_inode *inode, ntfs_fek *fek)
}
total = 0;
if (!(attr->data_flags & ATTR_IS_ENCRYPTED)) {
if (le16_andz(attr->data_flags, ATTR_IS_ENCRYPTED)) {
ntfs_log_error("The data stream was not encrypted\n");
goto rejected;
}

4
ntfsprogs/ntfsfix.c
View File

@ -236,7 +236,7 @@ static int OLD_ntfs_volume_set_flags(ntfs_volume *vol, const le16 flags)
return -1;
}
/* Sanity check */
if (!(m->flags & MFT_RECORD_IN_USE)) {
if (le16_andz(m->flags, MFT_RECORD_IN_USE)) {
ntfs_log_error("$Volume has been deleted. Cannot handle this "
"yet. Run chkdsk to fix this.\n");
errno = EIO;
@ -516,7 +516,7 @@ static int fix_mftmirr(ntfs_volume *vol)
goto error_exit;
}
/* $MFT is corrupt but $MFTMirr is ok, use $MFTMirr. */
if (!(mrec->flags & MFT_RECORD_IN_USE) &&
if (le16_andz(mrec->flags, MFT_RECORD_IN_USE) &&
!ntfs_is_mft_record(mrec->magic))
use_mirr = TRUE;
}

2
ntfsprogs/ntfsmove.c
View File

@ -901,7 +901,7 @@ int main(int argc, char *argv[])
* This means that the dirty flag is possibly not set, but
* should be set. So we explicitly set it with a call to
* ntfs_volume_write_flags. */
if(!(vol->flags & VOLUME_IS_DIRTY) && ntfs_volume_write_flags(
if(le16_andz(vol->flags, VOLUME_IS_DIRTY) && ntfs_volume_write_flags(
vol, vol->flags | VOLUME_IS_DIRTY)) {
ntfs_log_error("Error: Failed to set volume dirty "
"flag (%d (%s))!\n", errno, strerror(errno));

2
ntfsprogs/ntfsresize.c
View File

@ -2022,7 +2022,7 @@ static void relocate_inode(ntfs_resize_t *resize, MFT_REF mref, int do_mftdata)
perr_exit("ntfs_file_record_record");
}
if (!(resize->mrec->flags & MFT_RECORD_IN_USE))
if (le16_andz(resize->mrec->flags, MFT_RECORD_IN_USE))
return;
resize->mref = mref;

2
ntfsprogs/ntfsundelete.c
View File

@ -955,7 +955,7 @@ static FILE_NAME_ATTR* verify_parent(struct filename* name, MFT_RECORD* rec)
if (!name || !rec)
return NULL;
if (!(rec->flags & MFT_RECORD_IS_DIRECTORY)) {
if (le16_andz(rec->flags, MFT_RECORD_IS_DIRECTORY)) {
return NULL;
}

2
src/lowntfs-3g.c
View File

@ -1271,7 +1271,7 @@ static void ntfs_fuse_open(fuse_req_t req, fuse_ino_t ino,
#ifdef HAVE_SETXATTR /* extended attributes interface required */
/* mark a future need to fixup encrypted inode */
if (ctx->efs_raw
&& !(na->data_flags & ATTR_IS_ENCRYPTED)
&& le16_andz(na->data_flags, ATTR_IS_ENCRYPTED)
&& (ni->flags & FILE_ATTR_ENCRYPTED))
state |= CLOSE_ENCRYPTED;
#endif /* HAVE_SETXATTR */

2
src/ntfs-3g.c
View File

@ -1208,7 +1208,7 @@ static int ntfs_fuse_open(const char *org_path,
#ifdef HAVE_SETXATTR /* extended attributes interface required */
/* mark a future need to fixup encrypted inode */
if (ctx->efs_raw
&& !(na->data_flags & ATTR_IS_ENCRYPTED)
&& le16_andz(na->data_flags, ATTR_IS_ENCRYPTED)
&& (ni->flags & FILE_ATTR_ENCRYPTED))
fi->fh |= CLOSE_ENCRYPTED;
#endif /* HAVE_SETXATTR */