X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fhelpers.c;h=dc19c3ab93f931af3e491dd77c1ecb53de1523c5;hb=2c24077466a299ead689c90f01f55f6d86c7386b;hp=999658a5d9d3cbdb3d28df7f5614454f1208676d;hpb=34577da641d836dcf27433fee3c6384565ca7847;p=libsigrok.git

diff --git a/src/scpi/helpers.c b/src/scpi/helpers.c
index 999658a5..dc19c3ab 100644
--- a/src/scpi/helpers.c
+++ b/src/scpi/helpers.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <strings.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
@@ -54,7 +55,7 @@ SR_PRIV const char *scpi_cmd_get(const struct scpi_command *cmdtable, int comman
 		return NULL;
 
 	cmd = NULL;
-	for (i = 0; cmdtable[i].command; i++) {
+	for (i = 0; cmdtable[i].string; i++) {
 		if (cmdtable[i].command == command) {
 			cmd = cmdtable[i].string;
 			break;
@@ -96,8 +97,8 @@ SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, const struct scpi_comma
 	const char *cmd;
 
 	if (!(cmd = scpi_cmd_get(cmdtable, command))) {
-		/* Device does not implement this command, that's OK. */
-		return SR_OK;
+		/* Device does not implement this command. */
+		return SR_ERR_NA;
 	}
 
 	scpi = sdi->conn;
@@ -120,10 +121,10 @@ SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, const struct scpi_comma
 		else
 			ret = SR_ERR;
 		g_free(s);
-	} if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_DOUBLE)) {
+	} else if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_DOUBLE)) {
 		if ((ret = sr_scpi_get_double(scpi, NULL, &d)) == SR_OK)
 			*gvar = g_variant_new_double(d);
-	} if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_STRING)) {
+	} else if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_STRING)) {
 		if ((ret = sr_scpi_get_string(scpi, NULL, &s)) == SR_OK)
 			*gvar = g_variant_new_string(s);
 	} else {