aboutsummaryrefslogtreecommitdiff
path: root/src/sg_read.c
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@interlog.com>2014-12-30 17:43:43 +0000
committerDouglas Gilbert <dgilbert@interlog.com>2014-12-30 17:43:43 +0000
commit28a9dd72d6c5297f8a1442e23b80c165ba0b8486 (patch)
tree884f4e8f053d22228e96152cd3e7a3d05d30e494 /src/sg_read.c
parentb9d3507d55b42f80615e79ee268f875bc9b56a41 (diff)
downloadsg3_utils-28a9dd72d6c5297f8a1442e23b80c165ba0b8486.tar.gz
introduce uintptr_t in place of unsigned long, w7 64 bit requirement
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@625 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_read.c')
-rw-r--r--src/sg_read.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sg_read.c b/src/sg_read.c
index 0f102864..3fc0526c 100644
--- a/src/sg_read.c
+++ b/src/sg_read.c
@@ -48,7 +48,7 @@
#include "sg_io_linux.h"
-static const char * version_str = "1.21 20140516";
+static const char * version_str = "1.22 20141227";
#define DEF_BLOCK_SIZE 512
#define DEF_BLOCKS_PER_TRANSFER 128
@@ -659,7 +659,7 @@ int main(int argc, char * argv[])
return SG_LIB_CAT_OTHER;
}
/* perhaps use posix_memalign() instead */
- wrkPos = (unsigned char *)(((unsigned long)wrkBuff + psz - 1) &
+ wrkPos = (unsigned char *)(((uintptr_t)wrkBuff + psz - 1) &
(~(psz - 1)));
} else if (do_mmap) {
wrkPos = (unsigned char *)mmap(NULL, bs * bpt,