From 423e3b0c4838537608bede2c166abd3b589dd23c Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Mon, 12 Aug 2013 11:02:53 -0700 Subject: [PATCH] Update to clar 7bf638b80 --- tests-clar/clar.c | 2 +- tests-clar/clar/sandbox.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests-clar/clar.c b/tests-clar/clar.c index fb10dd397..585af8a74 100644 --- a/tests-clar/clar.c +++ b/tests-clar/clar.c @@ -36,7 +36,7 @@ # define strncpy(to, from, to_size) strncpy_s(to, to_size, from, _TRUNCATE) # define W_OK 02 # define S_ISDIR(x) ((x & _S_IFDIR) != 0) -# define snprint_eq(buf,sz,fmt,a,b) _snprintf_s(buf,sz,_TRUNCATE,fmt,a,b) +# define snprint_eq(buf,sz,fmt,...) _snprintf_s(buf,sz,_TRUNCATE,fmt,__VA_ARGS__) # else # define snprint_eq snprintf # endif diff --git a/tests-clar/clar/sandbox.h b/tests-clar/clar/sandbox.h index 5622bfab7..1ca6fcae8 100644 --- a/tests-clar/clar/sandbox.h +++ b/tests-clar/clar/sandbox.h @@ -45,7 +45,7 @@ find_tmp_path(char *buffer, size_t length) #else DWORD env_len; - if ((env_len = GetEnvironmentVariable("CLAR_TMP", buffer, (DWORD)length)) > 0 && + if ((env_len = GetEnvironmentVariable("CLAR_TMP", buffer, length)) > 0 && env_len < length) return 0;