From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 25 May 2010 22:21:32 +0000 (-0400)
Subject: dumpstuff nbytes can't exceed 32 bits
X-Git-Tag: openafs-devel-1_5_75~239
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=54b3fbe775077c4c4f832a14fae2d046de97fd9a;p=packages%2Fo%2Fopenafs.git

dumpstuff nbytes can't exceed 32 bits

the read returns a 32 bit type; we can't possibly need to write 64 bits.
(ssize_t is 32 bits on macos and so this ends up being a bad shift)

Change-Id: I4d8f99b0c752a2c75ce65b9cfa1b3cb0d484cc7f
Reviewed-on: http://gerrit.openafs.org/2024
Reviewed-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c
index ae244a04b..1051f6344 100644
--- a/src/volser/dumpstuff.c
+++ b/src/volser/dumpstuff.c
@@ -1560,7 +1560,7 @@ volser_WriteFile(int vn, struct iod *iodp, FdHandle_t * handleP, int tag,
 	if (nBytes > 0)
 	    written += nBytes;
 	if (nBytes != size) {
-	    Log("1 Volser: WriteFile: Error writing (%d,%u) bytes to vnode %d: %s; restore aborted\n", (int)(nBytes>>32), (int)(nBytes & 0xffffffff), vn, afs_error_message(errno));
+	    Log("1 Volser: WriteFile: Error writing (%u) bytes to vnode %d: %s; restore aborted\n", (int)(nBytes & 0xffffffff), vn, afs_error_message(errno));
 	    *status = 4;
 	    break;
 	}