[glibutil] Added gutil_parse_uint()

sailfishos · May 5, 2021 · 75f1a27 · 75f1a27
1 parent 7621553
commit 75f1a27
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 0 deletions.
diff --git a/include/gutil_misc.h b/include/gutil_misc.h
@@ -69,6 +69,12 @@ gutil_parse_int(
     int base,
     int* value); /* Since 1.0.30 */
 
+gboolean
+gutil_parse_uint(
+    const char* str,
+    int base,
+    unsigned int* value); /* Since 1.0.53 */
+
 gboolean
 gutil_data_equal(
     const GUtilData* data1,

diff --git a/src/gutil_misc.c b/src/gutil_misc.c
@@ -194,6 +194,30 @@ gutil_parse_int(
     return ok;
 }
 
+gboolean
+gutil_parse_uint(
+    const char* str,
+    int base,
+    unsigned int* value) /* Since 1.0.53 */
+{
+    gboolean ok = FALSE;
+
+    if (str && str[0]) {
+        char* tmp = NULL;
+        char* end = NULL;
+        const char* stripped = gutil_strstrip(str, &tmp);
+        guint64 ull;
+
+        ull = g_ascii_strtoull(stripped, &end, base);
+        ok = !*end && ull <= UINT_MAX;
+        if (ok && value) {
+            *value = (unsigned int)ull;
+        }
+        g_free(tmp);
+    }
+    return ok;
+}
+
 gboolean
 gutil_data_equal(
     const GUtilData* data1,

diff --git a/test/test_misc/test_misc.c b/test/test_misc/test_misc.c
@@ -192,6 +192,41 @@ test_parse_int(
     g_assert(!gutil_parse_int("0xffffffff", 0, &value));
 }
 
+/*==========================================================================*
+ * parse_uint
+ *==========================================================================*/
+
+static
+void
+test_parse_uint(
+    void)
+{
+    unsigned int value;
+
+    g_assert(!gutil_parse_uint(NULL, 0, NULL));
+    g_assert(!gutil_parse_uint("", 0, NULL));
+    g_assert(!gutil_parse_uint("garbage", 0, NULL));
+    g_assert(!gutil_parse_uint("0 trailing garbage", 0, NULL));
+    g_assert(gutil_parse_uint("0", 0, NULL));
+    g_assert(gutil_parse_uint("0", 0, &value));
+    g_assert_cmpuint(value, == ,0);
+    g_assert(gutil_parse_uint("42", 0, &value));
+    g_assert_cmpuint(value, == ,42);
+    g_assert(!gutil_parse_uint("0x10000000000000000", 0, &value));
+    g_assert(!gutil_parse_uint("-2147483649", 0, &value));
+    g_assert(!gutil_parse_uint("-1", 0, &value));
+    g_assert(gutil_parse_uint("4294967295", 0, &value));
+    g_assert_cmpuint(value, == ,4294967295);
+    g_assert(gutil_parse_uint(" 0x7fffffff ", 0, &value));
+    g_assert_cmpuint(value, == ,0x7fffffff);
+    g_assert(gutil_parse_uint(" 7fffffff ", 16, &value));
+    g_assert_cmpuint(value, == ,0x7fffffff);
+    g_assert(gutil_parse_uint("7ffffffe ", 16, &value));
+    g_assert_cmpuint(value, == ,0x7ffffffe);
+    g_assert(gutil_parse_uint("0xffffffff", 0, &value));
+    g_assert_cmpuint(value, == ,0xffffffff);
+}
+
 /*==========================================================================*
  * data_equal
  *==========================================================================*/
@@ -567,6 +602,7 @@ int main(int argc, char* argv[])
     g_test_add_func(TEST_("hex2bin"), test_hex2bin);
     g_test_add_func(TEST_("hexdump"), test_hexdump);
     g_test_add_func(TEST_("parse_int"), test_parse_int);
+    g_test_add_func(TEST_("parse_uint"), test_parse_uint);
     g_test_add_func(TEST_("data_equal"), test_data_equal);
     g_test_add_func(TEST_("data_prefix"), test_data_prefix);
     g_test_add_func(TEST_("data_suffix"), test_data_suffix);