X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fusb.c;h=ec502c97501704f38bed9b2d535374166ff7601e;hb=e07edc83d6311e36f2cbb5f3ae8a0f0edb526d18;hp=1c9e4118ebc0ad96e35e01cbadaf654e547c50bc;hpb=db156e5409b44bb90a81c1fcd160c2313fc156a0;p=libsigrok.git

diff --git a/src/usb.c b/src/usb.c
index 1c9e4118..ec502c97 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -271,27 +271,18 @@ SR_PRIV int usb_source_remove(struct sr_session *session, struct sr_context *ctx
 	return SR_OK;
 }
 
-SR_PRIV int usb_get_port_path(libusb_device *dev, const char *path, int path_len)
+SR_PRIV int usb_get_port_path(libusb_device *dev, char *path, int path_len)
 {
-	gchar s[64];
-	gchar tmp_s[8];
-	uint8_t port_numbers[32];
-	int i;
-
-	memset(port_numbers, 0, sizeof(port_numbers));
-	libusb_get_port_numbers(dev, port_numbers, sizeof(port_numbers));
-
-	g_snprintf((gchar*)&s, sizeof(s), "usb/%d-%d",
-			libusb_get_bus_number(dev), port_numbers[0]);
-
-	i = 1;
-	while (port_numbers[i]) {
-		g_snprintf(tmp_s, sizeof(tmp_s), ".%d", port_numbers[i]);
-		g_strlcat((gchar*)&s, tmp_s, sizeof(s));
-		i++;
-	}
+	uint8_t port_numbers[8];
+	int i, n, len;
+
+	n = libusb_get_port_numbers(dev, port_numbers, sizeof(port_numbers));
+
+	len = snprintf(path, path_len, "usb/%d-%d",
+	               libusb_get_bus_number(dev), port_numbers[0]);
 
-	g_strlcpy((gchar*)path, s, path_len);
+	for (i = 1; i < n; i++)
+		len += snprintf(path+len, path_len-len, ".%d", port_numbers[i]);
 
 	return SR_OK;
 }