Remove all remaining calls to logerr() that included a trailing newline

10 files changed, 63 insertions, 72 deletions

diff --git a/src/catalog.c b/src/catalog.c
index 03c400d..8ddfaee 100644
--- a/src/catalog.c
+++ b/src/catalog.c
@@ -31,14 +31,13 @@ i18n_init(void) {
 
 	static const int should_overwrite = 0;
 	if (setenv(NLSPATH_KEY, NLSPATH, should_overwrite)) {
-		logerr("setenv(\"%s\", \"%s\", 0): %s\n", NLSPATH_KEY,
-			NLSPATH, strerror(errno));
+		logerr("setenv(): %s", strerror(errno));
 		goto out;
 	}
 
 	catalog_descriptor = catopen(CATALOG_NAME, 0);
 	if (catalog_descriptor != NULL && catalog_descriptor == (nl_catd)-1) {
-		logerr("catopen(\"%s\", 0): %s\n", CATALOG_NAME, strerror(errno));
+		logerr("catopen(): %s", strerror(errno));
 		catalog_descriptor = NULL;
 		goto out;
 	}
@@ -54,7 +53,7 @@ i18n_destroy(void) {
 
 	if (catalog_descriptor != NULL) {
 		if (catclose(catalog_descriptor)) {
-			logerr("catclose(...): %s\n", strerror(errno));
+			logerr("catclose(): %s", strerror(errno));
 			goto out;
 		}
 	}
@@ -83,7 +82,7 @@ s(const char* const MSGS[], const int msg_id) {
 	const char *const ret =
 		catgets(catalog_descriptor, NL_SETD, msg_id, MSGS[msg_id]);
 	if (errno) {
-		logerr("catgets(%d): %s\n", msg_id, strerror(errno));
+		logerr("catgets(): %s", strerror(errno));
 	}
 
 	return ret;
@@ -100,8 +99,7 @@ s_print_msgs(
 
 	for (int i = msg_begin; i <= msg_end; i++) {
 		if (fprintf(stream, "%s", s(MSGS, i)) < 0) {
-			logerr("fprintf(stream, \"%%s\", _(%d)): %s\n", i,
-				strerror(errno));
+			logerr("fprintf(): %s", strerror(errno));
 			goto out;
 		}
 	}
@@ -122,29 +120,26 @@ dump_translatable_strings(const char *const MSGS[]) {
 
 	for (size_t i = 1; MSGS[i]; i++) {
 		if (printf("%ld ", i) < 0) {
-			logerr("printf(\"%%ld\", %d): %s\n", i);
+			logerr("printf(): %s", strerror(errno));
 			goto out;
 		}
 
 		for (size_t j = 0; MSGS[i][j]; j++) {
 			if (MSGS[i][j] == '\n') {
 				if (printf("\\n") < 0) {
-					logerr("printf(\"\\\\n\"): %s\n",
-						strerror(errno));
+					logerr("printf(): %s", strerror(errno));
 					goto out;
 				}
 			} else {
 				if (printf("%c", MSGS[i][j]) < 0) {
-					logerr("printf(\"%%c\", "
-						"MSGS[%ld][%ld]): %s\n",
-						i, j, strerror(errno));
+					logerr("printf(): %s", strerror(errno));
 					goto out;
 				}
 			}
 		}
 
 		if (printf("\n\n") < 0) {
-			logerr("printf(\"\\n\\n\"): %s\n", strerror(errno));
+			logerr("printf(): %s", strerror(errno));
 			goto out;
 		}
 	}
diff --git a/src/lib.c b/src/lib.c
index 8d06ee0..eb22734 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -17,7 +17,7 @@ pindaiba_main(int argc, char *argv[]) {
 	(void)argv;
 
 	if (printf("%s %s %s\n", NAME, VERSION, DATE) < 0) {
-		logerr("printf() < 0: %s\n", strerror(errno));
+		logerr("printf(): %s", strerror(errno));
 		goto out;
 	}
 
diff --git a/src/random.c b/src/random.c
index 648ec9f..2f9f731 100644
--- a/src/random.c
+++ b/src/random.c
@@ -18,30 +18,31 @@ int
 urandom_bytes(const size_t n, uint8_t (*const addr)[]) {
 	int rc = -1;
 
+	// FIXME: rename ret
 	uint8_t *temp = NULL;
 	FILE *f = NULL;
 
 	temp = malloc(n);
 	if (temp == NULL) {
-		logerr("malloc(...): %s\n", strerror(errno));
+		logerr("malloc(): %s", strerror(errno));
 		goto out;
 	}
 
 	f = fopen("/dev/urandom", "r");
 	if (f == NULL) {
-		logerr("fopen(...): %s\n", strerror(errno));
+		logerr("fopen(): %s", strerror(errno));
 		goto out;
 	}
 
 	const size_t read_count = fread(temp, 1, n, f);
 	if (ferror(f)) {
-		logerr("fread(...), n, f): %s\n", strerror(errno));
+		logerr("fread(): %s", strerror(errno));
 		goto out;
 	}
 	assert(read_count == n);
 
 	if (fclose(f)) {
-		logerr("fclose(...): %s\n", strerror(errno));
+		logerr("fclose(): %s", strerror(errno));
 		goto out;
 	}
 	f = NULL;
@@ -51,7 +52,7 @@ urandom_bytes(const size_t n, uint8_t (*const addr)[]) {
 out:
 	if (f != NULL) {
 		if (fclose(f)) {
-			logerr("fclose(...): %s\n", strerror(errno));
+			logerr("fclose(): %s", strerror(errno));
 			rc = -1;
 		}
 	}
diff --git a/src/util.c b/src/util.c
index 33307a6..e7a3823 100644
--- a/src/util.c
+++ b/src/util.c
@@ -22,18 +22,18 @@ slurp(const char *const filename, char **out) {
 
 	file = fopen(filename, "r");
 	if (file == NULL) {
-		logerr("fopen(\"%s\"): %s\n", filename, strerror(errno));
+		logerr("fopen(): %s", strerror(errno));
 		goto out;
 	}
 
 	if (fseek(file, 0L, SEEK_END)) {
-		logerr("fseek(): %s\n", strerror(errno));
+		logerr("fseek(): %s", strerror(errno));
 		goto out;
 	}
 
 	const long lsize = ftell(file);
 	if (lsize == -1) {
-		logerr("ftell(): %s\n", strerror(errno));
+		logerr("ftell(): %s", strerror(errno));
 		goto out;
 	}
 	const size_t size = (size_t)lsize;
@@ -41,18 +41,18 @@ slurp(const char *const filename, char **out) {
 	errno = 0;
 	rewind(file);
 	if (errno) {
-		logerr("rewind(file): %s\n", strerror(errno));
+		logerr("rewind(): %s", strerror(errno));
 		goto out;
 	}
 
 	str = malloc(size + NULL_TERMINATOR);
 	if (str == NULL) {
-		logerr("malloc(%ld): %s\n", size + NULL_TERMINATOR, strerror(errno));
+		logerr("malloc(): %s", strerror(errno));
 		goto out;
 	}
 
 	if (fread(str, sizeof(char), size, file) != size) {
-		logerr("fread(\"%s\"): %s\n", filename, strerror(errno));
+		logerr("fread(): %s", strerror(errno));
 		goto out;
 	}
 	str[size] = '\0';
@@ -62,7 +62,7 @@ slurp(const char *const filename, char **out) {
 out:
 	if (file != NULL) {
 		if (fclose(file)) {
-			logerr("fclose(\"%s\"): %s\n", filename, strerror(errno));
+			logerr("fclose(): %s", strerror(errno));
 			rc = -1;
 		}
 	}
diff --git a/src/vector.c b/src/vector.c
index 9634630..7304942 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -70,13 +70,13 @@ vector_new_with(
 	const size_t array_bytes_size = capacity * value_size;
 	v.values = malloc(array_bytes_size);
 	if (v.values == NULL) {
-		logerr("malloc(%ld): %s\n", array_bytes_size, strerror(errno));
+		logerr("malloc(): %s", strerror(errno));
 		goto out;
 	}
 
 	ret = malloc(sizeof(*ret));
 	if (ret == NULL) {
-		logerr("malloc(%ld): %s\n", sizeof(ret), strerror(errno));
+		logerr("malloc(): %s", strerror(errno));
 		goto out;
 	}
 	memcpy(ret, &v, sizeof(v));
@@ -182,11 +182,7 @@ vector_push_back(const struct Vector *const v, const void *const value) {
 
 		new_values = realloc(v->values, new_size);
 		if (new_values == NULL) {
-			logerr(
-				"realloc(v->values, %ld): %s\n",
-				new_size,
-				strerror(errno)
-			);
+			logerr("realloc(): %s", strerror(errno));
 			goto out;
 		}
 		v_mut->capacity = new_capacity;
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;
 	}
 
diff --git a/tests/i18n.c b/tests/i18n.c
index c9e81af..777cbf6 100644
--- a/tests/i18n.c
+++ b/tests/i18n.c
@@ -11,7 +11,7 @@ main(void) {
 
 	if (getenv("DUMP_TRANSLATABLE_STRINGS")) {
 		if (dump_translatable_strings(MSGS)) {
-			logerr("dump_translatable_strings(MSGS)\n");
+			logerr("dump_translatable_strings()");
 			goto out;
 		}
 	}
diff --git a/tests/random.c b/tests/random.c
index e56e747..e670a28 100644
--- a/tests/random.c
+++ b/tests/random.c
@@ -16,7 +16,7 @@ test_urandom_bytes(void) {
 
 		for (size_t n = 0; n < LEN; n++) {
 			if (urandom_bytes(n, &arr)) {
-				logerr("urandom_bytes(n, &arr);\n");
+				logerr("urandom_bytes()");
 				goto out;
 			}
 			for (size_t i = n; i < LEN; i++) {
@@ -35,14 +35,14 @@ test_urandom_bytes(void) {
 		uint8_t arr2[64 /* LEN */] = { 0 };
 
 		if (urandom_bytes(LEN, &arr1)) {
-			logerr("urandom_bytes(LEN, &arr1);\n");
+			logerr("urandom_bytes()");
 			goto out;
 		}
 
 		const size_t attempts = 10;
 		for (size_t n = 0; n < attempts; n++) {
 			if (urandom_bytes(LEN, &arr2)) {
-				logerr("urandom_bytes(LEN, &arr2);\n");
+				logerr("urandom_bytes()");
 				goto out;
 			}
 			assert(memcmp(arr1, arr2, LEN) != 0);
@@ -61,7 +61,7 @@ main(void) {
 	int rc = -1;
 
 	if (test_urandom_bytes()) {
-		logerr("test_urandom_bytes();\n");
+		logerr("test_urandom_bytes()");
 		goto out;
 	}
 
diff --git a/tests/util.c b/tests/util.c
index ad43012..662ccc8 100644
--- a/tests/util.c
+++ b/tests/util.c
@@ -30,12 +30,12 @@ test_slurp(void) {
 		testing("slurp() == slurp_for_tests()");
 
 		if (slurp(__FILE__, &given)) {
-			logerr("slurp(__FILE__, &given);\n");
+			logerr("slurp()");
 			goto out;
 		}
 
 		if (slurp_for_tests(__FILE__, &expected)) {
-			logerr("slurp_for_tests(__FILE__, &expected);\n");
+			logerr("slurp_for_tests()");
 			goto out;
 		}
 
@@ -75,7 +75,7 @@ test_freeit(void) {
 
 		ptr = malloc(1234U);
 		if (ptr == NULL) {
-			logerr("malloc(): %s\n", strerror(errno));
+			logerr("malloc(): %s", strerror(errno));
 			goto out;
 		}
 
@@ -100,12 +100,12 @@ main(void) {
 	int rc = -1;
 
 	if (test_slurp()) {
-		logerr("test_slurp();\n");
+		logerr("test_slurp()");
 		goto out;
 	}
 
 	if (test_freeit()) {
-		logerr("test_freeit();\n");
+		logerr("test_freeit()");
 		goto out;
 	}
 
diff --git a/tests/vector.c b/tests/vector.c
index 4d27c7f..118651b 100644
--- a/tests/vector.c
+++ b/tests/vector.c
@@ -242,7 +242,7 @@ test_vector_nth(void) {
 
 		for (unsigned int i = 0; i < values_len; i++) {
 			if (vector_push_back(v, &values[i])) {
-				logerr("vector_push_back(v, values[%d])", i);
+				logerr("vector_push_back()");
 				goto out;
 			}
 		}
@@ -271,7 +271,7 @@ test_vector_nth(void) {
 
 		for (unsigned int i = 0; i < values_len; i++) {
 			if (vector_push_back(v, &values[i])) {
-				logerr("vector_push_back(v, values[%d])", i);
+				logerr("vector_push_back()");
 				goto out;
 			}
 		}
@@ -338,7 +338,7 @@ test_vector_push_back(void) {
 
 		for (unsigned int i = 0; i < v->capacity; i++) {
 			if (vector_push_back(v, &data)) {
-				logerr("vector_push_back(): i = %d", i);
+				logerr("vector_push_back()");
 				goto out;
 			}
 		}
@@ -349,7 +349,7 @@ test_vector_push_back(void) {
 
 		// we grow the vector here
 		if (vector_push_back(v, &data)) {
-			logerr("vector_push_vack()");
+			logerr("vector_push_back()");
 			goto out;
 		}
 		const size_t new_capacity = capacity * v->multiplier;