X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2FConfigKey_methods.cpp;h=7f8c201ed5a8f1e649b4f4e9a452b5c8344e1dd3;hb=e333a40c1c5a27806b8a6dd2611c54b23d11366b;hp=06bdc121207e503b8db201909cc0b0d7e4b88a95;hpb=2fb60e23299037456a626ad65d15b89a78393917;p=libsigrok.git

diff --git a/bindings/cxx/ConfigKey_methods.cpp b/bindings/cxx/ConfigKey_methods.cpp
index 06bdc121..7f8c201e 100644
--- a/bindings/cxx/ConfigKey_methods.cpp
+++ b/bindings/cxx/ConfigKey_methods.cpp
@@ -1,28 +1,30 @@
+#include <config.h>
+
 const DataType *ConfigKey::data_type() const
 {
-	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, _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);
 }
 
-string ConfigKey::identifier() const
+std::string ConfigKey::identifier() const
 {
-	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, _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);
 }
 
-string ConfigKey::description() const
+std::string ConfigKey::description() const
 {
-	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, _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);
 }
 
-const ConfigKey *ConfigKey::get_by_identifier(string identifier)
+const ConfigKey *ConfigKey::get_by_identifier(std::string identifier)
 {
 	const struct sr_key_info *info = sr_key_info_name_get(SR_KEY_CONFIG, identifier.c_str());
 	if (!info)
@@ -30,8 +32,6 @@ const ConfigKey *ConfigKey::get_by_identifier(string identifier)
 	return get(info->key);
 }
 
-#include "config.h"
-
 #ifndef HAVE_STOI_STOD
 
 /* Fallback implementation of stoi and stod */
@@ -70,12 +70,12 @@ static inline double stod( const std::string& str )
 }
 #endif
 
-Glib::VariantBase ConfigKey::parse_string(string value) const
+Glib::VariantBase ConfigKey::parse_string(std::string value, enum sr_datatype dt)
 {
 	GVariant *variant;
 	uint64_t p, q;
 
-	switch (data_type()->id())
+	switch (dt)
 	{
 		case SR_T_UINT64:
 			check(sr_parse_sizestring(value.c_str(), &p));
@@ -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);
@@ -108,3 +116,8 @@ Glib::VariantBase ConfigKey::parse_string(string value) const
 	return Glib::VariantBase(variant, false);
 }
 
+Glib::VariantBase ConfigKey::parse_string(std::string value) const
+{
+	enum sr_datatype dt = (enum sr_datatype)(data_type()->id());
+	return parse_string(value, dt);
+}