BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial_hid: Don't print empty strings, [aaaa.bbbb] VID/PID format.

This commit is contained in:
Uwe Hermann 2019-06-20 18:16:31 +02:00
parent c0aa074eb2
commit be7c63dcf8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/serial_hid.c
View File

@ -199,14 +199,14 @@ static GSList *ser_hid_hidapi_list(GSList *list, sr_ser_list_append_t append)
pid = curdev->product_id;
desc = g_string_sized_new(128);
g_string_append_printf(desc, "HID");
if (manuf)
if (manuf && wcslen(manuf) != 0)
g_string_append_printf(desc, " %ls", manuf);
if (prod)
if (prod && wcslen(prod) != 0)
g_string_append_printf(desc, " %ls", prod);
if (serno)
if (serno && wcslen(serno) != 0)
g_string_append_printf(desc, " %ls", serno);
if (vid && pid)
g_string_append_printf(desc, " %04hx.%04hx", vid, pid);
g_string_append_printf(desc, " [%04hx.%04hx]", vid, pid);
list = append(list, name, desc->str);
g_string_free(desc, TRUE);
g_free(name);