Module Name: src
Committed By: dholland
Date: Sun Jul 26 01:58:21 UTC 2009
Modified Files:
src/bin/ed: Makefile cbc.c
Log Message:
Remove the need for -Wno-pointer-sign. Does not change the output .o file.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/bin/ed/Makefile
cvs rdiff -u -r1.18 -r1.19 src/bin/ed/cbc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ed/Makefile
diff -u src/bin/ed/Makefile:1.35 src/bin/ed/Makefile:1.36
--- src/bin/ed/Makefile:1.35 Fri Aug 29 00:02:21 2008
+++ src/bin/ed/Makefile Sun Jul 26 01:58:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/08/29 00:02:21 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.36 2009/07/26 01:58:20 dholland Exp $
.include <bsd.own.mk>
@@ -17,8 +17,4 @@
#LINKS= ${BINDIR}/ed ${BINDIR}/red
#MLINKS= ed.1 red.1
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
-COPTS.cbc.c+= -Wno-pointer-sign
-.endif
-
.include <bsd.prog.mk>
Index: src/bin/ed/cbc.c
diff -u src/bin/ed/cbc.c:1.18 src/bin/ed/cbc.c:1.19
--- src/bin/ed/cbc.c:1.18 Sun Jun 26 19:10:49 2005
+++ src/bin/ed/cbc.c Sun Jul 26 01:58:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cbc.c,v 1.18 2005/06/26 19:10:49 christos Exp $ */
+/* $NetBSD: cbc.c,v 1.19 2009/07/26 01:58:20 dholland Exp $ */
/* cbc.c: This file contains the encryption routines for the ed line editor */
/*-
@@ -72,7 +72,7 @@
#if 0
static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
#else
-__RCSID("$NetBSD: cbc.c,v 1.18 2005/06/26 19:10:49 christos Exp $");
+__RCSID("$NetBSD: cbc.c,v 1.19 2009/07/26 01:58:20 dholland Exp $");
#endif
#endif /* not lint */
@@ -139,7 +139,7 @@
};
int pflag; /* 1 to preserve parity bits */
-unsigned char des_buf[8]; /* shared buffer for get_des_char/put_des_char */
+char des_buf[8]; /* shared buffer for get_des_char/put_des_char */
int des_ct = 0; /* count for get_des_char/put_des_char */
int des_n = 0; /* index for put_des_char/get_des_char */
#endif
@@ -174,7 +174,7 @@
des_n = 0;
des_ct = cbc_decode(des_buf, fp);
}
- return (des_ct > 0) ? des_buf[des_n++] : EOF;
+ return (des_ct > 0) ? (unsigned char) des_buf[des_n++] : EOF;
#else
return EOF;
#endif
@@ -190,7 +190,7 @@
des_ct = cbc_encode(des_buf, des_n, fp);
des_n = 0;
}
- return (des_ct >= 0) ? (des_buf[des_n++] = c) : EOF;
+ return (des_ct >= 0) ? (unsigned char) (des_buf[des_n++] = c) : EOF;
#else
return EOF;
#endif
