]> sigrok.org Git - libsigrok.git/commitdiff
scpi: Strip trailing newline from *IDN response if present.
authorMartin Ling <redacted>
Sun, 29 Dec 2013 12:13:04 +0000 (13:13 +0100)
committerBert Vermeulen <redacted>
Sun, 29 Dec 2013 12:22:31 +0000 (13:22 +0100)
hardware/common/scpi.c

index 7329b294683b12db4b792976689c0eb7316130e3..b2eb4ced958e37fda5f475cd6557cafed4a962e3 100644 (file)
@@ -552,6 +552,7 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
 {
        int num_tokens;
        char *response;
+       char *newline;
        gchar **tokens;
        struct sr_scpi_hw_info *hw_info;
 
@@ -564,6 +565,10 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
 
        sr_info("Got IDN string: '%s'", response);
 
+       /* Remove trailing newline if present. */
+       if ((newline = g_strrstr(response, "\n")))
+               newline[0] = '\0';
+
        /*
         * The response to a '*IDN?' is specified by the SCPI spec. It contains
         * a comma-separated list containing the manufacturer name, instrument