Commit b4a09b72 authored by Wayne Davison's avatar Wayne Davison

Use new MAKEDEV() macro instead of makedev() directly.

parent 5a3810b4
...@@ -314,7 +314,7 @@ static void send_file_entry(struct file_struct *file, int f) ...@@ -314,7 +314,7 @@ static void send_file_entry(struct file_struct *file, int f)
if (!file) { if (!file) {
write_byte(f, 0); write_byte(f, 0);
modtime = 0, mode = 0; modtime = 0, mode = 0;
dev = 0, rdev = makedev(0, 0); dev = 0, rdev = MAKEDEV(0, 0);
rdev_major = 0; rdev_major = 0;
uid = 0, gid = 0; uid = 0, gid = 0;
*lastname = '\0'; *lastname = '\0';
...@@ -346,7 +346,7 @@ static void send_file_entry(struct file_struct *file, int f) ...@@ -346,7 +346,7 @@ static void send_file_entry(struct file_struct *file, int f)
flags |= XMIT_RDEV_MINOR_IS_SMALL; flags |= XMIT_RDEV_MINOR_IS_SMALL;
} }
} else if (protocol_version < 28) } else if (protocol_version < 28)
rdev = makedev(0, 0); rdev = MAKEDEV(0, 0);
if (file->uid == uid) if (file->uid == uid)
flags |= XMIT_SAME_UID; flags |= XMIT_SAME_UID;
else else
...@@ -497,7 +497,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist, ...@@ -497,7 +497,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
if (!flist) { if (!flist) {
modtime = 0, mode = 0; modtime = 0, mode = 0;
dev = 0, rdev = makedev(0, 0); dev = 0, rdev = MAKEDEV(0, 0);
rdev_major = 0; rdev_major = 0;
uid = 0, gid = 0; uid = 0, gid = 0;
*lastname = '\0'; *lastname = '\0';
...@@ -574,10 +574,10 @@ static struct file_struct *receive_file_entry(struct file_list *flist, ...@@ -574,10 +574,10 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
rdev_minor = read_byte(f); rdev_minor = read_byte(f);
else else
rdev_minor = read_int(f); rdev_minor = read_int(f);
rdev = makedev(rdev_major, rdev_minor); rdev = MAKEDEV(rdev_major, rdev_minor);
} }
} else if (protocol_version < 28) } else if (protocol_version < 28)
rdev = makedev(0, 0); rdev = MAKEDEV(0, 0);
#ifdef SUPPORT_LINKS #ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) { if (preserve_links && S_ISLNK(mode)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment