compiler warning: stringop-overflow

Adjust NCOPY macros to avoid stringop-overflow warning.

Author: jodavies

configure.ac

@@ -764,12 +764,8 @@ DEBUGTOOL_LIBS=
 # -------------------------------------
 AC_DEFUN([AX_HANDLE_EXTRA_WARNING],
 [if test "x$enable_extra_warning" != xyes; then
-	# Too many false positives.
-	# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88443
-	AX_CHECK_COMPILE_FLAG([-Wno-stringop-overflow],
-		[$1="$$1 -Wno-stringop-overflow"],
-		[],
-		[-Werror])
+	# Currently no warnings are disabled without --enable-extra-warning
+	$1
 fi[]dnl
 ])
 

sources/declare.h

@@ -67,13 +67,14 @@
 #define ParseSignedNumber(x,s) { int sgn; ParseSign(sgn,s)\
           ParseNumber(x,s) if ( sgn ) x = -x; }
 
-#define NCOPY(s,t,n) while ( --n >= 0 ) *s++ = *t++;
-
+/* (n) is necessary here, since the macro is sometimes passed dereferenced pointers for n */
+#define NCOPY(s,t,n) { while ( (n)-- > 0 ) { *s++ = *t++; } }
 /*#define NCOPY(s,t,n) { memcpy(s,t,n*sizeof(WORD)); s+=n; t+=n; n = -1; }*/
-#define NCOPYI(s,t,n) while ( --n >= 0 ) *s++ = *t++;
-#define NCOPYB(s,t,n) while ( --n >= 0 ) *s++ = *t++;
-#define NCOPYI32(s,t,n) while ( --n >= 0 ) *s++ = *t++;
-#define WCOPY(s,t,n) { int nn=n; WORD *ss=(WORD *)s, *tt=(WORD *)t; while ( --nn >= 0 ) *ss++=*tt++; }
+#define NCOPYI(s,t,n) { while ( (n)-- > 0 ) { *s++ = *t++; } }
+#define NCOPYB(s,t,n) { while ( (n)-- > 0 ) { *s++ = *t++; } }
+#define NCOPYI32(s,t,n) { while ( (n)-- > 0 ) { *s++ = *t++; } }
+#define WCOPY(s,t,n) { int nn=n; WORD *ss=(WORD *)s, *tt=(WORD *)t; while ( (nn)-- > 0 ) { *ss++ = *tt++; } }
+
 #define NeedNumber(x,s,err) { int sgn = 1;                               \
 		while ( *s == ' ' || *s == '\t' || *s == '-' || *s == '+' ) {      \
 			if ( *s == '-' ) {sgn = -sgn;} s++; }                           \