From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 18 Aug 2022 19:19:47 +0000 (+0000)
Subject: string: Drop #pragma which ignores string formatting errors
X-Git-Tag: 0.9.28~444
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cd3e864292f69d0cce1425f257eb5cd411818d6;p=pakfire.git

string: Drop #pragma which ignores string formatting errors

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/string.c b/src/libpakfire/string.c
index 046c7da53..a89a01e24 100644
--- a/src/libpakfire/string.c
+++ b/src/libpakfire/string.c
@@ -327,10 +327,7 @@ int __pakfire_format_size(char* dst, size_t length, double value) {
 		unit++;
 	}
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-	return snprintf(dst, length, *unit, value);
-#pragma GCC diagnostic pop
+	return __pakfire_string_format(dst, length, *unit, value);
 }
 
 int pakfire_format_speed(char* dst, size_t length, double value) {
@@ -349,10 +346,7 @@ int pakfire_format_speed(char* dst, size_t length, double value) {
 		unit++;
 	}
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-	return snprintf(dst, length, *unit, value);
-#pragma GCC diagnostic pop
+	return __pakfire_string_format(dst, length, *unit, value);
 }
 
 int __pakfire_strftime(char* buffer, const size_t length,