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

Revise debug macros to work in strict C99.

Browse Source
This commit is contained in:
Martin Ling
2014-08-24 13:59:32 +01:00
parent 9caa2e86aa
commit 7890cef6cf
3 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
linux.c
View File

@@ -35,12 +35,12 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
int i, count;
if (strncmp(port->name, "/dev/", 5))
RETURN_ERROR(SP_ERR_ARG, "Device name not recognized (%s)", port->name);
RETURN_ERROR(SP_ERR_ARG, "Device name not recognized.");
snprintf(file_name, sizeof(file_name), "/sys/class/tty/%s", dev);
count = readlink(file_name, file_name, sizeof(file_name));
if (count <= 0 || count >= (int) sizeof(file_name)-1)
RETURN_ERROR(SP_ERR_ARG, "Device not found (%s)", port->name);
RETURN_ERROR(SP_ERR_ARG, "Device not found.");
file_name[count] = 0;
if (strstr(file_name, "bluetooth"))
port->transport = SP_TRANSPORT_BLUETOOTH;
@@ -189,7 +189,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
if (strstr(target, "virtual"))
continue;
snprintf(name, sizeof(name), "/dev/%s", entry.d_name);
DEBUG("Found device %s", name);
DEBUG_FMT("Found device %s", name);
if (strstr(target, "serial8250")) {
/* The serial8250 driver has a hardcoded number of ports.
* The only way to tell which actually exist on a given system
@@ -214,7 +214,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
}
#endif
}
DEBUG("Found port %s", name);
DEBUG_FMT("Found port %s", name);
*list = list_append(*list, name);
if (!list) {
SET_ERROR(ret, SP_ERR_MEM, "list append failed");