Fix less-than-zero comparison on unsigned integers

git-svn-id: https://s.snth.net/svn/neverball/trunk@3591 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/share/common.h b/share/common.h
index e9a24e7..aea9620 100644 (file)
--- a/share/common.h
+++ b/share/common.h
@@ -50,10 +50,10 @@ int rand_between(int low, int high);
 #define ARRAYSIZE(a) (sizeof (a) / sizeof ((a)[0]))
 #define MAXSTRLEN(a) (sizeof (a) - 1)
 
-#define SAFECPY(dst, src) (strncpy((dst), (src), MAXSTRLEN(dst)))
-#define SAFECAT(dst, src) (strncat((dst), \
-                                   (src), \
-                                   MAX(0, MAXSTRLEN(dst) - strlen(dst))))
+#define SAFECPY(dst, src) \
+    (strncpy((dst), (src), MAXSTRLEN(dst)))
+#define SAFECAT(dst, src) \
+    (strncat((dst), (src), MAXSTRLEN(dst) - MIN(strlen(dst), MAXSTRLEN(dst))))
 
 int   read_line(char **, fs_file);
 char *strip_newline(char *);