summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
inline | side by side (from parent 1:
79a8004)
This avoids the need to pass the required format string on every
call and also eliminates the need for the non-standard typeof() call.
#define RETURN_OK() RETURN_CODE(SP_OK);
#define RETURN_ERROR(err, ...) do { DEBUG_ERROR(err, __VA_ARGS__); return err; } while (0)
#define RETURN_FAIL(...) do { DEBUG_FAIL(__VA_ARGS__); return SP_ERR_FAIL; } while (0)
#define RETURN_OK() RETURN_CODE(SP_OK);
#define RETURN_ERROR(err, ...) do { DEBUG_ERROR(err, __VA_ARGS__); return err; } while (0)
#define RETURN_FAIL(...) do { DEBUG_FAIL(__VA_ARGS__); return SP_ERR_FAIL; } while (0)
-#define RETURN_VALUE(fmt, x) do { \
- typeof(x) _x = x; \
- DEBUG("%s returning " fmt, __func__, _x); \
+#define RETURN_INT(x) do { \
+ int _x = x; \
+ DEBUG("%s returning %d", __func__, _x); \
+ return _x; \
+} while (0)
+#define RETURN_STRING(x) do { \
+ char *_x = x; \
+ DEBUG("%s returning %s", __func__, _x); \
+ return _x; \
+} while (0)
+#define RETURN_POINTER(x) do { \
+ void *_x = x; \
+ DEBUG("%s returning %p", __func__, _x); \
return _x; \
} while (0)
#define SET_ERROR(val, err, msg) do { DEBUG_ERROR(err, msg); val = err; } while (0)
return _x; \
} while (0)
#define SET_ERROR(val, err, msg) do { DEBUG_ERROR(err, msg); val = err; } while (0)
- RETURN_VALUE("%s", port->name);
+ RETURN_STRING(port->name);
}
SP_API char *sp_get_port_description(struct sp_port *port)
}
SP_API char *sp_get_port_description(struct sp_port *port)
if (!port || !port->description)
return NULL;
if (!port || !port->description)
return NULL;
- RETURN_VALUE("%s", port->description);
+ RETURN_STRING(port->description);
}
SP_API enum sp_transport sp_get_port_transport(struct sp_port *port)
}
SP_API enum sp_transport sp_get_port_transport(struct sp_port *port)
if (!port)
RETURN_ERROR(SP_ERR_ARG, "Null port");
if (!port)
RETURN_ERROR(SP_ERR_ARG, "Null port");
- RETURN_VALUE("%d", port->transport);
+ RETURN_INT(port->transport);
}
SP_API enum sp_return sp_get_port_usb_bus_address(const struct sp_port *port,
}
SP_API enum sp_return sp_get_port_usb_bus_address(const struct sp_port *port,
if (!port || port->transport != SP_TRANSPORT_USB || !port->usb_manufacturer)
return NULL;
if (!port || port->transport != SP_TRANSPORT_USB || !port->usb_manufacturer)
return NULL;
- RETURN_VALUE("%s", port->usb_manufacturer);
+ RETURN_STRING(port->usb_manufacturer);
}
SP_API char *sp_get_port_usb_product(const struct sp_port *port)
}
SP_API char *sp_get_port_usb_product(const struct sp_port *port)
if (!port || port->transport != SP_TRANSPORT_USB || !port->usb_product)
return NULL;
if (!port || port->transport != SP_TRANSPORT_USB || !port->usb_product)
return NULL;
- RETURN_VALUE("%s", port->usb_product);
+ RETURN_STRING(port->usb_product);
}
SP_API char *sp_get_port_usb_serial(const struct sp_port *port)
}
SP_API char *sp_get_port_usb_serial(const struct sp_port *port)
if (!port || port->transport != SP_TRANSPORT_USB || !port->usb_serial)
return NULL;
if (!port || port->transport != SP_TRANSPORT_USB || !port->usb_serial)
return NULL;
- RETURN_VALUE("%s", port->usb_serial);
+ RETURN_STRING(port->usb_serial);
}
SP_API char *sp_get_port_bluetooth_address(const struct sp_port *port)
}
SP_API char *sp_get_port_bluetooth_address(const struct sp_port *port)
|| !port->bluetooth_address)
return NULL;
|| !port->bluetooth_address)
return NULL;
- RETURN_VALUE("%s", port->bluetooth_address);
+ RETURN_STRING(port->bluetooth_address);
}
SP_API enum sp_return sp_get_port_handle(const struct sp_port *port,
}
SP_API enum sp_return sp_get_port_handle(const struct sp_port *port,
DEBUG("Copying port structure");
DEBUG("Copying port structure");
- RETURN_VALUE("%p", sp_get_port_by_name(port->name, copy_ptr));
+ RETURN_INT(sp_get_port_by_name(port->name, copy_ptr));
}
SP_API void sp_free_port(struct sp_port *port)
}
SP_API void sp_free_port(struct sp_port *port)
DEBUG("Writing %d bytes to port %s, no timeout", count, port->name);
if (count == 0)
DEBUG("Writing %d bytes to port %s, no timeout", count, port->name);
if (count == 0)
#ifdef _WIN32
DWORD bytes_written = 0;
#ifdef _WIN32
DWORD bytes_written = 0;
DEBUG("Waiting for write to complete");
GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE);
DEBUG("Write completed, %d/%d bytes written", bytes_written, count);
DEBUG("Waiting for write to complete");
GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE);
DEBUG("Write completed, %d/%d bytes written", bytes_written, count);
- RETURN_VALUE("%d", bytes_written);
+ RETURN_INT(bytes_written);
} else {
RETURN_FAIL("WriteFile() failed");
}
} else {
DEBUG("Write completed immediately");
} else {
RETURN_FAIL("WriteFile() failed");
}
} else {
DEBUG("Write completed immediately");
- RETURN_VALUE("%d", count);
}
#else
size_t bytes_written = 0;
}
#else
size_t bytes_written = 0;
gettimeofday(&now, NULL);
if (timercmp(&now, &end, >)) {
DEBUG("write timed out");
gettimeofday(&now, NULL);
if (timercmp(&now, &end, >)) {
DEBUG("write timed out");
- RETURN_VALUE("%d", bytes_written);
+ RETURN_INT(bytes_written);
}
timersub(&end, &now, &delta);
}
}
timersub(&end, &now, &delta);
}
}
} else if (result == 0) {
DEBUG("write timed out");
}
} else if (result == 0) {
DEBUG("write timed out");
- RETURN_VALUE("%d", bytes_written);
+ RETURN_INT(bytes_written);
- RETURN_VALUE("%d", bytes_written);
+ RETURN_INT(bytes_written);
DEBUG("Writing up to %d bytes to port %s", count, port->name);
if (count == 0)
DEBUG("Writing up to %d bytes to port %s", count, port->name);
if (count == 0)
#ifdef _WIN32
DWORD written = 0;
#ifdef _WIN32
DWORD written = 0;
} else {
DEBUG("Previous write not complete");
/* Can't take a new write until the previous one finishes. */
} else {
DEBUG("Previous write not complete");
/* Can't take a new write until the previous one finishes. */
} else {
DEBUG("Asynchronous write running");
port->writing = 1;
} else {
DEBUG("Asynchronous write running");
port->writing = 1;
- RETURN_VALUE("%d", ++written);
}
} else {
/* Actual failure of some kind. */
}
} else {
/* Actual failure of some kind. */
DEBUG("All bytes written immediately");
DEBUG("All bytes written immediately");
- RETURN_VALUE("%d", written);
#else
/* Returns the number of bytes written, or -1 upon failure. */
ssize_t written = write(port->fd, buf, count);
#else
/* Returns the number of bytes written, or -1 upon failure. */
ssize_t written = write(port->fd, buf, count);
if (written < 0)
RETURN_FAIL("write() failed");
else
if (written < 0)
RETURN_FAIL("write() failed");
else
- RETURN_VALUE("%d", written);
DEBUG("Reading %d bytes from port %s, no timeout", count, port->name);
if (count == 0)
DEBUG("Reading %d bytes from port %s, no timeout", count, port->name);
if (count == 0)
#ifdef _WIN32
DWORD bytes_read = 0;
#ifdef _WIN32
DWORD bytes_read = 0;
RETURN_FAIL("WaitCommEvent() failed");
}
RETURN_FAIL("WaitCommEvent() failed");
}
- RETURN_VALUE("%d", bytes_read);
+ RETURN_INT(bytes_read);
#else
size_t bytes_read = 0;
#else
size_t bytes_read = 0;
gettimeofday(&now, NULL);
if (timercmp(&now, &end, >))
/* Timeout has expired. */
gettimeofday(&now, NULL);
if (timercmp(&now, &end, >))
/* Timeout has expired. */
- RETURN_VALUE("%d", bytes_read);
+ RETURN_INT(bytes_read);
timersub(&end, &now, &delta);
}
result = select(port->fd + 1, &fds, NULL, NULL, timeout ? &delta : NULL);
timersub(&end, &now, &delta);
}
result = select(port->fd + 1, &fds, NULL, NULL, timeout ? &delta : NULL);
}
} else if (result == 0) {
DEBUG("read timed out");
}
} else if (result == 0) {
DEBUG("read timed out");
- RETURN_VALUE("%d", bytes_read);
+ RETURN_INT(bytes_read);
- RETURN_VALUE("%d", bytes_read);
+ RETURN_INT(bytes_read);
- RETURN_VALUE("%d", bytes_read);
+ RETURN_INT(bytes_read);
#else
ssize_t bytes_read;
#else
ssize_t bytes_read;
/* This is an actual failure. */
RETURN_FAIL("read() failed");
}
/* This is an actual failure. */
RETURN_FAIL("read() failed");
}
- RETURN_VALUE("%d", bytes_read);
+ RETURN_INT(bytes_read);
if (ClearCommError(port->hdl, &errors, &comstat) == 0)
RETURN_FAIL("ClearCommError() failed");
if (ClearCommError(port->hdl, &errors, &comstat) == 0)
RETURN_FAIL("ClearCommError() failed");
- RETURN_VALUE("%d", comstat.cbInQue);
+ RETURN_INT(comstat.cbInQue);
#else
int bytes_waiting;
if (ioctl(port->fd, TIOCINQ, &bytes_waiting) < 0)
RETURN_FAIL("TIOCINQ ioctl failed");
#else
int bytes_waiting;
if (ioctl(port->fd, TIOCINQ, &bytes_waiting) < 0)
RETURN_FAIL("TIOCINQ ioctl failed");
- RETURN_VALUE("%d", bytes_waiting);
+ RETURN_INT(bytes_waiting);
if (ClearCommError(port->hdl, &errors, &comstat) == 0)
RETURN_FAIL("ClearCommError() failed");
if (ClearCommError(port->hdl, &errors, &comstat) == 0)
RETURN_FAIL("ClearCommError() failed");
- RETURN_VALUE("%d", comstat.cbOutQue);
+ RETURN_INT(comstat.cbOutQue);
#else
int bytes_waiting;
if (ioctl(port->fd, TIOCOUTQ, &bytes_waiting) < 0)
RETURN_FAIL("TIOCOUTQ ioctl failed");
#else
int bytes_waiting;
if (ioctl(port->fd, TIOCOUTQ, &bytes_waiting) < 0)
RETURN_FAIL("TIOCOUTQ ioctl failed");
- RETURN_VALUE("%d", bytes_waiting);
+ RETURN_INT(bytes_waiting);
{
TRACE("");
#ifdef _WIN32
{
TRACE("");
#ifdef _WIN32
- RETURN_VALUE("%d", GetLastError());
+ RETURN_INT(GetLastError());
- RETURN_VALUE("%d", errno);
(LPTSTR) &message,
0, NULL );
(LPTSTR) &message,
0, NULL );
- RETURN_VALUE("%s", message);
+ RETURN_STRING(message);
- RETURN_VALUE("%s", strerror(errno));
+ RETURN_STRING(strerror(errno));