Skip to content
Snippets Groups Projects
Commit 936925dc authored by Simon McVittie's avatar Simon McVittie
Browse files

json-utils: Rename _srt_json_object_dup_strv_member


It seems misleading to have a function with json_array in the name that
takes a JsonObject.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 658ed10c
No related branches found
No related tags found
1 merge request!164Preparation for !158
......@@ -40,5 +40,5 @@ guint srt_get_flags_from_json_array (GType flags_type,
const gchar *array_member,
guint flag_if_unknown);
gchar ** _srt_json_array_to_strv (JsonObject *json_obj,
const gchar *array_member);
gchar ** _srt_json_object_dup_strv_member (JsonObject *json_obj,
const gchar *array_member);
......@@ -80,7 +80,7 @@ out:
}
/**
* _srt_json_array_to_strv:
* _srt_json_object_dup_strv_member:
* @json_obj: (not nullable): A JSON Object used to search for
* @array_member property
* @array_member: (not nullable): The JSON member to look up
......@@ -93,8 +93,8 @@ out:
* property @array_member
*/
gchar **
_srt_json_array_to_strv (JsonObject *json_obj,
const gchar *array_member)
_srt_json_object_dup_strv_member (JsonObject *json_obj,
const gchar *array_member)
{
JsonArray *array;
guint length;
......
......@@ -1349,9 +1349,9 @@ _srt_system_info_get_pinned_libs_from_report (JsonObject *json_obj,
{
json_pinned_obj = json_object_get_object_member (json_obj, which);
pinned_list = _srt_json_array_to_strv (json_pinned_obj, "list");
pinned_list = _srt_json_object_dup_strv_member (json_pinned_obj, "list");
*messages = _srt_json_array_to_strv (json_pinned_obj, "messages");
*messages = _srt_json_object_dup_strv_member (json_pinned_obj, "messages");
}
return pinned_list;
......@@ -3232,7 +3232,7 @@ srt_system_info_list_driver_environment (SrtSystemInfo *self)
static gchar **
_srt_system_info_driver_environment_from_report (JsonObject *json_obj)
{
return _srt_json_array_to_strv (json_obj, "driver_environment");
return _srt_json_object_dup_strv_member (json_obj, "driver_environment");
}
typedef struct
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment