X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a8726d2a0695073a6321ec030eebb2af8709a21d..00ed4b5bf3e0980b62327c88445d11cc60fb164e:/flist.c diff --git a/flist.c b/flist.c index 6a11d0f9..00076561 100644 --- a/flist.c +++ b/flist.c @@ -367,11 +367,12 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags) } else rdev = 0; } else if (IS_DEVICE(mode)) { - if ((file->u.rdev & ~0xFF) == rdev_high) + if ((file->u.rdev & ~(DEV64_T)0xFF) == rdev_high) { flags |= XMIT_SAME_HIGH_RDEV; - else { rdev = file->u.rdev; - rdev_high = rdev & ~0xFF; + } else { + rdev = file->u.rdev; + rdev_high = rdev & ~(DEV64_T)0xFF; } } } @@ -594,7 +595,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, } else if (IS_DEVICE(mode)) { if (!(flags & XMIT_SAME_HIGH_RDEV)) { rdev = (DEV64_T)read_int(f); - rdev_high = rdev & ~0xFF; + rdev_high = rdev & ~(DEV64_T)0xFF; } else rdev = rdev_high | (DEV64_T)read_byte(f); }