#include <winsock2.h>
#include <ws2tcpip.h>
#endif
-
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
#include <glib.h>
#include <string.h>
#include <unistd.h>
#include <netdb.h>
#endif
#include <errno.h>
+#include <libsigrok/libsigrok.h>
+#include "libsigrok-internal.h"
+#include "scpi.h"
#define LOG_PREFIX "scpi_tcp"
err = getaddrinfo(tcp->address, tcp->port, &hints, &results);
if (err) {
- sr_err("Address lookup failed: %s:%d: %s", tcp->address, tcp->port,
+ sr_err("Address lookup failed: %s:%s: %s", tcp->address, tcp->port,
gai_strerror(err));
return SR_ERR;
}
if (tcp->socket < 0) {
sr_err("Failed to connect to %s:%s: %s", tcp->address, tcp->port,
- strerror(errno));
+ g_strerror(errno));
return SR_ERR;
}
g_free(terminated_command);
if (out < 0) {
- sr_err("Send error: %s", strerror(errno));
+ sr_err("Send error: %s", g_strerror(errno));
return SR_ERR;
}
len = recv(tcp->socket, buf, maxlen, 0);
if (len < 0) {
- sr_err("Receive error: %s", strerror(errno));
+ sr_err("Receive error: %s", g_strerror(errno));
return SR_ERR;
}
len = recv(tcp->socket, tcp->length_buf + tcp->length_bytes_read,
LENGTH_BYTES - tcp->length_bytes_read, 0);
if (len < 0) {
- sr_err("Receive error: %s", strerror(errno));
+ sr_err("Receive error: %s", g_strerror(errno));
return SR_ERR;
}
len = recv(tcp->socket, buf, maxlen, 0);
if (len < 0) {
- sr_err("Receive error: %s", strerror(errno));
+ sr_err("Receive error: %s", g_strerror(errno));
return SR_ERR;
}