Mon Jun 8 13:38:50 2015 UTC ()
Pedantic format string logic requires void * arguments for %p.
(joerg)
diff -r1.2 -r1.3 pkgsrc/devel/cmocka/distinfo
diff -r0 -r1.1 pkgsrc/devel/cmocka/patches/patch-.._src_cmocka.c
--- pkgsrc/devel/cmocka/distinfo 2015/03/31 15:13:06 1.2
+++ pkgsrc/devel/cmocka/distinfo 2015/06/08 13:38:50 1.3
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.2 2015/03/31 15:13:06 joerg Exp $ | | 1 | $NetBSD: distinfo,v 1.3 2015/06/08 13:38:50 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (cmocka-1.0.0.tar.xz) = c1b6bdab164b2d54c26edacef9b9308e4de154f9 | | 3 | SHA1 (cmocka-1.0.0.tar.xz) = c1b6bdab164b2d54c26edacef9b9308e4de154f9 |
| 4 | RMD160 (cmocka-1.0.0.tar.xz) = e8e79a9cd50aff9af814d0804066c92d53f1cc88 | | 4 | RMD160 (cmocka-1.0.0.tar.xz) = e8e79a9cd50aff9af814d0804066c92d53f1cc88 |
| 5 | Size (cmocka-1.0.0.tar.xz) = 184016 bytes | | 5 | Size (cmocka-1.0.0.tar.xz) = 184016 bytes |
| 6 | SHA1 (patch-.._include_cmocka.h) = 3aefedc23752eb5cf0fe2b7b43018b7e006bc0e8 | | 6 | SHA1 (patch-.._include_cmocka.h) = 3aefedc23752eb5cf0fe2b7b43018b7e006bc0e8 |
| | | 7 | SHA1 (patch-.._src_cmocka.c) = 6519ad5d17aa04289ce7d834d181a499f85ee7fc |
$NetBSD: patch-.._src_cmocka.c,v 1.1 2015/06/08 13:38:50 joerg Exp $
--- ../src/cmocka.c.orig 2015-06-08 12:54:44.000000000 +0000
+++ ../src/cmocka.c
@@ -960,7 +960,7 @@ static int memory_equal_display_error(co
}
if (differences) {
cm_print_error("%d bytes of %p and %p differ\n", differences,
- a, b);
+ (const void *)a, (const void *)b);
return 0;
}
return 1;
@@ -985,7 +985,7 @@ static int memory_not_equal_display_erro
}
if (same == size) {
cm_print_error("%"PRIdS "bytes of %p and %p the same\n", same,
- a, b);
+ (const void *)a, (const void *)b);
return 0;
}
return 1;
@@ -1646,7 +1646,7 @@ void _test_free(void* const ptr, const c
file, line,
ptr, (unsigned long)block_info->size,
block_info->location.file, block_info->location.line,
- &guard[j]);
+ (const void *)&guard[j]);
_fail(file, line);
}
}