Simplify the setting of rdev & rdev_high in send_file_entry().
authorWayne Davison <wayned@samba.org>
Thu, 8 Apr 2004 23:15:39 +0000 (23:15 +0000)
committerWayne Davison <wayned@samba.org>
Thu, 8 Apr 2004 23:15:39 +0000 (23:15 +0000)
flist.c

diff --git a/flist.c b/flist.c
index 000765617162b83daf0f91e598b70a8df94b422c..6baa8bf807fe5a98f6ff1e4e2bbbea7f248671ba 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -367,13 +367,11 @@ 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 & ~(DEV64_T)0xFF) == rdev_high) {
+                       rdev = file->u.rdev;
+                       if ((rdev & ~(DEV64_T)0xFF) == rdev_high)
                                flags |= XMIT_SAME_HIGH_RDEV;
-                               rdev = file->u.rdev;
-                       } else {
-                               rdev = file->u.rdev;
+                       else
                                rdev_high = rdev & ~(DEV64_T)0xFF;
-                       }
                }
        }
        if (file->uid == uid)