diff mbox

[2/2] devmem2: fix output when _FILE_OFFSET_BITS=64

Message ID 1403194417-19986-2-git-send-email-maxime.hadjinlian@gmail.com
State Accepted
Headers show

Commit Message

Maxime Hadjinlian June 19, 2014, 4:13 p.m. UTC 
From: Colin Didier <colin.didier@devialet.com>

When built with _FILE_OFFSET_BITS=64, off_t becomes an long long int
and was printed as an unsigned int which lead to a garbled output.

Signed-off-by: Colin Didier <colin.didier@devialet.com>
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@devialet.com>
---
 .../devmem2-0001-be-coherent-in-type-usage.patch   | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 package/devmem2/devmem2-0001-be-coherent-in-type-usage.patch

+2.0.0
+
--
2.0.0

Comments

Thomas Petazzoni June 29, 2014, 10:43 a.m. UTC | #1 
Dear Maxime Hadjinlian,

On Thu, 19 Jun 2014 18:13:37 +0200, Maxime Hadjinlian wrote:
> From: Colin Didier <colin.didier@devialet.com>
> 
> When built with _FILE_OFFSET_BITS=64, off_t becomes an long long int
> and was printed as an unsigned int which lead to a garbled output.
> 
> Signed-off-by: Colin Didier <colin.didier@devialet.com>
> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@devialet.com>

Applied, thanks.

Thomas
Thomas Petazzoni June 29, 2014, 2:31 p.m. UTC | #2 
Hello,

On Sun, 29 Jun 2014 12:43:48 +0200, Thomas Petazzoni wrote:
> Dear Maxime Hadjinlian,
> 
> On Thu, 19 Jun 2014 18:13:37 +0200, Maxime Hadjinlian wrote:
> > From: Colin Didier <colin.didier@devialet.com>
> > 
> > When built with _FILE_OFFSET_BITS=64, off_t becomes an long long int
> > and was printed as an unsigned int which lead to a garbled output.
> > 
> > Signed-off-by: Colin Didier <colin.didier@devialet.com>
> > Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@devialet.com>
> 
> Applied, thanks.

And the patch you provided against devmem did not apply... see
http://autobuild.buildroot.org/results/c45/c45eb706fb35ffc87fede777c3d20479a90872ae/build-end.log.
Looks like some whitespace issue, I've fixed that up, but it seems like
something is screwed in your setup to format or send patches.

Thanks,

Thomas
diff mbox

Patch

diff --git a/package/devmem2/devmem2-0001-be-coherent-in-type-usage.patch b/package/devmem2/devmem2-0001-be-coherent-in-type-usage.patch
new file mode 100644
index 0000000..14c99a2
--- /dev/null
+++ b/package/devmem2/devmem2-0001-be-coherent-in-type-usage.patch
@@ -0,0 +1,49 @@ 
+From 15eae3dbb3d6824a0fd478e2ce0fe879496bb72c Mon Sep 17 00:00:00 2001
+From: Colin Didier <colin.didier@devialet.com>
+Date: Thu, 19 Jun 2014 16:58:19 +0200
+Subject: [PATCH] be coherent in type usage
+
+- no need to use off_t because it is read from strtoul()
+- print unsigned int type correctly
+
+When built with _FILE_OFFSET_BITS=64, off_t becomes an long long int
+and was printed as an unsigned int which lead to a garbled output.
+
+Signed-off-by: Colin Didier <colin.didier@devialet.com>
+---
+ devmem2.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/devmem2.c b/devmem2.c
+index 7732ecb..1ae06ef 100644
+--- a/devmem2.c
++++ b/devmem2.c
+@@ -58,8 +58,7 @@
+ int main(int argc, char **argv) {
+     int fd;
+     void *map_base, *virt_addr;
+-	unsigned long read_result, writeval;
+-	off_t target;
++	unsigned long target, read_result, writeval;
+ 	int access_type = 'w';
+
+ 	if(argc < 2) {
+@@ -101,7 +100,7 @@ int main(int argc, char **argv) {
+ 			fprintf(stderr, "Illegal data type '%c'.\n", access_type);
+ 			exit(2);
+ 	}
+-    printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result);
++    printf("Value at address 0x%lX (%p): 0x%lX\n", target, virt_addr, read_result);
+     fflush(stdout);
+
+ 	if(argc > 3) {
+@@ -120,7 +119,7 @@ int main(int argc, char **argv) {
+ 				read_result = *((unsigned long *) virt_addr);
+ 				break;
+ 		}
+-		printf("Written 0x%X; readback 0x%X\n", writeval, read_result);
++		printf("Written 0x%lX; readback 0x%lX\n", writeval, read_result);
+ 		fflush(stdout);
+ 	}
+
+--