1 files changed, 23 insertions, 24 deletions

diff --git a/tests/catalog.c b/tests/catalog.c
index 5e5a430..197d06b 100644
--- a/tests/catalog.c
+++ b/tests/catalog.c
@@ -37,13 +37,12 @@ test_i18n_init(void) {
 
 		const int should_overwrite = 1;
 		if (setenv(NLSPATH_KEY, "src/%N.en.cat", should_overwrite)) {
-			logerr("setenv(\"%s\", \"src/%%N.en.cat\", 1): %s\n",
-				NLSPATH_KEY, strerror(errno));
+			logerr("setenv(): %s", strerror(errno));
 			goto out;
 		}
 
 		if (i18n_init()) {
-			logerr("i18n_init()\n");
+			logerr("i18n_init()");
 			goto out;
 		}
 
@@ -53,7 +52,7 @@ test_i18n_init(void) {
 	rc = 0;
 out:
 	if (i18n_destroy()) {
-		logerr("i18n_destroy()\n");
+		logerr("i18n_destroy()");
 		rc = -1;
 	}
 	return rc;
@@ -77,19 +76,19 @@ test_s_print_msgs(void) {
 		}
 
 		if (s_print_msgs(TEST_MSGS, file, MSG_X_FIRST, MSG_X_LAST)) {
-			logerr("print_msgs(TEST_MSGS, file, MSG_X_FIRST, MSG_X_LAST)\n");
+			logerr("s_print_msgs()");
 			goto out;
 		}
 
 		const int ret = fclose(file);
 		file = NULL;
 		if (ret) {
-			logerr("fclose(file): %s\n", strerror(errno));
+			logerr("fclose(): %s", strerror(errno));
 			goto out;
 		}
 
 		if (slurp_for_tests(FNAME, &str)) {
-			logerr("slurp_for_tests(FNAME, &str)\n");
+			logerr("slurp_for_tests()");
 			goto out;
 		}
 
@@ -112,24 +111,24 @@ test_s_print_msgs(void) {
 
 		file = fopen(FNAME, "w");
 		if (!file) {
-			logerr("fopen(FNAME, \"w\"): %s\n", strerror(errno));
+			logerr("fopen(): %s", strerror(errno));
 			goto out;
 		}
 
 		if (s_print_msgs(TEST_MSGS, file, MSG_X_FIRST, MSG_X_FIRST)) {
-			logerr("s_print_msgs(TEST_MSGS, file, MSG_X_FIRST, MSG_X_FIRST)\n");
+			logerr("s_print_msgs()");
 			goto out;
 		}
 
 		const int ret = fclose(file);
 		file = NULL;
 		if (ret) {
-			logerr("fclose(file): %s\n", strerror(errno));
+			logerr("fclose(): %s", strerror(errno));
 			goto out;
 		}
 
 		if (slurp_for_tests(FNAME, &str)) {
-			logerr("slurp_for_tests(FNAME, &str)\n");
+			logerr("slurp_for_tests()");
 			goto out;
 		}
 
@@ -151,7 +150,7 @@ out:
 	}
 	if (file) {
 		if (fclose(file)) {
-			logerr("fclose(file): %s\n", strerror(errno));
+			logerr("fclose(): %s", strerror(errno));
 			rc = -1;
 		}
 	}
@@ -189,7 +188,7 @@ out:
 	}
 	if (file) {
 		if (fclose(file)) {
-			logerr("fclose(file): %s\n", strerror(errno));
+			logerr("fclose(): %s", strerror(errno));
 			rc = -1;
 		}
 	}
@@ -206,7 +205,7 @@ test_i18n_destroy(void) {
 		testing("simple call without init first");
 
 		if (i18n_destroy()) {
-			logerr("i18n_destroy()\n");
+			logerr("i18n_destroy()");
 			goto out;
 		}
 
@@ -231,24 +230,24 @@ test_s_print_msg(void) {
 
 		file = fopen(FNAME, "w");
 		if (!file) {
-			logerr("fopen(FNAME, \"w\"): %s\n");
+			logerr("fopen(): %s", strerror(errno));
 			goto out;
 		}
 
 		if (s_print_msg(TEST_MSGS, file, MSG_STANDALONE)) {
-			logerr("s_print_msg(TEST_MSGS, file, MSG_STANDALONE)\n");
+			logerr("s_print_msg()");
 			goto out;
 		}
 
 		const int ret = fclose(file);
 		file = NULL;
 		if (ret) {
-			logerr("fopen(file): %s\n", strerror(errno));
+			logerr("fopen(): %s", strerror(errno));
 			goto out;
 		}
 
 		if (slurp_for_tests(FNAME, &str)) {
-			logerr("slurp_for_tests(FNAME, &str)\n");
+			logerr("slurp_for_tests()");
 			goto out;
 		}
 
@@ -270,7 +269,7 @@ out:
 	}
 	if (file) {
 		if (fclose(file)) {
-			logerr("fclose(file): %s\n", strerror(errno));
+			logerr("fclose(): %s", strerror(errno));
 			rc = -1;
 		}
 	}
@@ -282,27 +281,27 @@ main(void) {
 	int rc = -1;
 
 	if (test_i18n_init()) {
-		logerr("test_i18n_init()\n");
+		logerr("test_i18n_init()");
 		goto out;
 	}
 
 	if (test_i18n_destroy()) {
-		logerr("test_i18n_destroy()\n");
+		logerr("test_i18n_destroy()");
 		goto out;
 	}
 
 	if (test_s()) {
-		logerr("test_s()\n");
+		logerr("test_s()");
 		goto out;
 	}
 
 	if (test_s_print_msgs()) {
-		logerr("test_s_print_msgs()\n");
+		logerr("test_s_print_msgs()");
 		goto out;
 	}
 
 	if (test_s_print_msg()) {
-		logerr("test_s_print_msg()\n");
+		logerr("test_s_print_msg()");
 		goto out;
 	}