Helper functions bfg_json_obj_string and share __json_array_string

util.c

@@ -1594,7 +1594,7 @@ char *json_dumps_ANY(json_t *json, size_t flags)
 /* Extracts a string value from a json array with error checking. To be used
  * when the value of the string returned is only examined and not to be stored.
  * See json_array_string below */
-static char *__json_array_string(json_t *val, unsigned int entry)
+char *__json_array_string(json_t *val, unsigned int entry)
 {
 	json_t *arr_entry;
 

util.h

@@ -14,6 +14,7 @@
 #define __UTIL_H__
 
 #include <stdbool.h>
+#include <string.h>
 #include <sys/time.h>
 
 #include <curl/curl.h>
@@ -74,6 +75,17 @@
 #endif
 extern char *json_dumps_ANY(json_t *, size_t flags);
 
+static inline
+const char *bfg_json_obj_string(json_t *json, const char *key, const char *fail)
+{
+	json = json_object_get(json, key);
+	if (!json)
+		return fail;
+	return json_string_value(json) ?: fail;
+}
+
+extern char *__json_array_string(json_t *, unsigned int entry);
+
 static inline
 bool isCspace(int c)
 {