Minor whitespace- and consistency fixes.

This commit is contained in:
Uwe Hermann 2020-01-26 21:18:49 +01:00
parent 42b3cf3b98
commit 78c3db9bfb
6 changed files with 109 additions and 106 deletions

View File

@ -33,7 +33,6 @@ int main(int argc, char **argv)
/* Open and configure each port, and then add its RX event /* Open and configure each port, and then add its RX event
* to the event set. */ * to the event set. */
for (int i = 0; i < num_ports; i++) { for (int i = 0; i < num_ports; i++) {
printf("Looking for port %s.\n", port_names[i]); printf("Looking for port %s.\n", port_names[i]);
check(sp_get_port_by_name(port_names[i], &ports[i])); check(sp_get_port_by_name(port_names[i], &ports[i]));
@ -79,6 +78,7 @@ int check(enum sp_return result)
{ {
/* For this example we'll just exit on any error by calling abort(). */ /* For this example we'll just exit on any error by calling abort(). */
char *error_message; char *error_message;
switch (result) { switch (result) {
case SP_ERR_ARG: case SP_ERR_ARG:
printf("Error: Invalid argument.\n"); printf("Error: Invalid argument.\n");

View File

@ -31,6 +31,7 @@ int check(enum sp_return result)
{ {
int error_code; int error_code;
char *error_message; char *error_message;
switch (result) { switch (result) {
/* Handle each of the four negative error codes that can be returned. /* Handle each of the four negative error codes that can be returned.

View File

@ -17,8 +17,7 @@ int main(int argc, char **argv)
* pointer will be updated to refer to the array created. */ * pointer will be updated to refer to the array created. */
enum sp_return result = sp_list_ports(&port_list); enum sp_return result = sp_list_ports(&port_list);
if (result != SP_OK) if (result != SP_OK) {
{
printf("sp_list_ports() failed!\n"); printf("sp_list_ports() failed!\n");
return -1; return -1;
} }
@ -26,8 +25,7 @@ int main(int argc, char **argv)
/* Iterate through the ports. When port_list[i] is NULL /* Iterate through the ports. When port_list[i] is NULL
* this indicates the end of the list. */ * this indicates the end of the list. */
int i; int i;
for (i = 0; port_list[i] != NULL; i++) for (i = 0; port_list[i] != NULL; i++) {
{
struct sp_port *port = port_list[i]; struct sp_port *port = port_list[i];
/* Get the name of the port. */ /* Get the name of the port. */

View File

@ -130,6 +130,7 @@ int check(enum sp_return result)
{ {
/* For this example we'll just exit on any error by calling abort(). */ /* For this example we'll just exit on any error by calling abort(). */
char *error_message; char *error_message;
switch (result) { switch (result) {
case SP_ERR_ARG: case SP_ERR_ARG:
printf("Error: Invalid argument.\n"); printf("Error: Invalid argument.\n");
@ -155,12 +156,19 @@ int check(enum sp_return result)
const char *parity_name(enum sp_parity parity) const char *parity_name(enum sp_parity parity)
{ {
switch (parity) { switch (parity) {
case SP_PARITY_INVALID: return "(Invalid)"; case SP_PARITY_INVALID:
case SP_PARITY_NONE: return "None"; return "(Invalid)";
case SP_PARITY_ODD: return "Odd"; case SP_PARITY_NONE:
case SP_PARITY_EVEN: return "Even"; return "None";
case SP_PARITY_MARK: return "Mark"; case SP_PARITY_ODD:
case SP_PARITY_SPACE: return "Space"; return "Odd";
default: return NULL; case SP_PARITY_EVEN:
return "Even";
case SP_PARITY_MARK:
return "Mark";
case SP_PARITY_SPACE:
return "Space";
default:
return NULL;
} }
} }

View File

@ -24,8 +24,7 @@ int main(int argc, char **argv)
* pointer will be updated to refer to the port found. */ * pointer will be updated to refer to the port found. */
enum sp_return result = sp_get_port_by_name(port_name, &port); enum sp_return result = sp_get_port_by_name(port_name, &port);
if (result != SP_OK) if (result != SP_OK) {
{
printf("sp_get_port_by_name() failed!\n"); printf("sp_get_port_by_name() failed!\n");
return -1; return -1;
} }
@ -38,14 +37,11 @@ int main(int argc, char **argv)
* e.g. native port, USB or Bluetooth. */ * e.g. native port, USB or Bluetooth. */
enum sp_transport transport = sp_get_port_transport(port); enum sp_transport transport = sp_get_port_transport(port);
if (transport == SP_TRANSPORT_NATIVE) if (transport == SP_TRANSPORT_NATIVE) {
{
/* This is a "native" port, usually directly connected /* This is a "native" port, usually directly connected
* to the system rather than some external interface. */ * to the system rather than some external interface. */
printf("Type: Native\n"); printf("Type: Native\n");
} } else if (transport == SP_TRANSPORT_USB) {
else if (transport == SP_TRANSPORT_USB)
{
/* This is a USB to serial converter of some kind. */ /* This is a USB to serial converter of some kind. */
printf("Type: USB\n"); printf("Type: USB\n");
@ -63,9 +59,7 @@ int main(int argc, char **argv)
int usb_bus, usb_address; int usb_bus, usb_address;
sp_get_port_usb_bus_address(port, &usb_bus, &usb_address); sp_get_port_usb_bus_address(port, &usb_bus, &usb_address);
printf("Bus: %d Address: %d\n", usb_bus, usb_address); printf("Bus: %d Address: %d\n", usb_bus, usb_address);
} } else if (transport == SP_TRANSPORT_BLUETOOTH) {
else if (transport == SP_TRANSPORT_BLUETOOTH)
{
/* This is a Bluetooth serial port. */ /* This is a Bluetooth serial port. */
printf("Type: Bluetooth\n"); printf("Type: Bluetooth\n");

View File

@ -11,6 +11,7 @@ int main(int argc, char *argv[])
struct time a, b, c; struct time a, b, c;
struct timeval tv; struct timeval tv;
struct timeout to; struct timeout to;
printf("Testing arithmetic\n"); printf("Testing arithmetic\n");
time_set_ms(&a, 10050); time_set_ms(&a, 10050);
time_set_ms(&b, 100); time_set_ms(&b, 100);
@ -63,5 +64,6 @@ int main(int argc, char *argv[])
timeout_update(&to); timeout_update(&to);
assert(timeout_check(&to)); assert(timeout_check(&to));
printf("Timeout expired\n"); printf("Timeout expired\n");
return 0; return 0;
} }