From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 10 Apr 2021 14:33:20 +0000 (+0000)
Subject: util: Drop function that converts a string to size_t
X-Git-Tag: 0.9.28~1285^2~391
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c1c417f431d20bcc38efcbd3798c228c128f7ca;p=pakfire.git

util: Drop function that converts a string to size_t

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

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index f7ddbaca0..a8d2f50a2 100644
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -1341,7 +1341,7 @@ PAKFIRE_EXPORT PakfirePackage pakfire_archive_make_package(PakfireArchive archiv
 	// Get install size
 	char* size = pakfire_archive_get(archive, "package", "size");
 	if (size) {
-		size_t s = pakfire_string_to_size(size);
+		size_t s = strtoul(size, NULL, 10);
 		free(size);
 
 		pakfire_package_set_installsize(pkg, s);
diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index 7050746ff..1b1d30c0c 100644
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -46,7 +46,6 @@ char* pakfire_remove_trailing_newline(char* str);
 
 int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t* len);
 
-size_t pakfire_string_to_size(const char* s);
 char** pakfire_split_string(const char* s, char delim);
 
 char* pakfire_generate_uuid();
diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 905928282..e722a1fc6 100644
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -417,7 +417,6 @@ global:
 	pakfire_string_partition;
 	pakfire_string_replace;
 	pakfire_string_startswith;
-	pakfire_string_to_size;
 
 local:
 	*;
diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 8445e786a..87722e23c 100644
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -375,16 +375,6 @@ PAKFIRE_EXPORT int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t*
 	return 0;
 }
 
-PAKFIRE_EXPORT size_t pakfire_string_to_size(const char* s) {
-	size_t size;
-
-	int r = sscanf(s, "%zu", &size);
-	if (r == 1)
-		return size;
-
-	return 0;
-}
-
 PAKFIRE_EXPORT char** pakfire_split_string(const char* s, char delim) {
 	// Copy string to stack and count spaces
 	char buffer[strlen(s) + 2];