From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 29 Nov 2011 22:30:11 +0000 (+1030)
Subject: failtest: fix internal cut & paste bug
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=407057edd6b45cae437d119df80ff080989a2752;hp=b4ae30818ed7b5e670a99518e79595e7920f8e5c

failtest: fix internal cut & paste bug

failtest_malloc should use p->u.malloc not p->u.calloc.  The layouts
are identical, so it doesn't matter, but it's confusing and leaves us
open to weird bugs in future should one change.
---

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index f79768d8..c95a94f8 100644
--- a/ccan/failtest/failtest.c
+++ b/ccan/failtest/failtest.c
@@ -603,14 +603,14 @@ void *failtest_malloc(size_t size, const char *file, unsigned line)
 
 	p = add_history(FAILTEST_MALLOC, file, line, &call);
 	if (should_fail(p)) {
-		p->u.calloc.ret = NULL;
+		p->u.malloc.ret = NULL;
 		p->error = ENOMEM;
 	} else {
-		p->u.calloc.ret = malloc(size);
+		p->u.malloc.ret = malloc(size);
 		set_cleanup(p, cleanup_malloc, struct malloc_call);
 	}
 	errno = p->error;
-	return p->u.calloc.ret;
+	return p->u.malloc.ret;
 }
 
 static void cleanup_realloc(struct realloc_call *call)