Module Name: src
Committed By: christos
Date: Sat Jan 21 19:49:56 UTC 2012
Modified Files:
src/dist/nvi/common: cut.c delete.c
Log Message:
make the previous patch compile.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/dist/nvi/common/cut.c
cvs rdiff -u -r1.4 -r1.5 src/dist/nvi/common/delete.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/common/cut.c
diff -u src/dist/nvi/common/cut.c:1.6 src/dist/nvi/common/cut.c:1.7
--- src/dist/nvi/common/cut.c:1.6 Sat Jan 21 14:32:37 2012
+++ src/dist/nvi/common/cut.c Sat Jan 21 14:49:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cut.c,v 1.6 2012/01/21 19:32:37 christos Exp $ */
+/* $NetBSD: cut.c,v 1.7 2012/01/21 19:49:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -134,7 +134,7 @@ copyloop:
}
-#define ENTIRE_LINE -1
+#define ENTIRE_LINE (size_t)-1
/* In line mode, it's pretty easy, just cut the lines. */
if (LF_ISSET(CUT_LINEMODE)) {
cbp->flags |= CB_LMODE;
@@ -257,6 +257,7 @@ cut_line(SCR *sp, db_recno_t lno, size_t
* copy the portion we want, and reset the TEXT length.
*/
if (len != 0) {
+/*###260 [cc] error: comparison between signed and unsigned integer expressions%%%*/
if (clen == ENTIRE_LINE)
clen = len - fcno;
MEMCPYW(tp->lb, p + fcno, clen);
Index: src/dist/nvi/common/delete.c
diff -u src/dist/nvi/common/delete.c:1.4 src/dist/nvi/common/delete.c:1.5
--- src/dist/nvi/common/delete.c:1.4 Sat Jan 21 14:35:02 2012
+++ src/dist/nvi/common/delete.c Sat Jan 21 14:49:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: delete.c,v 1.4 2012/01/21 19:35:02 christos Exp $ */
+/* $NetBSD: delete.c,v 1.5 2012/01/21 19:49:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -65,7 +65,7 @@ del(SCR *sp, MARK *fm, MARK *tm, int lmo
if (tm->lno == lno) {
if (db_get(sp, lno, DBG_FATAL, &p, &len))
return (1);
- eof = tm->cno != -1 && tm->cno >= len ? 1 : 0;
+ eof = tm->cno != (size_t)-1 && tm->cno >= len ? 1 : 0;
} else
eof = 1;
if (eof) {
