From 34fddc8dbeda090ddb3d39539e19c32f758d8e73 Mon Sep 17 00:00:00 2001 From: brarcher Date: Mon, 23 Jun 2014 04:13:57 +0000 Subject: [PATCH] Use casts when assigning a void* The changes are necessary for Check to compile with a c++ compiler. git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@1171 64e312b2-a51f-0410-8e61-82d0ca0eb02a --- lib/snprintf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/snprintf.c b/lib/snprintf.c index 46735d4..6032fe7 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -850,7 +850,7 @@ rpl_vsnprintf(char *str, size_t size, const char *format, va_list args) * characters, in an implementation-defined * manner." (C99: 7.19.6.1, 8) */ - if ((strvalue = va_arg(args, void *)) == NULL) + if ((strvalue = (const char *)va_arg(args, void *)) == NULL) /* * We use the glibc format. BSD prints * "0x0", SysV "0". @@ -1513,7 +1513,7 @@ rpl_vasprintf(char **ret, const char *format, va_list ap) VA_COPY(aq, ap); len = vsnprintf(NULL, 0, format, aq); VA_END_COPY(aq); - if (len < 0 || (*ret = malloc(size = len + 1)) == NULL) + if (len < 0 || (*ret = (char *)malloc(size = len + 1)) == NULL) return -1; return vsnprintf(*ret, size, format, ap); } -- 2.50.1