X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=c95a94f8d0ce4968dfe9266a47a68343c96b2fa9;hb=407057edd6b45cae437d119df80ff080989a2752;hp=bac0aa350ac24378e8af2b949cb0781a7699906a;hpb=f18b792838ee010b42091639b673c7b28606aa47;p=ccan

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index bac0aa35..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)
@@ -701,7 +701,7 @@ int failtest_open(const char *pathname,
 		free((char *)call.pathname);
 	p->u.open.ret = open(pathname, call.flags, call.mode);
 
-	if (!failpath && p->u.open.ret == -1) {
+	if (p->u.open.ret == -1) {
 		p->fail = false;
 		p->error = errno;
 	} else if (should_fail(p)) {