From: Uwe Hermann <redacted>
Date: Fri, 17 Feb 2012 23:31:35 +0000 (+0100)
Subject: sr/cli/gtk/qt: s/configuration/config/.
X-Git-Tag: sigrok-cli-0.3.0~25
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=8d145d460662736b807b6b12226d4183ef1e9ae5

sr/cli/gtk/qt: s/configuration/config/.
---

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 6957c9d..de173b7 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -747,19 +747,19 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
 				ret = sr_parse_sizestring(value, &tmp_u64);
 				if (ret != SR_OK)
 					break;
-				ret = dev->plugin->set_configuration(dev->plugin_index,
-						sr_hwcap_options[i].hwcap, &tmp_u64);
+				ret = dev->plugin->config_set(dev->plugin_index,
+					sr_hwcap_options[i].hwcap, &tmp_u64);
 				break;
 			case SR_T_CHAR:
-				ret = dev->plugin->set_configuration(dev->plugin_index,
-						sr_hwcap_options[i].hwcap, value);
+				ret = dev->plugin->config_set(dev->plugin_index,
+					sr_hwcap_options[i].hwcap, value);
 				break;
 			case SR_T_BOOL:
 				if (!value)
 					tmp_bool = TRUE;
 				else 
 					tmp_bool = sr_parse_boolstring(value);
-				ret = dev->plugin->set_configuration(dev->plugin_index,
+				ret = dev->plugin->config_set(dev->plugin_index,
 						sr_hwcap_options[i].hwcap, 
 						GINT_TO_POINTER(tmp_bool));
 				break;
@@ -870,8 +870,8 @@ static void run_session(void)
 		}
 
 		if (sr_hw_has_hwcap(dev->plugin, SR_HWCAP_LIMIT_MSEC)) {
-			if (dev->plugin->set_configuration(dev->plugin_index,
-							  SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+			if (dev->plugin->config_set(dev->plugin_index,
+			    SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
 				printf("Failed to configure time limit.\n");
 				sr_session_destroy();
 				return;
@@ -895,8 +895,8 @@ static void run_session(void)
 				return;
 			}
 
-			if (dev->plugin->set_configuration(dev->plugin_index,
-						  SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
+			if (dev->plugin->config_set(dev->plugin_index,
+			    SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
 				printf("Failed to configure time-based sample limit.\n");
 				sr_session_destroy();
 				return;
@@ -906,15 +906,15 @@ static void run_session(void)
 
 	if (opt_samples) {
 		if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
-			|| (dev->plugin->set_configuration(dev->plugin_index,
-					SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
+			|| (dev->plugin->config_set(dev->plugin_index,
+			    SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
 			printf("Failed to configure sample limit.\n");
 			sr_session_destroy();
 			return;
 		}
 	}
 
-	if (dev->plugin->set_configuration(dev->plugin_index,
+	if (dev->plugin->config_set(dev->plugin_index,
 		  SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
 		printf("Failed to configure probes.\n");
 		sr_session_destroy();