X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2FConfigKey_methods.cpp;h=54af62e804e76f2d8b3c7c0d628b9e17cc3a747c;hb=77463bd397127b8a4e7266e601b4cdf87825beeb;hp=9ba82adb51b1c60bff6808605b25194e0c23db1f;hpb=0bc1a7613ac2ad4c5b1148b9714791769a2b834c;p=libsigrok.git

diff --git a/bindings/cxx/ConfigKey_methods.cpp b/bindings/cxx/ConfigKey_methods.cpp
index 9ba82adb..54af62e8 100644
--- a/bindings/cxx/ConfigKey_methods.cpp
+++ b/bindings/cxx/ConfigKey_methods.cpp
@@ -1,6 +1,6 @@
 const DataType *ConfigKey::data_type() const
 {
-	const struct sr_config_info *info = sr_config_info_get(_id);
+	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, id());
 	if (!info)
 		throw Error(SR_ERR_NA);
 	return DataType::get(info->datatype);
@@ -8,7 +8,7 @@ const DataType *ConfigKey::data_type() const
 
 string ConfigKey::identifier() const
 {
-	const struct sr_config_info *info = sr_config_info_get(_id);
+	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, id());
 	if (!info)
 		throw Error(SR_ERR_NA);
 	return valid_string(info->id);
@@ -16,7 +16,7 @@ string ConfigKey::identifier() const
 
 string ConfigKey::description() const
 {
-	const struct sr_config_info *info = sr_config_info_get(_id);
+	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, id());
 	if (!info)
 		throw Error(SR_ERR_NA);
 	return valid_string(info->name);
@@ -24,13 +24,13 @@ string ConfigKey::description() const
 
 const ConfigKey *ConfigKey::get_by_identifier(string identifier)
 {
-	const struct sr_config_info *info = sr_config_info_name_get(identifier.c_str());
+	const struct sr_key_info *info = sr_key_info_name_get(SR_KEY_CONFIG, identifier.c_str());
 	if (!info)
 		throw Error(SR_ERR_ARG);
 	return get(info->key);
 }
 
-#include "config.h"
+#include <config.h>
 
 #ifndef HAVE_STOI_STOD
 
@@ -88,7 +88,11 @@ Glib::VariantBase ConfigKey::parse_string(string value) const
 			variant = g_variant_new_boolean(sr_parse_boolstring(value.c_str()));
 			break;
 		case SR_T_FLOAT:
-			variant = g_variant_new_double(stod(value));
+			try {
+				variant = g_variant_new_double(stod(value));
+			} catch (invalid_argument) {
+				throw Error(SR_ERR_ARG);
+			}
 			break;
 		case SR_T_RATIONAL_PERIOD:
 			check(sr_parse_period(value.c_str(), &p, &q));
@@ -99,7 +103,11 @@ Glib::VariantBase ConfigKey::parse_string(string value) const
 			variant = g_variant_new("(tt)", p, q);
 			break;
 		case SR_T_INT32:
-			variant = g_variant_new_int32(stoi(value));
+			try {
+				variant = g_variant_new_int32(stoi(value));
+			} catch (invalid_argument) {
+				throw Error(SR_ERR_ARG);
+			}
 			break;
 		default:
 			throw Error(SR_ERR_BUG);