Module Name: src
Committed By: lukem
Date: Sat Apr 11 12:16:12 UTC 2009
Modified Files:
src/usr.bin/cmp: cmp.c extern.h misc.c regular.c special.c
Log Message:
Fix WARNS=4 issues (many -Wcast-qual, one -Wsign-compare on amd64)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/cmp/cmp.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/cmp/extern.h
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/cmp/misc.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/cmp/regular.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/cmp/special.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/cmp/cmp.c
diff -u src/usr.bin/cmp/cmp.c:1.16 src/usr.bin/cmp/cmp.c:1.17
--- src/usr.bin/cmp/cmp.c:1.16 Mon Jul 21 14:19:21 2008
+++ src/usr.bin/cmp/cmp.c Sat Apr 11 12:16:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.c,v 1.16 2008/07/21 14:19:21 lukem Exp $ */
+/* $NetBSD: cmp.c,v 1.17 2009/04/11 12:16:12 lukem Exp $ */
/*
* Copyright (c) 1987, 1990, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: cmp.c,v 1.16 2008/07/21 14:19:21 lukem Exp $");
+__RCSID("$NetBSD: cmp.c,v 1.17 2009/04/11 12:16:12 lukem Exp $");
#endif
#endif /* not lint */
@@ -67,7 +67,7 @@
struct stat sb1, sb2;
off_t skip1 = 0, skip2 = 0;
int ch, fd1, fd2, special;
- char *file1, *file2;
+ const char *file1, *file2;
setlocale(LC_ALL, "");
Index: src/usr.bin/cmp/extern.h
diff -u src/usr.bin/cmp/extern.h:1.7 src/usr.bin/cmp/extern.h:1.8
--- src/usr.bin/cmp/extern.h:1.7 Tue Aug 21 14:09:53 2007
+++ src/usr.bin/cmp/extern.h Sat Apr 11 12:16:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.7 2007/08/21 14:09:53 christos Exp $ */
+/* $NetBSD: extern.h,v 1.8 2009/04/11 12:16:12 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -35,10 +35,10 @@
#define DIFF_EXIT 1
#define ERR_EXIT 2 /* error exit code */
-void c_regular(int, char *, off_t, off_t, int, char *, off_t, off_t);
-void c_special(int, char *, off_t, int, char *, off_t);
-void diffmsg(char *, char *, off_t, off_t);
-void eofmsg(char *, off_t, off_t);
-void errmsg(char *, off_t, off_t);
+void c_regular(int, const char *, off_t, off_t, int, const char *, off_t, off_t);
+void c_special(int, const char *, off_t, int, const char *, off_t);
+void diffmsg(const char *, const char *, off_t, off_t);
+void eofmsg(const char *, off_t, off_t);
+void errmsg(const char *, off_t, off_t);
extern int lflag, sflag;
Index: src/usr.bin/cmp/misc.c
diff -u src/usr.bin/cmp/misc.c:1.11 src/usr.bin/cmp/misc.c:1.12
--- src/usr.bin/cmp/misc.c:1.11 Wed Aug 22 16:59:19 2007
+++ src/usr.bin/cmp/misc.c Sat Apr 11 12:16:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.11 2007/08/22 16:59:19 christos Exp $ */
+/* $NetBSD: misc.c,v 1.12 2009/04/11 12:16:12 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: misc.c,v 1.11 2007/08/22 16:59:19 christos Exp $");
+__RCSID("$NetBSD: misc.c,v 1.12 2009/04/11 12:16:12 lukem Exp $");
#endif
#endif /* not lint */
@@ -47,7 +47,7 @@
#include "extern.h"
void
-errmsg(char *file, off_t byte, off_t line)
+errmsg(const char *file, off_t byte, off_t line)
{
if (lflag)
err(ERR_EXIT, "%s: char %lld, line %lld", file,
@@ -57,7 +57,7 @@
}
void
-eofmsg(char *file, off_t byte, off_t line)
+eofmsg(const char *file, off_t byte, off_t line)
{
if (!sflag) {
if (!lflag)
@@ -75,7 +75,7 @@
}
void
-diffmsg(char *file1, char *file2, off_t byte, off_t line)
+diffmsg(const char *file1, const char *file2, off_t byte, off_t line)
{
if (!sflag)
(void)printf("%s %s differ: char %lld, line %lld\n",
Index: src/usr.bin/cmp/regular.c
diff -u src/usr.bin/cmp/regular.c:1.20 src/usr.bin/cmp/regular.c:1.21
--- src/usr.bin/cmp/regular.c:1.20 Sat Jun 3 21:47:55 2006
+++ src/usr.bin/cmp/regular.c Sat Apr 11 12:16:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: regular.c,v 1.20 2006/06/03 21:47:55 christos Exp $ */
+/* $NetBSD: regular.c,v 1.21 2009/04/11 12:16:12 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: regular.c,v 1.20 2006/06/03 21:47:55 christos Exp $");
+__RCSID("$NetBSD: regular.c,v 1.21 2009/04/11 12:16:12 lukem Exp $");
#endif
#endif /* not lint */
@@ -51,8 +51,8 @@
#include "extern.h"
void
-c_regular(int fd1, char *file1, off_t skip1, off_t len1,
- int fd2, char *file2, off_t skip2, off_t len2)
+c_regular(int fd1, const char *file1, off_t skip1, off_t len1,
+ int fd2, const char *file2, off_t skip2, off_t len2)
{
u_char ch, *p1, *p2;
off_t byte, length, line;
@@ -73,7 +73,7 @@
dfound = 0;
length = MIN(len1, len2);
for (blk_sz = 1024 * 1024; length != 0; length -= blk_sz) {
- if (blk_sz > length)
+ if (blk_sz > (uint64_t)length)
blk_sz = length;
p1 = mmap(NULL, blk_sz, PROT_READ, MAP_FILE|MAP_SHARED,
fd1, skip1);
Index: src/usr.bin/cmp/special.c
diff -u src/usr.bin/cmp/special.c:1.12 src/usr.bin/cmp/special.c:1.13
--- src/usr.bin/cmp/special.c:1.12 Tue Aug 21 14:09:54 2007
+++ src/usr.bin/cmp/special.c Sat Apr 11 12:16:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: special.c,v 1.12 2007/08/21 14:09:54 christos Exp $ */
+/* $NetBSD: special.c,v 1.13 2009/04/11 12:16:12 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: special.c,v 1.12 2007/08/21 14:09:54 christos Exp $");
+__RCSID("$NetBSD: special.c,v 1.13 2009/04/11 12:16:12 lukem Exp $");
#endif
#endif /* not lint */
@@ -48,7 +48,7 @@
#include "extern.h"
void
-c_special(int fd1, char *file1, off_t skip1, int fd2, char *file2, off_t skip2)
+c_special(int fd1, const char *file1, off_t skip1, int fd2, const char *file2, off_t skip2)
{
int ch1, ch2;
off_t byte, line;
