mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

Clarify sp_list_ports() code.

Browse Source 
This also fixes the following scan-build warning:

  serialport.c:335:15: warning: Result of 'malloc' is converted to a
  pointer of type 'struct sp_port *', which is incompatible with sizeof
  operand type 'struct sp_port **'
          if (!(list = malloc(sizeof(struct sp_port **))))
                       ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Martin Ling 2015-04-01 00:24:27 +01:00 committed by Uwe Hermann
parent 34442106ef
commit 8d12e620f2
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
serialport.c
View File

@ -330,31 +330,27 @@ SP_API enum sp_return sp_list_ports(struct sp_port ***list_ptr)
if (!list_ptr) if (!list_ptr)
RETURN_ERROR(SP_ERR_ARG, "Null result pointer"); RETURN_ERROR(SP_ERR_ARG, "Null result pointer");
#ifdef NO_ENUMERATION
RETURN_ERROR(SP_ERR_SUPP, "Enumeration not supported on this platform");
#else
DEBUG("Enumerating ports"); DEBUG("Enumerating ports");
if (!(list = malloc(sizeof(struct sp_port **)))) if (!(list = malloc(sizeof(struct sp_port *))))
RETURN_ERROR(SP_ERR_MEM, "Port list malloc failed"); RETURN_ERROR(SP_ERR_MEM, "Port list malloc failed");
list[0] = NULL; list[0] = NULL;
#ifdef NO_ENUMERATION
ret = SP_ERR_SUPP;
#else
ret = list_ports(&list); ret = list_ports(&list);
#endif
switch (ret) { if (ret == SP_OK) {
case SP_OK:
*list_ptr = list; *list_ptr = list;
RETURN_OK(); } else {
case SP_ERR_SUPP: sp_free_port_list(list);
DEBUG_ERROR(SP_ERR_SUPP, "Enumeration not supported on this platform");
default:
if (list)
sp_free_port_list(list);
*list_ptr = NULL; *list_ptr = NULL;
return ret;
} }
RETURN_CODEVAL(ret);
#endif
} }
SP_API void sp_free_port_list(struct sp_port **list) SP_API void sp_free_port_list(struct sp_port **list)