From: Martin Ling <redacted>
Date: Sat, 22 Mar 2014 07:14:49 +0000 (+0000)
Subject: Merge pull request #1 from silverbuddy/master
X-Git-Tag: libserialport-0.1.0~7
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=6c4b27a8b88f032939294346e8e04eca5fb4d0e9;hp=524b0e1454ad80c2f9c5840137324ab31941e589;p=libserialport.git

Merge pull request #1 from silverbuddy/master

Win32 issues
---

diff --git a/serialport.c b/serialport.c
index 8393797..5a88b40 100644
--- a/serialport.c
+++ b/serialport.c
@@ -389,7 +389,7 @@ enum sp_return sp_list_ports(struct sp_port ***list_ptr)
 		data_len = data_size / sizeof(TCHAR);
 		data[data_len] = '\0';
 #ifdef UNICODE
-		name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL)
+		name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL);
 #else
 		name_len = data_len + 1;
 #endif
@@ -626,7 +626,7 @@ enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 	COMSTAT status;
 
 	/* Prefix port name with '\\.\' to work with ports above COM9. */
-	if (!(escaped_port_name = malloc(strlen(port->name + 5))))
+	if (!(escaped_port_name = malloc(strlen(port->name) + 5)))
 		RETURN_ERROR(SP_ERR_MEM, "Escaped port name malloc failed");
 	sprintf(escaped_port_name, "\\\\.\\%s", port->name);