Changeset 37a90a7 in mainline

Timestamp:

2020-12-31T22:30:14Z (3 weeks ago)

Author:

GitHub <noreply@…>

Parents:

e037cf37 (diff), b3c169e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2020-12-31 22:30:14)

git-committer:

GitHub <noreply@…> (2020-12-31 22:30:14)

Message:

Merge b3c169e6fad6694313bf7154be767a485d10551e into e037cf3733f322897cbfc63ce44277485f52af9b

Location:

uspace/lib

Files:

• c/include/adt/hash.h (modified) (1 diff)
• conf/include/conf/configuration.h (added)
• conf/include/conf/ini.h (added)
• conf/include/conf/text_parse.h (added)
• conf/meson.build (added)
• conf/src/configuration.c (added)
• conf/src/ini.c (added)
• conf/src/text_parse.c (added)
• conf/test/ini.c (added)
• conf/test/main.c (added)
• meson.build (modified) (1 diff)

uspace/lib/c/include/adt/hash.h

@@ -111 +111 @@
 }
 
+/** Calculate hash of NULL-terminated string
+ *
+ * TODO Modify also same file in kernel subtree?
+ *
+ * @param[in]  str     NULL-terminated string
+ * @return hash of the given string
+ */
+static inline size_t hash_string(const char *str)
+{
+        size_t hash = 0;
+        if (str != NULL) {
+                char c;
+                while ((c = *str++) != 0) {
+                        hash = hash_combine(hash, c);
+                }
+        }
+
+        return hash;
+}
+
 #endif

uspace/lib/meson.build

@@ -53 +53 @@
         'clui',
         'compress',
+        'conf',
         'cpp',
         'crypto',