1 files changed, 6 insertions, 20 deletions

diff --git a/tests/logerr.c b/tests/logerr.c
index 78cdf10..86b6b1c 100644
--- a/tests/logerr.c
+++ b/tests/logerr.c
@@ -14,7 +14,7 @@ FNAME = __FILE__ ".txt";
 
 static int
 test_vlogerr(void) {
-	int rc = 0;
+	int rc = -1;
 
 	test_start("vlogerr()");
 	FILE *file = NULL;
@@ -26,7 +26,6 @@ test_vlogerr(void) {
 		file = fopen(FNAME, "w");
 		if (!file) {
 			perror("fopen(FNAME, \"w\")");
-			rc = -1;
 			goto out;
 		}
 
@@ -38,13 +37,11 @@ test_vlogerr(void) {
 		file = NULL;
 		if (ret) {
 			perror("fclose(file)");
-			rc = -1;
 			goto out;
 		}
 
 		if (slurp_for_tests(FNAME, &str)) {
 			perror("slurp_for_tests(FNAME, &str)");
-			rc = -1;
 			goto out;
 		}
 
@@ -63,7 +60,6 @@ test_vlogerr(void) {
 		file = fopen(FNAME, "w");
 		if (!file) {
 			perror("fopen(FNAME, \"w\")");
-			rc = -1;
 			goto out;
 		}
 
@@ -75,13 +71,11 @@ test_vlogerr(void) {
 		file = NULL;
 		if (ret) {
 			perror("fclose(file)");
-			rc = -1;
 			goto out;
 		}
 
 		if (slurp_for_tests(FNAME, &str)) {
 			perror("slurp_for_tests(FNAME, &str)");
-			rc = -1;
 			goto out;
 		}
 
@@ -100,7 +94,6 @@ test_vlogerr(void) {
 		file = fopen(FNAME, "w");
 		if (!file) {
 			perror("fopen(FNAME, \"w\")");
-			rc = -1;
 			goto out;
 		}
 
@@ -112,13 +105,11 @@ test_vlogerr(void) {
 		file = NULL;
 		if (ret) {
 			perror("fclose(file)");
-			rc = -1;
 			goto out;
 		}
 
 		if (slurp_for_tests(FNAME, &str)) {
 			perror("slurp_for_tests(FNAME, &str)");
-			rc = -1;
 			goto out;
 		}
 
@@ -137,7 +128,6 @@ test_vlogerr(void) {
 		file = fopen(FNAME, "w");
 		if (!file) {
 			perror("fopen(FNAME, \"w\")");
-			rc = -1;
 			goto out;
 		}
 
@@ -149,13 +139,11 @@ test_vlogerr(void) {
 		file = NULL;
 		if (ret) {
 			perror("fclose(file)");
-			rc = -1;
 			goto out;
 		}
 
 		if (slurp_for_tests(FNAME, &str)) {
 			perror("slurp_for_tests(FNAME, &str)");
-			rc = -1;
 			goto out;
 		}
 
@@ -174,7 +162,6 @@ test_vlogerr(void) {
 		file = fopen(FNAME, "w");
 		if (!file) {
 			perror("fopen(FNAME, \"w\")");
-			rc = -1;
 			goto out;
 		}
 
@@ -189,13 +176,11 @@ test_vlogerr(void) {
 		file = NULL;
 		if (ret) {
 			perror("fclose(file)");
-			rc = -1;
 			goto out;
 		}
 
 		if (slurp_for_tests(FNAME, &str)) {
 			perror("slurp_for_tests(FNAME, &str)");
-			rc = -1;
 			goto out;
 		}
 
@@ -210,6 +195,7 @@ test_vlogerr(void) {
 		test_ok();
 	}
 
+	rc = 0;
 out:
 	if (str) {
 		free(str);
@@ -225,7 +211,7 @@ out:
 
 static int
 test_logerr(void) {
-	int rc = 0;
+	int rc = -1;
 
 	test_start("logerr()");
 
@@ -258,26 +244,26 @@ test_logerr(void) {
 		test_ok();
 	}
 
+	rc = 0;
 	return rc;
 }
 
 
 int
 main(void) {
-	int rc = 0;
+	int rc = -1;
 
 	if (test_vlogerr()) {
 		perror("test_vlogerr()");
-		rc = -1;
 		goto out;
 	}
 
 	if (test_logerr()) {
 		perror("test_logerr()");
-		rc = -1;
 		goto out;
 	}
 
+	rc = 0;
 out:
 	return !!rc;
 }