From 21919b3ea75d1722a048a0eea1aeadd6cfca366c Mon Sep 17 00:00:00 2001 From: parasti Date: Sat, 4 Jun 2011 20:30:34 +0000 Subject: [PATCH] Fix less-than-zero comparison on unsigned integers git-svn-id: https://s.snth.net/svn/neverball/trunk@3591 78b8d119-cf0a-0410-b17c-f493084dd1d7 --- share/common.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/common.h b/share/common.h index e9a24e7..aea9620 100644 --- 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 *); -- 1.7.9.5