BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Accept subtype of expected GVariant values.

This commit is contained in:
Bert Vermeulen 2014-10-22 22:18:52 +02:00
parent a42a39ac37
commit 61b0292217
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hwdriver.c
View File

@ -178,20 +178,25 @@ SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *value)
{
const struct sr_config_info *info;
const GVariantType *type, *expected;
char *expected_string, *type_string;
info = sr_config_info_get(key);
if (!info)
return SR_OK;
expected = sr_variant_type_get(info->datatype);
type = g_variant_get_type(value);
if (!g_variant_type_equal(type, expected)) {
gchar *expected_string = g_variant_type_dup_string(expected);
gchar *type_string = g_variant_type_dup_string(type);
if (!g_variant_type_equal(type, expected)
&& !g_variant_type_is_subtype_of(type, expected)) {
expected_string = g_variant_type_dup_string(expected);
type_string = g_variant_type_dup_string(type);
sr_err("Wrong variant type for key '%s': expected '%s', got '%s'",
info->name, expected_string, type_string);
g_free(expected_string);
g_free(type_string);
return SR_ERR_ARG;
}
return SR_OK;
}