From cc414d9e8b31c5fe24aa9ed9e0de54011a69925e Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Thu, 28 Jan 2016 08:28:55 +0100 Subject: [PATCH] Replace all le64 "or" calculations with le64_or(...). --- include/ntfs-3g/endians.h | 2 ++ ntfsprogs/ntfsclone.c | 4 ++-- ntfsprogs/ntfslabel.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/ntfs-3g/endians.h b/include/ntfs-3g/endians.h index 0defb5e4..dd43d96b 100644 --- a/include/ntfs-3g/endians.h +++ b/include/ntfs-3g/endians.h @@ -334,4 +334,6 @@ #define le32_or(a, b) ((a) | (b)) +#define le64_or(a, b) ((a) | (b)) + #endif /* defined _NTFS_ENDIANS_H */ diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c index 1a24b3b3..a9ba4334 100644 --- a/ntfsprogs/ntfsclone.c +++ b/ntfsprogs/ntfsclone.c @@ -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) diff --git a/ntfsprogs/ntfslabel.c b/ntfsprogs/ntfslabel.c index bded47b4..edc4a974 100644 --- a/ntfsprogs/ntfslabel.c +++ b/ntfsprogs/ntfslabel.c @@ -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,