pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/cmocka Pedantic format string logic requires voi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6bb84d9c0fb1
branches:  trunk
changeset: 652803:6bb84d9c0fb1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jun 08 13:38:50 2015 +0000

description:
Pedantic format string logic requires void * arguments for %p.

diffstat:

 devel/cmocka/distinfo                      |   3 +-
 devel/cmocka/patches/patch-.._src_cmocka.c |  31 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r 977d9510fe82 -r 6bb84d9c0fb1 devel/cmocka/distinfo
--- a/devel/cmocka/distinfo     Mon Jun 08 13:38:12 2015 +0000
+++ b/devel/cmocka/distinfo     Mon Jun 08 13:38:50 2015 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/03/31 15:13:06 joerg Exp $
+$NetBSD: distinfo,v 1.3 2015/06/08 13:38:50 joerg Exp $
 
 SHA1 (cmocka-1.0.0.tar.xz) = c1b6bdab164b2d54c26edacef9b9308e4de154f9
 RMD160 (cmocka-1.0.0.tar.xz) = e8e79a9cd50aff9af814d0804066c92d53f1cc88
 Size (cmocka-1.0.0.tar.xz) = 184016 bytes
 SHA1 (patch-.._include_cmocka.h) = 3aefedc23752eb5cf0fe2b7b43018b7e006bc0e8
+SHA1 (patch-.._src_cmocka.c) = 6519ad5d17aa04289ce7d834d181a499f85ee7fc
diff -r 977d9510fe82 -r 6bb84d9c0fb1 devel/cmocka/patches/patch-.._src_cmocka.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cmocka/patches/patch-.._src_cmocka.c        Mon Jun 08 13:38:50 2015 +0000
@@ -0,0 +1,31 @@
+$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);
+                 }
+             }



Home | Main Index | Thread Index | Old Index