Fix minor issues/errors pointed out by Microsoft Studio in casting

iio_device_get_sample_size() and iio_device_get_sample_size_mask()
can return errors (as neg number), check and cast to unsigned (which is
how things are stored internally in the iio_buf structure).

errno is int, cast ssize_t (return type of many iio functions) when
setting it.

if functions are int, return an int (not a ssize_t)

change some internal usb functions to uint16_t since it matches up
with libusb better

The macro FD_ZERO() & FD_SET() emits warnings, so turn them off/on
around those calls.

Initilize var to NULL, to keep compiler happy

libusb_get_device_list() can return errors, so check for them.

handle locales with the safe verison of the string functions
(using _snprintf_s_l() rather than _snprintf_l())

Signed-off-by: Robin Getz <[email protected]>

Author: rgetz

buffer.c

@@ -36,20 +36,25 @@ static bool device_is_high_speed(const struct iio_device *dev)
 struct iio_buffer * iio_device_create_buffer(const struct iio_device *dev,
 		size_t samples_count, bool cyclic)
 {
-	int ret = -EINVAL;
+	ssize_t ret = -EINVAL;
 	struct iio_buffer *buf;
-	unsigned int sample_size = iio_device_get_sample_size(dev);
+	ssize_t sample_size = iio_device_get_sample_size(dev);
 
 	if (!sample_size || !samples_count)
 		goto err_set_errno;
 
+	if (sample_size < 0) {
+		ret = sample_size;
+		goto err_set_errno;
+	}
+
 	buf = malloc(sizeof(*buf));
 	if (!buf) {
 		ret = -ENOMEM;
 		goto err_set_errno;
 	}
 
-	buf->dev_sample_size = sample_size;
+	buf->dev_sample_size = (unsigned int) sample_size;
 	buf->length = sample_size * samples_count;
 	buf->dev = dev;
 	buf->mask = calloc(dev->words, sizeof(*buf->mask));
@@ -87,8 +92,11 @@ struct iio_buffer * iio_device_create_buffer(const struct iio_device *dev,
 		}
 	}
 
-	buf->sample_size = iio_device_get_sample_size_mask(dev,
-			buf->mask, dev->words);
+	ret = iio_device_get_sample_size_mask(dev, buf->mask, dev->words);
+	if (ret < 0)
+		goto err_close_device;
+
+	buf->sample_size = (unsigned int) ret;
 	buf->data_length = buf->length;
 	return buf;
 
@@ -99,7 +107,7 @@ struct iio_buffer * iio_device_create_buffer(const struct iio_device *dev,
 err_free_buf:
 	free(buf);
 err_set_errno:
-	errno = -ret;
+	errno = -(int)ret;
 	return NULL;
 }
 
@@ -126,6 +134,7 @@ ssize_t iio_buffer_refill(struct iio_buffer *buffer)
 {
 	ssize_t read;
 	const struct iio_device *dev = buffer->dev;
+	ssize_t ret;
 
 	if (buffer->dev_is_high_speed) {
 		read = dev->ctx->ops->get_buffer(dev, &buffer->buffer,
@@ -137,8 +146,10 @@ ssize_t iio_buffer_refill(struct iio_buffer *buffer)
 
 	if (read >= 0) {
 		buffer->data_length = read;
-		buffer->sample_size = iio_device_get_sample_size_mask(dev,
-				buffer->mask, dev->words);
+		ret = iio_device_get_sample_size_mask(dev, buffer->mask, dev->words);
+		if (ret < 0)
+			return ret;
+		buffer->sample_size = (unsigned int)ret;
 	}
 	return read;
 }

channel.c

@@ -743,33 +743,33 @@ int iio_channel_attr_read_double(const struct iio_channel *chn,
 int iio_channel_attr_write_longlong(const struct iio_channel *chn,
 		const char *attr, long long val)
 {
-	ssize_t ret;
+	int ret;
 	char buf[1024];
 	iio_snprintf(buf, sizeof(buf), "%lld", val);
-	ret = iio_channel_attr_write(chn, attr, buf);
+	ret = (int) iio_channel_attr_write(chn, attr, buf);
 	return ret < 0 ? ret : 0;
 }
 
 int iio_channel_attr_write_double(const struct iio_channel *chn,
 		const char *attr, double val)
 {
-	ssize_t ret;
+	int ret;
 	char buf[1024];
 
-	ret = (ssize_t) write_double(buf, sizeof(buf), val);
+	ret = write_double(buf, sizeof(buf), val);
 	if (!ret)
-		ret = iio_channel_attr_write(chn, attr, buf);
+		ret = (int) iio_channel_attr_write(chn, attr, buf);
 	return ret < 0 ? ret : 0;
 }
 
 int iio_channel_attr_write_bool(const struct iio_channel *chn,
 		const char *attr, bool val)
 {
-	ssize_t ret;
+	int ret;
 	if (val)
-		ret = iio_channel_attr_write_raw(chn, attr, "1", 2);
+		ret = (int) iio_channel_attr_write_raw(chn, attr, "1", 2);
 	else
-		ret = iio_channel_attr_write_raw(chn, attr, "0", 2);
+		ret = (int) iio_channel_attr_write_raw(chn, attr, "0", 2);
 	return ret < 0 ? ret : 0;
 }
 

device.c

@@ -661,7 +661,7 @@ int iio_device_attr_write_longlong(const struct iio_device *dev,
 	iio_snprintf(buf, sizeof(buf), "%lld", val);
 	ret = iio_device_attr_write(dev, attr, buf);
 
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 int iio_device_attr_write_double(const struct iio_device *dev,
@@ -673,7 +673,7 @@ int iio_device_attr_write_double(const struct iio_device *dev,
 	ret = (ssize_t) write_double(buf, sizeof(buf), val);
 	if (!ret)
 		ret = iio_device_attr_write(dev, attr, buf);
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 int iio_device_attr_write_bool(const struct iio_device *dev,
@@ -686,7 +686,7 @@ int iio_device_attr_write_bool(const struct iio_device *dev,
 	else
 		ret = iio_device_attr_write(dev, attr, "0");
 
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 int iio_device_buffer_attr_read_longlong(const struct iio_device *dev,
@@ -737,7 +737,7 @@ int iio_device_buffer_attr_write_longlong(const struct iio_device *dev,
 	iio_snprintf(buf, sizeof(buf), "%lld", val);
 	ret = iio_device_buffer_attr_write(dev, attr, buf);
 
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 int iio_device_buffer_attr_write_double(const struct iio_device *dev,
@@ -749,7 +749,7 @@ int iio_device_buffer_attr_write_double(const struct iio_device *dev,
 	ret = (ssize_t) write_double(buf, sizeof(buf), val);
 	if (!ret)
 		ret = iio_device_buffer_attr_write(dev, attr, buf);
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 int iio_device_buffer_attr_write_bool(const struct iio_device *dev,
@@ -762,7 +762,7 @@ int iio_device_buffer_attr_write_bool(const struct iio_device *dev,
 	else
 		ret = iio_device_buffer_attr_write(dev, attr, "0");
 
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 ssize_t iio_device_debug_attr_read(const struct iio_device *dev,
@@ -853,7 +853,7 @@ int iio_device_debug_attr_write_longlong(const struct iio_device *dev,
 	iio_snprintf(buf, sizeof(buf), "%lld", val);
 	ret = iio_device_debug_attr_write(dev, attr, buf);
 
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 int iio_device_debug_attr_write_double(const struct iio_device *dev,
@@ -865,7 +865,7 @@ int iio_device_debug_attr_write_double(const struct iio_device *dev,
 	ret = (ssize_t) write_double(buf, sizeof(buf), val);
 	if (!ret)
 		ret = iio_device_debug_attr_write(dev, attr, buf);
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 int iio_device_debug_attr_write_bool(const struct iio_device *dev,
@@ -878,7 +878,7 @@ int iio_device_debug_attr_write_bool(const struct iio_device *dev,
 	else
 		ret = iio_device_debug_attr_write_raw(dev, attr, "0", 2);
 
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 int iio_device_identify_filename(const struct iio_device *dev,
@@ -930,7 +930,7 @@ int iio_device_reg_write(struct iio_device *dev,
 			address, value);
 	ret = iio_device_debug_attr_write(dev, "direct_reg_access", buf);
 
-	return ret < 0 ? ret : 0;
+	return (int) (ret < 0 ? ret : 0);
 }
 
 int iio_device_reg_read(struct iio_device *dev,

iio-private.h

@@ -288,8 +288,8 @@ struct iio_context * local_create_context(void);
 struct iio_context * network_create_context(const char *hostname);
 struct iio_context * xml_create_context_mem(const char *xml, size_t len);
 struct iio_context * xml_create_context(const char *xml_file);
-struct iio_context * usb_create_context(unsigned int bus, unsigned int address,
-		unsigned int interface);
+struct iio_context * usb_create_context(unsigned int bus, uint16_t address,
+		uint16_t interface);
 struct iio_context * usb_create_context_from_uri(const char *uri);
 struct iio_context * serial_create_context_from_uri(const char *uri);
 

iiod-client.c

@@ -169,13 +169,13 @@ int iiod_client_get_version(struct iiod_client *client, void *desc,
 
 	iio_mutex_lock(client->lock);
 
-	ret = ops->write(pdata, desc, "VERSION\r\n", sizeof("VERSION\r\n") - 1);
+	ret = (int) ops->write(pdata, desc, "VERSION\r\n", sizeof("VERSION\r\n") - 1);
 	if (ret < 0) {
 		iio_mutex_unlock(client->lock);
 		return ret;
 	}
 
-	ret = ops->read_line(pdata, desc, buf, sizeof(buf));
+	ret = (int) ops->read_line(pdata, desc, buf, sizeof(buf));
 	iio_mutex_unlock(client->lock);
 
 	if (ret < 0)
@@ -325,7 +325,7 @@ static int iiod_client_discard(struct iiod_client *client, void *desc,
 
 		ret = iiod_client_read_all(client, desc, buf, read_len);
 		if (ret < 0)
-			return ret;
+			return (int) ret;
 
 		to_discard -= (size_t) ret;
 	} while (to_discard);

network.c

@@ -406,7 +406,7 @@ static ssize_t write_command(struct iio_network_io_context *io_ctx,
 	ret = write_all(io_ctx, cmd, strlen(cmd));
 	if (ret < 0) {
 		char buf[1024];
-		iio_strerror(-ret, buf, sizeof(buf));
+		iio_strerror(-(int) ret, buf, sizeof(buf));
 		IIO_ERROR("Unable to send command: %s\n", buf);
 	}
 	return ret;
@@ -510,8 +510,17 @@ static int do_connect(int fd, const struct addrinfo *addrinfo,
 	}
 
 #ifdef _WIN32
+#ifdef _MSC_BUILD
+	/* This is so stupid, but studio emits a signed/unsigned mismatch
+	 * on their own FD_ZERO macro, so turn the warning off/on
+	 */
+#pragma warning(disable : 4389)
+#endif
 	FD_ZERO(&set);
 	FD_SET(fd, &set);
+#ifdef _MSC_BUILD
+#pragma warning(default: 4389)
+#endif
 
 	if (timeout != 0) {
 		tv.tv_sec = timeout / 1000;