Various errno/strerror() related fixes.

 - Don't #include <errno.h> in files that don't actually need it.

 - Don't use strerror() on error codes from functions that don't set
   errno. Replace strerror() with sr_strerror() for libsigrok functions.

diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index 823740764a1d1d12c547298a5025b9e1df0d9386..cefea4f29a47bbe03298122d1c31059224c76279 100644 (file)
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -22,7 +22,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include <errno.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "agilent-dmm.h"

diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c
index d1b765665c2bb9dbfedfed684ff3627f118d2660..1fe962f575aa29682c8f810dc3f0cc602b9b907c 100644 (file)
--- a/src/hardware/agilent-dmm/sched.c
+++ b/src/hardware/agilent-dmm/sched.c
@@ -20,7 +20,6 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <math.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index 10dfa2adea6fcf059d0e3f34e8e15e5104b948d6..fa367cc24263d2c434d10b7fc72a998bea0a86ae 100644 (file)
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -18,7 +18,6 @@
  */
 
 #include <string.h>
-#include <errno.h>
 #include "protocol.h"
 
 /*
@@ -142,7 +141,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
        memset(packet, 0, PACKET_SIZE);
        if ((ret = serial_read_nonblocking(serial, packet, PACKET_SIZE)) < 0) {
                sr_err("Unable to read while probing for hardware: %s",
-                               strerror(errno));
+                               sr_strerror(ret));
                return NULL;
        }
        if (ret != PACKET_SIZE || packet[0] != 0xaa || packet[1] != 0xaa) {

diff --git a/src/hardware/atten-pps3xxx/protocol.c b/src/hardware/atten-pps3xxx/protocol.c
index 297fe831036d86acf8fa82dd2e13e59a5aef3925..8e678a16867ea7024ec84c0e18a03cc6d00e64ce 100644 (file)
--- a/src/hardware/atten-pps3xxx/protocol.c
+++ b/src/hardware/atten-pps3xxx/protocol.c
@@ -18,7 +18,6 @@
  */
 
 #include <string.h>
-#include <errno.h>
 #include "protocol.h"
 
 static void dump_packet(char *msg, uint8_t *packet)

diff --git a/src/hardware/beaglelogic/protocol.c b/src/hardware/beaglelogic/protocol.c
index a07bb203d1526369190b1db7bfe0764215563542..e1f6009ff82149fd5ffd4bf9ad7d16b313ffdbf7 100644 (file)
--- a/src/hardware/beaglelogic/protocol.c
+++ b/src/hardware/beaglelogic/protocol.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index 38c54580d8d4c8573c8f7da9eb36ac22d8aeb841..fe697277c0c8df4003b352b1b0b6bcbbc7d31d2a 100644 (file)
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <string.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"

diff --git a/src/hardware/colead-slm/protocol.c b/src/hardware/colead-slm/protocol.c
index 01e748fbe0586c38a93d1406fa0b43ac8882ee86..9a7c9fd0d1b6117652ad2fea8e7553e988bde2c2 100644 (file)
--- a/src/hardware/colead-slm/protocol.c
+++ b/src/hardware/colead-slm/protocol.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 #include <glib.h>
-#include <errno.h>
 #include <string.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"

diff --git a/src/hardware/conrad-digi-35-cpu/protocol.h b/src/hardware/conrad-digi-35-cpu/protocol.h
index fcde852ecce84881c4a4098361588433fddba1a5..1c3885a4bf4f096b5f1af270e10951c19695a73d 100644 (file)
--- a/src/hardware/conrad-digi-35-cpu/protocol.h
+++ b/src/hardware/conrad-digi-35-cpu/protocol.h
@@ -27,7 +27,6 @@
 #define LIBSIGROK_HARDWARE_CONRAD_DIGI_35_CPU_PROTOCOL_H
 
 #include <stdint.h>
-#include <errno.h>
 #include <string.h>
 #include <glib.h>
 #include "libsigrok.h"

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 1b4ce404bdf8df3a94e515bce888f038f26b4328..9c6c8a9437e885a2ed999ea01a2f758dc29b8dc9 100644 (file)
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -22,7 +22,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include <errno.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"

diff --git a/src/hardware/fluke-dmm/fluke.c b/src/hardware/fluke-dmm/fluke.c
index e708518d90f1dd3f003462bced985c955131703e..159a4f9f291d1761e72c72cccbc2375c9f759103 100644 (file)
--- a/src/hardware/fluke-dmm/fluke.c
+++ b/src/hardware/fluke-dmm/fluke.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <errno.h>
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index b9fee49d603d42a1f248cec6b84191fd0888c048..ba647837caf58079f32266b8e9d14d833df01997 100644 (file)
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -24,7 +24,6 @@
  */
 
 #include <ctype.h>
-#include <errno.h>
 #include <math.h>
 #include <string.h>
 #include "protocol.h"
@@ -285,15 +284,16 @@ SR_PRIV int lps_process_status(struct sr_dev_inst* sdi, int stat)
 SR_PRIV int lps_query_status(struct sr_dev_inst* sdi)
 {
        char buf[LINELEN_MAX];
-       int stat;
+       int stat, ret;
        struct dev_context* devc;
 
        devc = (struct dev_context*)sdi->priv;
 
        devc->req_sent_at = g_get_real_time();
 
-       if (lps_cmd_reply(buf, sdi->conn, "STATUS") < 0) {
-               sr_err("%s: Failed to read status: %d %s", __func__, errno, strerror(errno));
+       if ((ret = lps_cmd_reply(buf, sdi->conn, "STATUS")) < 0) {
+               sr_err("%s: Failed to read status: %s.", __func__,
+                       sr_strerror(ret));
                return SR_ERR;
        }
 
@@ -379,7 +379,7 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
        struct sr_channel_group *cg;
        GSList *devices;
        const char *conn, *serialcomm;
-       int cnt;
+       int cnt, ret;
        gchar buf[LINELEN_MAX];
        gchar channel[10];
        char *verstr;
@@ -434,7 +434,7 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
 
        /* Query version */
        verstr = NULL;
-       if (lps_cmd_reply(buf, serial, "VERSION") == SR_OK) {
+       if ((ret = lps_cmd_reply(buf, serial, "VERSION")) == SR_OK) {
                if (strncmp(buf, "Ver-", 4)) {
                        sr_spew("Version string %s not recognized.", buf);
                        goto exit_err;
@@ -445,7 +445,8 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
        }
        else  /* Bug in device FW 1.17: Querying version string fails while output is active.
                Therefore just print an error message, but do not exit with error. */
-               sr_err("Failed to query for hardware version: %d %s", errno, strerror(errno));
+               sr_err("Failed to query for hardware version: %s.",
+                       sr_strerror(ret));
 
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
        sdi->status = SR_ST_INACTIVE;

diff --git a/src/hardware/norma-dmm/protocol.h b/src/hardware/norma-dmm/protocol.h
index 951734e8f99667b7502375e4e0eab500309e9d5d..80927150701b7d97f008ac00e035abae3993f73a 100644 (file)
--- a/src/hardware/norma-dmm/protocol.h
+++ b/src/hardware/norma-dmm/protocol.h
@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 #include <math.h>
 #include <glib.h>
 #include "libsigrok.h"

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 5a89b3d158ad7d5660ce9812899faf9f5d1b55f0..c71dd0750b109d2c4e44023d6d5845af27e65525 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -23,7 +23,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include <errno.h>
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 99a7169424fd5aaa3c845db94301d1fbb8c7897a..84b12cf0e003e0731624ca230b0688a0ece10db2 100644 (file)
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <errno.h>
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"