summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-11-20 01:45:52 -0800
committerJune McEnroe <june@causal.agency>2019-11-21 16:26:43 -0500
commita17b38979617e8799da58be83699ea64dbed4503 (patch)
tree733efa3d1dca865f56629560e3abc5e98eb7920d
parentDeclare globals as extern in headers, and define in source file (diff)
downloadpounce-a17b38979617e8799da58be83699ea64dbed4503.tar.gz
pounce-a17b38979617e8799da58be83699ea64dbed4503.zip
Fix wordcmp return value when the words have differing lengths
Otherwise, the result of strncmp gets converted size_t, since size_t
has greater rank than int.

Since wordcmp is only ever used as a boolean condition, this poses
no real issue, but presumably, it is meant to behave like the other
*cmp function and return a value less than, equal to, or greater
than 0 depending on the result of the comparison.
Diffstat (limited to '')
-rw-r--r--client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client.c b/client.c
index 9ff192e..9be5a62 100644
--- a/client.c
+++ b/client.c
@@ -294,7 +294,7 @@ static int wordcmp(const char *line, size_t i, const char *word) {
 	size_t len = strcspn(line, " ");
 	return len == strlen(word)
 		? strncmp(line, word, len)
-		: len - strlen(word);
+		: (int)len - (int)strlen(word);
 }
 
 static size_t strlcpyn(char *dst, const char *src, size_t cap, size_t len) {
.c?h=v2&id=811419e17b70f93cb85fc26c9b7227f53349a7a7&follow=1'>Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft. 2017-09-01Revert "Add client readOnly mode"June McEnroe This reverts commit 34f25ae40a3db9369e9d98b3814f2b93bbc21451. 2017-09-01Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe