proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-28 17:24:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1848 from libgit2/ntk/fix/cl_assert_equal_sz

Browse Source 
Fix cl_assert_equal_sz error message formating
This commit is contained in:
Vicent Martí 2013-09-12 06:42:06 -07:00
commit 25803c632d
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests-clar/clar.c
View File

@ -468,7 +468,7 @@ void clar__assert_equal(
}
}
}
else if (!strcmp(PRIuZ, fmt) || !strcmp(PRIxZ, fmt)) {
else if (!strcmp("%"PRIuZ, fmt) || !strcmp("%"PRIxZ, fmt)) {
size_t sz1 = va_arg(args, size_t), sz2 = va_arg(args, size_t);
is_equal = (sz1 == sz2);
if (!is_equal) {

1
tests-clar/clar.h
View File

@ -68,6 +68,7 @@ void cl_fixture_cleanup(const char *fixture_name);
#define cl_assert_equal_p(p1,p2) clar__assert_equal(__FILE__,__LINE__,"Pointer mismatch: " #p1 " != " #p2, 1, "%p", (p1), (p2))
#define cl_assert_equal_sz(sz1,sz2) clar__assert_equal(__FILE__,__LINE__,#sz1 " != " #sz2, 1, "%"PRIuZ, (size_t)(sz1), (size_t)(sz2))
void clar__fail(
const char *file,

2
tests-clar/clar_libgit2.h
View File

@ -32,8 +32,6 @@ void cl_git_report_failure(int, const char *, int, const char *);
#define cl_assert_at_line(expr,file,line) \
clar__assert((expr) != 0, file, line, "Expression is not true: " #expr, NULL, 1)
#define cl_assert_equal_sz(sz1,sz2) clar__assert_equal(__FILE__,__LINE__,#sz1 " != " #sz2, 1, PRIuZ, (size_t)(sz1), (size_t)(sz2))
GIT_INLINE(void) clar__assert_in_range(
int lo, int val, int hi,
const char *file, int line, const char *err, int should_abort)