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

Replace all le64 "or" calculations with le64_or(...).

edge.strict_endians
Erik Larsson 2016-01-28 08:28:55 +01:00
parent 1500a77676
commit cc414d9e8b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ntfs-3g/endians.h
View File

@ -334,4 +334,6 @@
#define le32_or(a, b) ((a) | (b))
#define le64_or(a, b) ((a) | (b))
#endif /* defined _NTFS_ENDIANS_H */

4
ntfsprogs/ntfsclone.c
View File

@ -821,8 +821,8 @@ static void copy_cluster(int rescue, u64 rescue_lcn, u64 lcn)
else {
mask = const_cpu_to_le64(~0x0ffffffffULL);
bs->volume_serial_number
= le64_and(volume_serial_number, mask)
| le64_and(bs->volume_serial_number, ~mask);
= le64_or(le64_and(volume_serial_number, mask),
le64_and(bs->volume_serial_number, ~mask));
}
/* Show the new full serial after merging */
if (!lcn)

4
ntfsprogs/ntfslabel.c
View File

@ -258,8 +258,8 @@ static int change_serial(ntfs_volume *vol, u64 sector, le64 serial_number,
else {
mask = const_cpu_to_le64(~0x0ffffffffULL);
bs->volume_serial_number
= le64_and(serial_number, mask)
| le64_and(bs->volume_serial_number, ~mask);
= le64_or(le64_and(serial_number, mask),
le64_and(bs->volume_serial_number, ~mask));
}
if (opts.noaction
|| (ntfs_pwrite(vol->dev,