X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/527bdcb4986dcd71fc4b173684fae4c24f1fcdea..189a9391eb6cbc584cc0cc9d72dd4b91b9c71f4f:/src/am7xxx.c?ds=sidebyside

diff --git a/src/am7xxx.c b/src/am7xxx.c
index 94b01ac..76df87d 100644
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -53,7 +53,7 @@
 
 static void log_message(am7xxx_context *ctx,
 			int level,
-			const char *function,
+			const char *function_name,
 			int line,
 			const char *fmt,
 			...) __attribute__ ((format (printf, 5, 6)));
@@ -341,7 +341,7 @@ static inline unsigned int in_80chars(unsigned int i)
 {
 	/* The 3 below is the length of "xx " where xx is the hex string
 	 * representation of a byte */
-	return ((i+1) % (80/3));
+	return ((i + 1) % (80 / 3));
 }
 
 static void trace_dump_buffer(am7xxx_context *ctx, const char *message,
@@ -381,8 +381,9 @@ static void trace_dump_buffer(am7xxx_context *ctx, const char *message,
 static int read_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len)
 {
 	int ret;
-	int transferred = 0;
+	int transferred;
 
+	transferred = 0;
 	ret = libusb_bulk_transfer(dev->usb_device, 0x81, buffer, len, &transferred, 0);
 	if (ret != 0 || (unsigned int)transferred != len) {
 		error(dev->ctx, "%s. Transferred: %d (expected %u)\n",
@@ -398,10 +399,11 @@ static int read_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len)
 static int send_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len)
 {
 	int ret;
-	int transferred = 0;
+	int transferred;
 
 	trace_dump_buffer(dev->ctx, "sending -->", buffer, len);
 
+	transferred = 0;
 	ret = libusb_bulk_transfer(dev->usb_device, 0x1, buffer, len, &transferred, 0);
 	if (ret != 0 || (unsigned int)transferred != len) {
 		error(dev->ctx, "%s. Transferred: %d (expected %u)\n",
@@ -626,7 +628,7 @@ static int send_command(am7xxx_device *dev, am7xxx_packet_type type)
  * set up */
 static void log_message(am7xxx_context *ctx,
 			int level,
-			const char *function,
+			const char *function_name,
 			int line,
 			const char *fmt,
 			...)
@@ -634,8 +636,8 @@ static void log_message(am7xxx_context *ctx,
 	va_list ap;
 
 	if (level == AM7XXX_LOG_FATAL || (ctx && level <= ctx->log_level)) {
-		if (function) {
-			fprintf(stderr, "%s", function);
+		if (function_name) {
+			fprintf(stderr, "%s", function_name);
 			if (line)
 				fprintf(stderr, "[%d]", line);
 			fprintf(stderr, ": ");
@@ -662,7 +664,7 @@ static am7xxx_device *add_new_device(am7xxx_context *ctx,
 
 	new_device = malloc(sizeof(*new_device));
 	if (new_device == NULL) {
-		fatal("cannot allocate a new device (%s)\n", strerror(errno));
+		debug(ctx, "cannot allocate a new device (%s)\n", strerror(errno));
 		return NULL;
 	}
 	memset(new_device, 0, sizeof(*new_device));
@@ -718,7 +720,6 @@ static int open_device(am7xxx_context *ctx,
 
 	/* the usb device has already been opened */
 	if ((*dev)->usb_device) {
-		debug(ctx, "(*dev)->usb_device already set\n");
 		ret = 1;
 		goto out;
 	}
@@ -799,7 +800,7 @@ static int open_device(am7xxx_context *ctx,
 	}
 
 	if (current_configuration != (*dev)->desc->configuration) {
-		debug(ctx, "libusb configuration changed (expected: %hhu, current: %hhu\n",
+		debug(ctx, "libusb configuration changed (expected: %hhu, current: %d\n",
 		      (*dev)->desc->configuration, current_configuration);
 		ret = -EINVAL;
 		goto out_libusb_release_interface;