diff options
-rw-r--r-- | src/WacomInterface.h | 7 | ||||
-rw-r--r-- | src/wcmConfig.c | 2 | ||||
-rw-r--r-- | tools/tools-shared.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/WacomInterface.h b/src/WacomInterface.h index dc3656f..79a7e50 100644 --- a/src/WacomInterface.h +++ b/src/WacomInterface.h @@ -198,12 +198,15 @@ static inline void wcmAxisValue(const WacomAxisData *data, char *buf, size_t len) { int val = 0; + int rc; if (!wcmAxisGet(data, which, &val)) { - assert(snprintf(buf, len, "N/A") < len); + rc = snprintf(buf, len, "N/A"); + assert(rc > 0 && (size_t)rc < len); return; } - assert(snprintf(buf, len, "%d", val) < len); + rc = snprintf(buf, len, "%d", val); + assert(rc > 0 && (size_t)rc < len); } static inline const char* wcmAxisName(enum WacomAxisType which) diff --git a/src/wcmConfig.c b/src/wcmConfig.c index ed65de8..f7abe8b 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -1227,7 +1227,7 @@ TEST_CASE(test_flag_set) for (size_t i = 0; i < sizeof(flags); i++) { - int mask = 1 << i; + unsigned int mask = 1 << i; flags = 0; assert(!MaskIsSet(flags, mask)); diff --git a/tools/tools-shared.c b/tools/tools-shared.c index 137bc02..98db0fa 100644 --- a/tools/tools-shared.c +++ b/tools/tools-shared.c @@ -113,7 +113,7 @@ int set_serial_attr(int fd, unsigned int baud) int write_to_tablet(int fd, const char *command) { - int len = 0; + unsigned long len = 0; do { int l; |