CVS commit: src
Module Name:src
Committed By: jruoho
Date: Tue Mar 20 06:18:34 UTC 2012
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/jot: Makefile d_basic.out t_jot.sh
Log Message:
Add regression tests for PR bin/12424, PR bin/12316, and PR bin/14253,
all fixed long time ago.
To generate a diff of this commit:
cvs rdiff -u -r1.452 -r1.453 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.68 -r1.69 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.12 -r1.13 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/jot/Makefile \
src/tests/usr.bin/jot/d_basic.out src/tests/usr.bin/jot/t_jot.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.452 src/distrib/sets/lists/tests/mi:1.453
--- src/distrib/sets/lists/tests/mi:1.452 Mon Mar 19 11:16:36 2012
+++ src/distrib/sets/lists/tests/mi Tue Mar 20 06:18:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.452 2012/03/19 11:16:36 njoly Exp $
+# $NetBSD: mi,v 1.453 2012/03/20 06:18:34 jruoho Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -2896,6 +2896,10 @@
./usr/tests/usr.bin/id/t_groups tests-usr.bin-tests atf
./usr/tests/usr.bin/id/t_id tests-usr.bin-tests atf
./usr/tests/usr.bin/id/t_whoami tests-usr.bin-tests atf
+./usr/tests/usr.bin/jottests-usr.bin-tests
+./usr/tests/usr.bin/jot/Atffile tests-usr.bin-tests atf
+./usr/tests/usr.bin/jot/d_basic.out tests-usr.bin-tests atf
+./usr/tests/usr.bin/jot/t_jot tests-usr.bin-tests atf
./usr/tests/usr.bin/m4tests-usr.bin-tests
./usr/tests/usr.bin/m4/Atffile tests-usr.bin-tests atf
./usr/tests/usr.bin/m4/d_ff_after_dnl.m4.uue tests-usr.bin-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.68 src/etc/mtree/NetBSD.dist.tests:1.69
--- src/etc/mtree/NetBSD.dist.tests:1.68 Mon Mar 19 11:16:37 2012
+++ src/etc/mtree/NetBSD.dist.tests Tue Mar 20 06:18:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.68 2012/03/19 11:16:37 njoly Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.69 2012/03/20 06:18:34 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -281,6 +281,7 @@
./usr/tests/usr.bin/grep
./usr/tests/usr.bin/gzip
./usr/tests/usr.bin/id
+./usr/tests/usr.bin/jot
./usr/tests/usr.bin/m4
./usr/tests/usr.bin/make
./usr/tests/usr.bin/mkdep
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.12 src/tests/usr.bin/Makefile:1.13
--- src/tests/usr.bin/Makefile:1.12 Mon Mar 19 07:05:18 2012
+++ src/tests/usr.bin/Makefile Tue Mar 20 06:18:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/03/19 07:05:18 jruoho Exp $
+# $NetBSD: Makefile,v 1.13 2012/03/20 06:18:33 jruoho Exp $
#
.include bsd.own.mk
@@ -6,7 +6,7 @@
TESTSDIR= ${TESTSBASE}/usr.bin
TESTS_SUBDIRS= awk basename bzip2 cc cmp config cut \
- diff dirname find grep gzip id m4 make mkdep \
+ diff dirname find grep gzip id jot m4 make mkdep \
pr rump_server shmif_dumpbus sdiff sed sort unifdef xlint
.include bsd.test.mk
Added files:
Index: src/tests/usr.bin/jot/Makefile
diff -u /dev/null src/tests/usr.bin/jot/Makefile:1.1
--- /dev/null Tue Mar 20 06:18:34 2012
+++ src/tests/usr.bin/jot/Makefile Tue Mar 20 06:18:34 2012
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/20 06:18:34 jruoho Exp $
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/usr.bin/jot
+TESTS_SH= t_jot
+
+.include bsd.test.mk
Index: src/tests/usr.bin/jot/d_basic.out
diff -u /dev/null src/tests/usr.bin/jot/d_basic.out:1.1
--- /dev/null Tue Mar 20 06:18:34 2012
+++ src/tests/usr.bin/jot/d_basic.out Tue Mar 20 06:18:34 2012
@@ -0,0 +1,21 @@
+-1.00
+-0.90
+-0.80
+-0.70
+-0.60
+-0.50
+-0.40
+-0.30
+-0.20
+-0.10
+-0.00
+0.10
+0.20
+0.30
+0.40
+0.50
+0.60
+0.70
+0.80
+0.90
+1.00
Index: src/tests/usr.bin/jot/t_jot.sh
diff -u /dev/null src/tests/usr.bin/jot/t_jot.sh:1.1
--- /dev/null Tue Mar 20 06:18:34 2012
+++ src/tests/usr.bin/jot/t_jot.sh Tue Mar 20 06:18:34 2012
@@ -0,0 +1,56 @@
+# $NetBSD: t_jot.sh,v 1.1 2012/03/20 06:18:34 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE
CVS commit: src/tests/bin/expr
Module Name:src
Committed By: jruoho
Date: Tue Mar 20 06:30:02 UTC 2012
Modified Files:
src/tests/bin/expr: t_expr.sh
Log Message:
Note PR bin/12838.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/expr/t_expr.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/expr/t_expr.sh
diff -u src/tests/bin/expr/t_expr.sh:1.1 src/tests/bin/expr/t_expr.sh:1.2
--- src/tests/bin/expr/t_expr.sh:1.1 Sat Mar 17 16:33:11 2012
+++ src/tests/bin/expr/t_expr.sh Tue Mar 20 06:30:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_expr.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+# $NetBSD: t_expr.sh,v 1.2 2012/03/20 06:30:02 jruoho Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -149,10 +149,11 @@ compare_ops_body() {
atf_test_case multiply
multiply_head() {
- atf_set descr Test the multiply operator
+ atf_set descr Test the multiply operator (PR bin/12838)
}
multiply_body() {
test_expr '1 \* -1' '-1'
+ test_expr '2 \ 1 \* 17' '0'
}
atf_test_case negative
CVS commit: src/external/lgpl3/gmp
Module Name:src Committed By: mrg Date: Tue Mar 20 08:21:40 UTC 2012 Modified Files: src/external/lgpl3/gmp: README src/external/lgpl3/gmp/lib/libgmp/arch/alpha: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/arm: config.h src/external/lgpl3/gmp/lib/libgmp/arch/armeb: config.h src/external/lgpl3/gmp/lib/libgmp/arch/hppa: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/m68000: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/m68k: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mips64el: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mipseb: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mipsel: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64: config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3el: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sparc: config.h Log Message: remove references to my src/obj trees, and make a note about avoiding this in the future / should automate it too. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/gmp/README cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/gmp.h cvs rdiff -u -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/arm/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.h cvs rdiff -u -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/hppa/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/hppa/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/m68000/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/m68000/gmp.h cvs rdiff -u -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/m68k/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/m68k/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/gmp.h cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/config.m4 cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/sparc/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/README diff -u src/external/lgpl3/gmp/README:1.2 src/external/lgpl3/gmp/README:1.3 --- src/external/lgpl3/gmp/README:1.2 Wed Jun 29 01:38:27 2011 +++ src/external/lgpl3/gmp/README Tue Mar 20 08:21:38 2012 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.2 2011/06/29 01:38:27 simonb Exp $ +$NetBSD: README,v 1.3 2012/03/20 08:21:38 mrg Exp $ GMP in NetBSD. We need GMP for GCC = 4.2. @@ -22,6 +22,11 @@ There are a few steps to this: gmp.h mp.h + some of these files might have src/obj references. in particular + fix GMP_MPARAM_H_SUGGEST to start from ./mpn/... and make sure + we #define __GMP_CC to gcc -std=gnu99. XXX make this automatic + + - parse the ./configure output and note all created symlinks for mpn. these need to be converted into a new Makefile.inc. there is a script in this subdir build-gmp-Makefile.inc.awk Index: src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.h:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.h:1.1 Thu Jul 7 02:06:32 2011 +++ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.h Tue Mar 20 08:21:38 2012 @@ -27,7 +27,7 @@ along with the GNU MP Library. If not, /* The gmp-mparam.h file (a string) the tune program should suggest updating. */ -#define GMP_MPARAM_H_SUGGEST /usr/src3/external/lgpl3/gmp/dist/mpn/alpha/gmp-mparam.h +#define GMP_MPARAM_H_SUGGEST ./mpn/alpha/gmp-mparam.h /* Define to 1 if you have the `alarm'
CVS commit: src/lib/libc/net
Module Name:src
Committed By: kardel
Date: Tue Mar 20 10:34:33 UTC 2012
Modified Files:
src/lib/libc/net: getaddrinfo.c
Log Message:
PR 46206: fix programmed SIGSEGV
more work is needed as tests seem to indicate that name resolution now
does no seem to work (firefox reports Server not found)
thanks to Ryo ONODERA for testing.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/lib/libc/net/getaddrinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.98 src/lib/libc/net/getaddrinfo.c:1.99
--- src/lib/libc/net/getaddrinfo.c:1.98 Sat Mar 17 21:56:40 2012
+++ src/lib/libc/net/getaddrinfo.c Tue Mar 20 10:34:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.98 2012/03/17 21:56:40 christos Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.99 2012/03/20 10:34:33 kardel Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: getaddrinfo.c,v 1.98 2012/03/17 21:56:40 christos Exp $);
+__RCSID($NetBSD: getaddrinfo.c,v 1.99 2012/03/20 10:34:33 kardel Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -1032,7 +1032,7 @@ addrconfig(uint64_t *mask)
if (getifaddrs(ifaddrs) == -1)
return -1;
- mask = 0;
+ *mask = 0;
for (ifa = ifaddrs; ifa != NULL; ifa = ifa-ifa_next)
if (ifa-ifa_addr (ifa-ifa_flags IFF_UP)) {
_DIAGASSERT(ifa-ifa_addr-sa_family 64);
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src
Committed By: he
Date: Tue Mar 20 10:40:48 UTC 2012
Modified Files:
src/lib/libc/arch/m68k/gen: fpfake.c
Log Message:
Sprinkle some /* ARGSUSED */ before the dummy functions to appease lint.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/m68k/gen/fpfake.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/m68k/gen/fpfake.c
diff -u src/lib/libc/arch/m68k/gen/fpfake.c:1.1 src/lib/libc/arch/m68k/gen/fpfake.c:1.2
--- src/lib/libc/arch/m68k/gen/fpfake.c:1.1 Sat Nov 28 23:46:38 2009
+++ src/lib/libc/arch/m68k/gen/fpfake.c Tue Mar 20 10:40:48 2012
@@ -18,18 +18,21 @@ fpgetsticky(void)
return 0;
}
+/* ARGSUSED */
fp_except
fpsetmask(fp_except mask)
{
return 0;
}
+/* ARGSUSED */
fp_rnd
fpsetround(fp_rnd rnd_dir)
{
return 0;
}
+/* ARGSUSED */
fp_except
fpsetsticky(fp_except sticky)
{
CVS commit: src/lib/libc/arch/mips/gen
Module Name:src Committed By: he Date: Tue Mar 20 10:51:24 UTC 2012 Modified Files: src/lib/libc/arch/mips/gen: fpgetmask.c fpgetsticky.c fpsetmask.c fpsetsticky.c Log Message: Cast to unsigned int before doing shift operations, to appease lint. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/mips/gen/fpgetmask.c \ src/lib/libc/arch/mips/gen/fpgetsticky.c \ src/lib/libc/arch/mips/gen/fpsetmask.c \ src/lib/libc/arch/mips/gen/fpsetsticky.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/fpgetmask.c diff -u src/lib/libc/arch/mips/gen/fpgetmask.c:1.6 src/lib/libc/arch/mips/gen/fpgetmask.c:1.7 --- src/lib/libc/arch/mips/gen/fpgetmask.c:1.6 Mon Mar 19 22:23:10 2012 +++ src/lib/libc/arch/mips/gen/fpgetmask.c Tue Mar 20 10:51:23 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fpgetmask.c,v 1.6 2012/03/19 22:23:10 matt Exp $ */ +/* $NetBSD: fpgetmask.c,v 1.7 2012/03/20 10:51:23 he Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 @@ -7,7 +7,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: fpgetmask.c,v 1.6 2012/03/19 22:23:10 matt Exp $); +__RCSID($NetBSD: fpgetmask.c,v 1.7 2012/03/20 10:51:23 he Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -24,5 +24,5 @@ fpgetmask(void) fp_except x; __asm(cfc1 %0,$31 : =r (x)); - return (x 7) 0x1f; + return ((unsigned int)x 7) 0x1f; } Index: src/lib/libc/arch/mips/gen/fpgetsticky.c diff -u src/lib/libc/arch/mips/gen/fpgetsticky.c:1.6 src/lib/libc/arch/mips/gen/fpgetsticky.c:1.7 --- src/lib/libc/arch/mips/gen/fpgetsticky.c:1.6 Mon Mar 19 22:23:10 2012 +++ src/lib/libc/arch/mips/gen/fpgetsticky.c Tue Mar 20 10:51:24 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fpgetsticky.c,v 1.6 2012/03/19 22:23:10 matt Exp $ */ +/* $NetBSD: fpgetsticky.c,v 1.7 2012/03/20 10:51:24 he Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 @@ -7,7 +7,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: fpgetsticky.c,v 1.6 2012/03/19 22:23:10 matt Exp $); +__RCSID($NetBSD: fpgetsticky.c,v 1.7 2012/03/20 10:51:24 he Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -24,5 +24,5 @@ fpgetsticky(void) fp_except x; __asm(cfc1 %0,$31 : =r (x)); - return (x 2) 0x1f; + return ((unsigned int)x 2) 0x1f; } Index: src/lib/libc/arch/mips/gen/fpsetmask.c diff -u src/lib/libc/arch/mips/gen/fpsetmask.c:1.6 src/lib/libc/arch/mips/gen/fpsetmask.c:1.7 --- src/lib/libc/arch/mips/gen/fpsetmask.c:1.6 Mon Mar 19 22:23:10 2012 +++ src/lib/libc/arch/mips/gen/fpsetmask.c Tue Mar 20 10:51:24 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fpsetmask.c,v 1.6 2012/03/19 22:23:10 matt Exp $ */ +/* $NetBSD: fpsetmask.c,v 1.7 2012/03/20 10:51:24 he Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 @@ -7,7 +7,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: fpsetmask.c,v 1.6 2012/03/19 22:23:10 matt Exp $); +__RCSID($NetBSD: fpsetmask.c,v 1.7 2012/03/20 10:51:24 he Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -31,5 +31,5 @@ fpsetmask(fp_except mask) __asm(ctc1 %0,$31 : : r (new)); - return (old 7) 0x1f; + return ((unsigned int)old 7) 0x1f; } Index: src/lib/libc/arch/mips/gen/fpsetsticky.c diff -u src/lib/libc/arch/mips/gen/fpsetsticky.c:1.6 src/lib/libc/arch/mips/gen/fpsetsticky.c:1.7 --- src/lib/libc/arch/mips/gen/fpsetsticky.c:1.6 Mon Mar 19 22:23:10 2012 +++ src/lib/libc/arch/mips/gen/fpsetsticky.c Tue Mar 20 10:51:24 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fpsetsticky.c,v 1.6 2012/03/19 22:23:10 matt Exp $ */ +/* $NetBSD: fpsetsticky.c,v 1.7 2012/03/20 10:51:24 he Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 @@ -7,7 +7,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: fpsetsticky.c,v 1.6 2012/03/19 22:23:10 matt Exp $); +__RCSID($NetBSD: fpsetsticky.c,v 1.7 2012/03/20 10:51:24 he Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -31,5 +31,5 @@ fpsetsticky(fp_except sticky) __asm(ctc1 %0,$31 : : r (new)); - return (old 2) 0x1f; + return ((unsigned int)old 2) 0x1f; }
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: nonaka Date: Tue Mar 20 11:28:04 UTC 2012 Modified Files: src/sys/arch/mips/include: ecoff_machdep.h Log Message: fix build failure on mipsel. /usr/src/lib/libc/gen/nlist_ecoff.c(112): warning: constant in conditional context [161] To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/include/ecoff_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/ecoff_machdep.h diff -u src/sys/arch/mips/include/ecoff_machdep.h:1.20 src/sys/arch/mips/include/ecoff_machdep.h:1.21 --- src/sys/arch/mips/include/ecoff_machdep.h:1.20 Thu Dec 10 14:13:51 2009 +++ src/sys/arch/mips/include/ecoff_machdep.h Tue Mar 20 11:28:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ecoff_machdep.h,v 1.20 2009/12/10 14:13:51 matt Exp $ */ +/* $NetBSD: ecoff_machdep.h,v 1.21 2012/03/20 11:28:04 nonaka Exp $ */ /* * Copyright (c) 1997 Jonathan Stone @@ -46,7 +46,7 @@ #include mips/cpu.h /* mips CPU architecture levels */ #define _MIPS3_OK() CPUISMIPS3 #else -#define _MIPS3_OK() 1 +#define _MIPS3_OK() /*CONSTCOND*/1 #endif
CVS commit: src/lib/libc/net
Module Name:src
Committed By: kardel
Date: Tue Mar 20 12:04:01 UTC 2012
Modified Files:
src/lib/libc/net: getaddrinfo.c
Log Message:
PR pkg/46206
re-establish fqdn lookup when AI_ADDRCONFIG is used in hints
AI_ADDRCONFIG led to fqdn lookup being skipped as the systems didn't
configure any PF_UNSPEC addresses - check was too strict here.
Thnaks to Ryo ONODERA for testing.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/lib/libc/net/getaddrinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.99 src/lib/libc/net/getaddrinfo.c:1.100
--- src/lib/libc/net/getaddrinfo.c:1.99 Tue Mar 20 10:34:33 2012
+++ src/lib/libc/net/getaddrinfo.c Tue Mar 20 12:04:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.99 2012/03/20 10:34:33 kardel Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.100 2012/03/20 12:04:01 kardel Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: getaddrinfo.c,v 1.99 2012/03/20 10:34:33 kardel Exp $);
+__RCSID($NetBSD: getaddrinfo.c,v 1.100 2012/03/20 12:04:01 kardel Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -503,8 +503,11 @@ getaddrinfo(const char *hostname, const
for (ex = explore; ex-e_af = 0; ex++) {
*pai = ai0;
+
/* ADDRCONFIG check */
- if uint64_t)1 ex-e_af) mask) == 0)
+ /* PF_UNSPEC entries are prepared for DNS queries only */
+ if (ex-e_af != PF_UNSPEC
+ (((uint64_t)1 ex-e_af) mask) == 0)
continue;
/* require exact match for family field */
CVS commit: src/sys/arch/x68k/stand/boot
Module Name:src
Committed By: minoura
Date: Tue Mar 20 12:37:01 UTC 2012
Modified Files:
src/sys/arch/x68k/stand/boot: Makefile boot.c
Log Message:
Be silent.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x68k/stand/boot/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/stand/boot/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot/Makefile
diff -u src/sys/arch/x68k/stand/boot/Makefile:1.21 src/sys/arch/x68k/stand/boot/Makefile:1.22
--- src/sys/arch/x68k/stand/boot/Makefile:1.21 Sun Dec 25 06:09:09 2011
+++ src/sys/arch/x68k/stand/boot/Makefile Tue Mar 20 12:37:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/12/25 06:09:09 tsutsui Exp $
+# $NetBSD: Makefile,v 1.22 2012/03/20 12:37:01 minoura Exp $
NOMAN= # defined
@@ -32,7 +32,7 @@ SRCS+= vers.c
CLEANFILES+= vers.c
vers.c: ${VERSIONFILE}
${_MKTARGET_CREATE}
- ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
+ ${HOST_SH} ${S}/conf/newvers_stand.sh \
${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
CPPFLAGS+= -nostdinc -I$S -I${.OBJDIR} -I$M/stand/libsa
Index: src/sys/arch/x68k/stand/boot/boot.c
diff -u src/sys/arch/x68k/stand/boot/boot.c:1.17 src/sys/arch/x68k/stand/boot/boot.c:1.18
--- src/sys/arch/x68k/stand/boot/boot.c:1.17 Sun Dec 25 06:09:09 2011
+++ src/sys/arch/x68k/stand/boot/boot.c Tue Mar 20 12:37:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.17 2011/12/25 06:09:09 tsutsui Exp $ */
+/* $NetBSD: boot.c,v 1.18 2012/03/20 12:37:01 minoura Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@@ -124,8 +124,10 @@ doboot(const char *file, int flags)
printf(XXX: unknown corruption in /boot.\n);
}
+#ifdef DEBUG
printf(dev = %x, unit = %d, part = %c, name = %s\n,
dev, unit, part + 'a', name);
+#endif
if (dev == 0) { /* SCSI */
dev = X68K_MAKESCSIBOOTDEV(X68K_MAJOR_SD,
@@ -135,6 +137,7 @@ doboot(const char *file, int flags)
} else {
dev = X68K_MAKEBOOTDEV(X68K_MAJOR_FD, unit 3, 0);
}
+#ifdef DEBUG
printf(boot device = %x\n, dev);
printf(if = %d, unit = %d, id = %d, lun = %d, part = %c\n,
B_X68K_SCSI_IF(dev),
@@ -142,9 +145,12 @@ doboot(const char *file, int flags)
B_X68K_SCSI_ID(dev),
B_X68K_SCSI_LUN(dev),
B_X68K_SCSI_PART(dev) + 'a');
+#endif
p = ((short*) marks[MARK_ENTRY]) - 1;
+#ifdef DEBUG
printf(Kernel Version: 0x%x\n, *p);
+#endif
if (*p != 0x4e73 *p != 0) {
/*
* XXX temporary solution; compatibility loader
CVS commit: src/sys/arch/x68k/stand/boot
Module Name:src Committed By: minoura Date: Tue Mar 20 12:37:35 UTC 2012 Modified Files: src/sys/arch/x68k/stand/boot: boot.ldscript Log Message: Comment fix. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/boot/boot.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x68k/stand/boot/boot.ldscript diff -u src/sys/arch/x68k/stand/boot/boot.ldscript:1.2 src/sys/arch/x68k/stand/boot/boot.ldscript:1.3 --- src/sys/arch/x68k/stand/boot/boot.ldscript:1.2 Thu Oct 30 22:21:56 2003 +++ src/sys/arch/x68k/stand/boot/boot.ldscript Tue Mar 20 12:37:34 2012 @@ -1,4 +1,4 @@ -/* /boot must be a.out, OMAGIC starting from 0x8000. */ +/* /boot must be a.out, OMAGIC starting from 0x6000. */ OUTPUT_FORMAT(a.out-m68k-netbsd, a.out-m68k-netbsd, a.out-m68k-netbsd) OUTPUT_ARCH(m68k)
CVS commit: src/sys/arch/x68k/stand/boot
Module Name:src
Committed By: minoura
Date: Tue Mar 20 12:38:33 UTC 2012
Modified Files:
src/sys/arch/x68k/stand/boot: conf.c version
Log Message:
Add FFSv2 support.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x68k/stand/boot/conf.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/boot/version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot/conf.c
diff -u src/sys/arch/x68k/stand/boot/conf.c:1.8 src/sys/arch/x68k/stand/boot/conf.c:1.9
--- src/sys/arch/x68k/stand/boot/conf.c:1.8 Sun Dec 11 12:19:44 2005
+++ src/sys/arch/x68k/stand/boot/conf.c Tue Mar 20 12:38:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.8 2005/12/11 12:19:44 christos Exp $ */
+/* $NetBSD: conf.c,v 1.9 2012/03/20 12:38:33 minoura Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@@ -52,7 +52,8 @@ const struct devspec devspec[] = {
};
struct fs_ops file_system[] = {
- FS_OPS(ufs),
+ FS_OPS(ffsv1),
+ FS_OPS(ffsv2),
FS_OPS(lfsv1),
FS_OPS(lfsv2),
FS_OPS(cd9660),
Index: src/sys/arch/x68k/stand/boot/version
diff -u src/sys/arch/x68k/stand/boot/version:1.4 src/sys/arch/x68k/stand/boot/version:1.5
--- src/sys/arch/x68k/stand/boot/version:1.4 Thu Oct 13 11:35:37 2011
+++ src/sys/arch/x68k/stand/boot/version Tue Mar 20 12:38:33 2012
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.4 2011/10/13 11:35:37 tsutsui Exp $
+$NetBSD: version,v 1.5 2012/03/20 12:38:33 minoura Exp $
NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this
file is important - make sure the entries are appended on end, last item
@@ -9,3 +9,4 @@ is taken as the current.
1.1: loadfile() update to avoid backwards seeks for ELF Program Headers.
1.2: Fix serial console output.
1.3: Avoid exception on 68060 in UFS ops.
+1.4: ffsv2 support.
CVS commit: src/sys/arch/x68k/stand/libsa
Module Name:src
Committed By: minoura
Date: Tue Mar 20 12:38:53 UTC 2012
Modified Files:
src/sys/arch/x68k/stand/libsa: sdcd.c
Log Message:
Fix CD support.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x68k/stand/libsa/sdcd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/libsa/sdcd.c
diff -u src/sys/arch/x68k/stand/libsa/sdcd.c:1.11 src/sys/arch/x68k/stand/libsa/sdcd.c:1.12
--- src/sys/arch/x68k/stand/libsa/sdcd.c:1.11 Sun Jul 17 20:54:49 2011
+++ src/sys/arch/x68k/stand/libsa/sdcd.c Tue Mar 20 12:38:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdcd.c,v 1.11 2011/07/17 20:54:49 joerg Exp $ */
+/* $NetBSD: sdcd.c,v 1.12 2012/03/20 12:38:53 minoura Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -67,7 +67,7 @@ check_unit(int id)
}
{
- struct iocs_inquiry *inqdata = buffer;
+ struct iocs_inquiry *inqdata= buffer;
error = IOCS_S_INQUIRY(100, id, inqdata);
if (error 0) { /* WHY??? */
@@ -75,6 +75,7 @@ check_unit(int id)
goto out;
}
if ((inqdata-unit != 0) /* direct */
+ (inqdata-unit != 5) /* cdrom */
(inqdata-unit != 7)) { /* optical */
error = EUNIT;
goto out;
@@ -327,7 +328,7 @@ cdopen(struct open_file *f, ...)
if (id 0 || id 7)
return ENXIO;
- if (part == 0 || part == 2)
+ if (part != 0 part != 2)
return ENXIO;
if (current_id != id) {
error = check_unit(id);
@@ -341,6 +342,8 @@ cdopen(struct open_file *f, ...)
sc-sc_partinfo.size = current_devsize;
sc-sc_blocksize = current_blklen 9;
f-f_devdata = sc;
+ current_id = id;
+
return 0;
}
@@ -358,6 +361,7 @@ cdstrategy(void *arg, int rw, daddr_t db
{
struct sdcd_softc *sc = arg;
- return sdstrategy(arg, rw, dblk * DEV_BSIZE / sc-sc_blocksize,
+ /* cast dblk to avoid divdi3; 32bit is enough even for BD-ROMs. */
+ return sdstrategy(arg, rw, (unsigned int) dblk / sc-sc_blocksize,
size, buf, rsize);
}
CVS commit: src/sys/arch/x68k/stand/xxboot
Module Name:src
Committed By: minoura
Date: Tue Mar 20 13:01:33 UTC 2012
Added Files:
src/sys/arch/x68k/stand/xxboot: Makefile Makefile.xxboot boot.S
bootmain.c conf.c consio1.c version xx.c xxboot.ldscript
src/sys/arch/x68k/stand/xxboot/cdboot_cd9660: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2: Makefile
Log Message:
Initial support for xxboot (cdboot_cd9660, specifically).
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.15 src/sys/arch/x68k/stand/xxboot/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot \
src/sys/arch/x68k/stand/xxboot/boot.S \
src/sys/arch/x68k/stand/xxboot/bootmain.c \
src/sys/arch/x68k/stand/xxboot/conf.c \
src/sys/arch/x68k/stand/xxboot/consio1.c \
src/sys/arch/x68k/stand/xxboot/version \
src/sys/arch/x68k/stand/xxboot/xx.c \
src/sys/arch/x68k/stand/xxboot/xxboot.ldscript
cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/x68k/stand/xxboot/Makefile
diff -u /dev/null src/sys/arch/x68k/stand/xxboot/Makefile:1.15
--- /dev/null Tue Mar 20 13:01:33 2012
+++ src/sys/arch/x68k/stand/xxboot/Makefile Tue Mar 20 13:01:32 2012
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.15 2012/03/20 13:01:32 minoura Exp $
+
+SUBDIR= cdboot_cd9660 xxboot_ffsv1 xxboot_ffsv2 xxboot_lfsv1 xxboot_lfsv2
+
+.include bsd.subdir.mk
Index: src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
diff -u /dev/null src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.1
--- /dev/null Tue Mar 20 13:01:33 2012
+++ src/sys/arch/x68k/stand/xxboot/Makefile.xxboot Tue Mar 20 13:01:32 2012
@@ -0,0 +1,116 @@
+# $NetBSD: Makefile.xxboot,v 1.1 2012/03/20 13:01:32 minoura Exp $
+
+NOMAN= # defined
+
+.include bsd.own.mk
+
+BOOT= $(DEV)boot_$(FS)
+VERSIONFILE= ${.CURDIR}/../version
+VERSION!= ${TOOL_AWK} -F: '$$1 ~ /^[0-9.]*$$/ { it = $$1; } \
+ END { print it }' ${VERSIONFILE}
+NEWVERSWHAT= ${BOOT}
+
+# text and bss addresses in hex
+TEXT= 0f # Primary (me)
+TEXTDATASIZE= 2000 # 8KB for UFS at maximum
+ # 30KB (=(16-1)*2048) for ISO9660 at max.
+BOOT_TEXT= 006000 # Secondary (/boot)
+
+PROG= $(BOOT)
+BINDIR= /usr/mdec
+STRIPFLAG=
+BINMODE= 444
+
+S= ${.CURDIR}/../../../../..
+M= $S/arch/x68k
+.PATH: ${.CURDIR}/..
+SRCS= boot.S bootmain.c conf.c consio1.c $(DEVDRV).c
+
+SRCS+= vers.c
+CLEANFILES+= vers.c
+vers.c: ${VERSIONFILE}
+ ${_MKTARGET_CREATE}
+ ${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
+
+CFLAGS= -Os -fomit-frame-pointer
+#CFLAGS+= -Wall
+CPPFLAGS+= -D_STANDALONE
+CPPFLAGS+= -DTEXTADDR=0x$(TEXT) -DBOOT_TEXTADDR=0x$(BOOT_TEXT)
+CPPFLAGS+= -DTDSIZE=0x$(TEXTDATASIZE)
+CPPFLAGS+= -DPROG=\$(PROG)\ -DBOOT_VERS=\$(VERSION)\
+CPPFLAGS+= -DBOOT_STAGE1 $(BOOTCPPFLAGS)
+CPPFLAGS+= -nostdinc -I${.OBJDIR} -I${S}
+CPPFLAGS+= -I$M/stand/libiocs -I$M/stand/libsa -I$M/stand/common
+AFLAGS= ${CFLAGS:M-[ID]*}
+.if ${OBJECT_FMT} == ELF
+LINKFLAGS= -n -Bstatic -T ${.CURDIR}/../xxboot.ldscript -M
+LINKFLAGS+= -noinhibit-exec # XXX
+.else
+LINKFLAGS= -n -Bstatic -Ttext ${TEXT} -M
+OBJCOPY?= objcopy
+.endif
+LIBIOCS!= cd $M/stand/libiocs ${PRINTOBJDIR}
+LIBSA!= cd $M/stand/libsa ${PRINTOBJDIR}
+LDLIBS= -L${LIBSA}/lib/sa -lsa -L ${LIBSA}/lib/kern -lkern
+LDLIBS+= -L${LIBIOCS} -liocs
+
+.PATH: $S/lib/libsa
+CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=$(FS)
+CPPFLAGS+= -DLIBSA_SINGLE_DEVICE=$(DEV)
+CPPFLAGS+= -DLIBSA_NO_TWIDDLE -DLIBSA_NO_FD_CHECKING -DLIBSA_NO_RAW_ACCESS -DLIBSA_NO_FS_WRITE
+SRCS+= open.c close.c read.c lseek.c loadfile.c loadfile_aout.c alloc.c
+SRCS+= $(FS).c
+
+.PATH: $M/stand/common
+SRCS+= exec_image.S
+
+.include ${.CURDIR}/../../Makefile.booters
+
+CLEANFILES+= ${PROG}.x $(PROG).map ${PROG}
+
+
+${PROG}: $(OBJS)
+ ${_MKTARGET_LINK}
+ $(LD) $(LINKFLAGS) -o ${PROG} $(OBJS) $(LDLIBS) $(PROG).map
+ @grep first_kbyte $(PROG).map
+.if ${OBJECT_FMT} == ELF
+ @if [ `(echo ibase=16; \
+ ${TOOL_SED} -n \
+ 's/^.*0x\([0-9a-f]*\).* first_kbyte$$/\1-$(TEXT)-400/p'\
+ $(PROG).map | \
+ tr a-f A-F) | bc` -gt 0 ]; \
+ then echo '$(BOOT): first_kbyte exceeds the first killobyte'; \
+ rm $(PROG) ; exit 1; \
+ fi
+ @if [ `(echo ibase=16; \
+ ${TOOL_SED} -n \
+ 's/^.*0x\([0-9a-f]*\).* _edata *= *\.$$/\1-$(TEXT)-$(TEXTDATASIZE)/p' \
+
CVS commit: src/sys/arch/x68k/include
Module Name:src Committed By: minoura Date: Tue Mar 20 13:03:33 UTC 2012 Modified Files: src/sys/arch/x68k/include: loadfile_machdep.h Log Message: Add xxboot (stage1) support. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/include/loadfile_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x68k/include/loadfile_machdep.h diff -u src/sys/arch/x68k/include/loadfile_machdep.h:1.6 src/sys/arch/x68k/include/loadfile_machdep.h:1.7 --- src/sys/arch/x68k/include/loadfile_machdep.h:1.6 Mon Apr 28 20:23:40 2008 +++ src/sys/arch/x68k/include/loadfile_machdep.h Tue Mar 20 13:03:33 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_machdep.h,v 1.6 2008/04/28 20:23:40 martin Exp $ */ +/* $NetBSD: loadfile_machdep.h,v 1.7 2012/03/20 13:03:33 minoura Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -33,13 +33,16 @@ #define _X68K_LOADFILE_MACHDEP_H_ #define BOOT_AOUT +#ifndef BOOT_STAGE1 #define BOOT_ELF32 +#endif #define LOAD_KERNEL LOAD_ALL #define COUNT_KERNEL COUNT_ALL #ifdef _STANDALONE +#ifndef BOOT_STAGE1 #define LOADADDR(a) ((a) + offset) #define ALIGNENTRY(a) 0 #define READ(f, b, c) pread((f), (void *)LOADADDR(b), (c)) @@ -51,7 +54,19 @@ #define PROGRESS(a) (void) printf a #define ALLOC(a) alloc(a) #define DEALLOC(a, b) dealloc(a, b) -#define OKMAGIC(a) ((a) == NMAGIC) +#define OKMAGIC(a) (((a) == NMAGIC) || ((a) == OMAGIC)) +#else +#define LOADADDR(a) ((a) + offset) +#define ALIGNENTRY(a) 0 +#define READ(f, b, c) pread((f), (void *)LOADADDR(b), (c)) +#define BCOPY(s, d, c) vpbcopy((s), (void *)LOADADDR(d), (c)) +#define BZERO(d, c) pbzero((void *)LOADADDR(d), (c)) +#define WARN(a) /* nothing */ +#define PROGRESS(a) /* nothing */ +#define ALLOC(a) alloc(a) +#define DEALLOC(a, b) dealloc(a, b) +#define OKMAGIC(a) (((a) == NMAGIC) || ((a) == OMAGIC)) +#endif #define vpbcopy bcopy #define pbzero bzero
CVS commit: src/lib/libc/arch/mips/gen
Module Name:src Committed By: matt Date: Tue Mar 20 16:19:56 UTC 2012 Modified Files: src/lib/libc/arch/mips/gen: fpgetmask.c fpgetsticky.c fpsetmask.c fpsetsticky.c Log Message: Revert unneeded casts. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/mips/gen/fpgetmask.c \ src/lib/libc/arch/mips/gen/fpgetsticky.c \ src/lib/libc/arch/mips/gen/fpsetmask.c \ src/lib/libc/arch/mips/gen/fpsetsticky.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/fpgetmask.c diff -u src/lib/libc/arch/mips/gen/fpgetmask.c:1.7 src/lib/libc/arch/mips/gen/fpgetmask.c:1.8 --- src/lib/libc/arch/mips/gen/fpgetmask.c:1.7 Tue Mar 20 10:51:23 2012 +++ src/lib/libc/arch/mips/gen/fpgetmask.c Tue Mar 20 16:19:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fpgetmask.c,v 1.7 2012/03/20 10:51:23 he Exp $ */ +/* $NetBSD: fpgetmask.c,v 1.8 2012/03/20 16:19:56 matt Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 @@ -7,7 +7,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: fpgetmask.c,v 1.7 2012/03/20 10:51:23 he Exp $); +__RCSID($NetBSD: fpgetmask.c,v 1.8 2012/03/20 16:19:56 matt Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -24,5 +24,5 @@ fpgetmask(void) fp_except x; __asm(cfc1 %0,$31 : =r (x)); - return ((unsigned int)x 7) 0x1f; + return (x 7) 0x1f; } Index: src/lib/libc/arch/mips/gen/fpgetsticky.c diff -u src/lib/libc/arch/mips/gen/fpgetsticky.c:1.7 src/lib/libc/arch/mips/gen/fpgetsticky.c:1.8 --- src/lib/libc/arch/mips/gen/fpgetsticky.c:1.7 Tue Mar 20 10:51:24 2012 +++ src/lib/libc/arch/mips/gen/fpgetsticky.c Tue Mar 20 16:19:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fpgetsticky.c,v 1.7 2012/03/20 10:51:24 he Exp $ */ +/* $NetBSD: fpgetsticky.c,v 1.8 2012/03/20 16:19:56 matt Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 @@ -7,7 +7,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: fpgetsticky.c,v 1.7 2012/03/20 10:51:24 he Exp $); +__RCSID($NetBSD: fpgetsticky.c,v 1.8 2012/03/20 16:19:56 matt Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -24,5 +24,5 @@ fpgetsticky(void) fp_except x; __asm(cfc1 %0,$31 : =r (x)); - return ((unsigned int)x 2) 0x1f; + return (x 2) 0x1f; } Index: src/lib/libc/arch/mips/gen/fpsetmask.c diff -u src/lib/libc/arch/mips/gen/fpsetmask.c:1.7 src/lib/libc/arch/mips/gen/fpsetmask.c:1.8 --- src/lib/libc/arch/mips/gen/fpsetmask.c:1.7 Tue Mar 20 10:51:24 2012 +++ src/lib/libc/arch/mips/gen/fpsetmask.c Tue Mar 20 16:19:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fpsetmask.c,v 1.7 2012/03/20 10:51:24 he Exp $ */ +/* $NetBSD: fpsetmask.c,v 1.8 2012/03/20 16:19:56 matt Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 @@ -7,7 +7,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: fpsetmask.c,v 1.7 2012/03/20 10:51:24 he Exp $); +__RCSID($NetBSD: fpsetmask.c,v 1.8 2012/03/20 16:19:56 matt Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -31,5 +31,5 @@ fpsetmask(fp_except mask) __asm(ctc1 %0,$31 : : r (new)); - return ((unsigned int)old 7) 0x1f; + return (old 7) 0x1f; } Index: src/lib/libc/arch/mips/gen/fpsetsticky.c diff -u src/lib/libc/arch/mips/gen/fpsetsticky.c:1.7 src/lib/libc/arch/mips/gen/fpsetsticky.c:1.8 --- src/lib/libc/arch/mips/gen/fpsetsticky.c:1.7 Tue Mar 20 10:51:24 2012 +++ src/lib/libc/arch/mips/gen/fpsetsticky.c Tue Mar 20 16:19:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fpsetsticky.c,v 1.7 2012/03/20 10:51:24 he Exp $ */ +/* $NetBSD: fpsetsticky.c,v 1.8 2012/03/20 16:19:56 matt Exp $ */ /* * Written by J.T. Conklin, Apr 11, 1995 @@ -7,7 +7,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: fpsetsticky.c,v 1.7 2012/03/20 10:51:24 he Exp $); +__RCSID($NetBSD: fpsetsticky.c,v 1.8 2012/03/20 16:19:56 matt Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -31,5 +31,5 @@ fpsetsticky(fp_except sticky) __asm(ctc1 %0,$31 : : r (new)); - return ((unsigned int)old 2) 0x1f; + return (old 2) 0x1f; }
CVS commit: src/common/lib/libc
Module Name:src
Committed By: matt
Date: Tue Mar 20 16:21:41 UTC 2012
Modified Files:
src/common/lib/libc/gmon: mcount.c
src/common/lib/libc/md: md4c.c md5c.c
src/common/lib/libc/quad: qdivrem.c quad.h
Log Message:
Remove __P usage.
Convert to C89 prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/common/lib/libc/gmon/mcount.c
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/md/md4c.c \
src/common/lib/libc/md/md5c.c
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/quad/qdivrem.c
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/quad/quad.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gmon/mcount.c
diff -u src/common/lib/libc/gmon/mcount.c:1.9 src/common/lib/libc/gmon/mcount.c:1.10
--- src/common/lib/libc/gmon/mcount.c:1.9 Sat Mar 17 21:40:21 2012
+++ src/common/lib/libc/gmon/mcount.c Tue Mar 20 16:21:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mcount.c,v 1.9 2012/03/17 21:40:21 martin Exp $ */
+/* $NetBSD: mcount.c,v 1.10 2012/03/20 16:21:41 matt Exp $ */
/*
* Copyright (c) 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
#if 0
static char sccsid[] = @(#)mcount.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: mcount.c,v 1.9 2012/03/17 21:40:21 martin Exp $);
+__RCSID($NetBSD: mcount.c,v 1.10 2012/03/20 16:21:41 matt Exp $);
#endif
#endif
@@ -94,7 +94,7 @@ struct gmonparam *_m_gmon_alloc(void);
#endif
#ifndef __LINT__
-_MCOUNT_DECL __P((u_long, u_long))
+_MCOUNT_DECL(u_long, u_long)
#ifdef _KERNEL
__attribute__((__no_instrument_function__))
#endif
@@ -127,8 +127,8 @@ _MCOUNT_DECL __P((u_long, u_long))
* perform this optimization.
*/
#ifndef __LINT__
-_MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
- u_long frompc, selfpc;
+/* _mcount; may be static, inline, etc */
+_MCOUNT_DECL(u_long frompc, u_long selfpc)
{
u_short *frompcindex;
struct tostruct *top, *prevtop;
Index: src/common/lib/libc/md/md4c.c
diff -u src/common/lib/libc/md/md4c.c:1.4 src/common/lib/libc/md/md4c.c:1.5
--- src/common/lib/libc/md/md4c.c:1.4 Mon Mar 16 05:59:21 2009
+++ src/common/lib/libc/md/md4c.c Tue Mar 20 16:21:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md4c.c,v 1.4 2009/03/16 05:59:21 cegger Exp $ */
+/* $NetBSD: md4c.c,v 1.5 2012/03/20 16:21:41 matt Exp $ */
/*
* This file is derived from the RSA Data Security, Inc. MD4 Message-Digest
@@ -31,7 +31,7 @@
#if !defined(_KERNEL) !defined(_STANDALONE)
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: md4c.c,v 1.4 2009/03/16 05:59:21 cegger Exp $);
+__RCSID($NetBSD: md4c.c,v 1.5 2012/03/20 16:21:41 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -76,10 +76,10 @@ typedef uint32_t UINT4;
#define S33 11
#define S34 15
-static void MD4Transform __P((UINT4 [4], const unsigned char [64]));
+static void MD4Transform(UINT4 [4], const unsigned char [64]);
-static void Encode __P((unsigned char *, UINT4 *, unsigned int));
-static void Decode __P((UINT4 *, const unsigned char *, unsigned int));
+static void Encode(unsigned char *, UINT4 *, unsigned int);
+static void Decode(UINT4 *, const unsigned char *, unsigned int);
static const unsigned char PADDING[64] = {
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Index: src/common/lib/libc/md/md5c.c
diff -u src/common/lib/libc/md/md5c.c:1.4 src/common/lib/libc/md/md5c.c:1.5
--- src/common/lib/libc/md/md5c.c:1.4 Mon Mar 16 05:59:21 2009
+++ src/common/lib/libc/md/md5c.c Tue Mar 20 16:21:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md5c.c,v 1.4 2009/03/16 05:59:21 cegger Exp $ */
+/* $NetBSD: md5c.c,v 1.5 2012/03/20 16:21:41 matt Exp $ */
/*
* This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
@@ -36,7 +36,7 @@
#else
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: md5c.c,v 1.4 2009/03/16 05:59:21 cegger Exp $);
+__RCSID($NetBSD: md5c.c,v 1.5 2012/03/20 16:21:41 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
#include sys/types.h
@@ -84,10 +84,10 @@ __weak_alias(MD5Final,_MD5Final)
__weak_alias(MD5Transform,_MD5Transform)
#endif
-static void MD5Transform __P((UINT4 [4], const unsigned char [64]));
+static void MD5Transform(UINT4 [4], const unsigned char [64]);
-static void Encode __P((unsigned char *, UINT4 *, unsigned int));
-static void Decode __P((UINT4 *, const unsigned char *, unsigned int));
+static void Encode(unsigned char *, UINT4 *, unsigned int);
+static void Decode(UINT4 *, const unsigned char *, unsigned int);
/*
* Encodes input (UINT4) into output (unsigned char). Assumes len is
Index: src/common/lib/libc/quad/qdivrem.c
diff -u src/common/lib/libc/quad/qdivrem.c:1.3 src/common/lib/libc/quad/qdivrem.c:1.4
--- src/common/lib/libc/quad/qdivrem.c:1.3 Fri Mar 9 15:41:16 2012
+++ src/common/lib/libc/quad/qdivrem.c Tue Mar 20 16:21:41 2012
@@ -1,4
CVS commit: src/lib/libc/yp
Module Name:src
Committed By: matt
Date: Tue Mar 20 16:30:26 UTC 2012
Modified Files:
src/lib/libc/yp: local.h xdryp.c yp_match.c yplib.c
Log Message:
Convert to use C89 prototypes.
Remove use of __P
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/yp/local.h
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/yp/xdryp.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/yp/yp_match.c
cvs rdiff -u -r1.44 -r1.45 src/lib/libc/yp/yplib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/yp/local.h
diff -u src/lib/libc/yp/local.h:1.3 src/lib/libc/yp/local.h:1.4
--- src/lib/libc/yp/local.h:1.3 Wed Oct 21 01:07:46 2009
+++ src/lib/libc/yp/local.h Tue Mar 20 16:30:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: local.h,v 1.3 2009/10/21 01:07:46 snj Exp $ */
+/* $NetBSD: local.h,v 1.4 2012/03/20 16:30:26 matt Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -25,6 +25,6 @@
*/
__BEGIN_DECLS
-void __yp_unbind __P((struct dom_binding *));
-int _yp_invalid_domain __P((const char *));
+void __yp_unbind(struct dom_binding *);
+int _yp_invalid_domain(const char *);
__END_DECLS
Index: src/lib/libc/yp/xdryp.c
diff -u src/lib/libc/yp/xdryp.c:1.31 src/lib/libc/yp/xdryp.c:1.32
--- src/lib/libc/yp/xdryp.c:1.31 Tue Mar 13 21:13:49 2012
+++ src/lib/libc/yp/xdryp.c Tue Mar 20 16:30:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: xdryp.c,v 1.31 2012/03/13 21:13:49 christos Exp $ */
+/* $NetBSD: xdryp.c,v 1.32 2012/03/20 16:30:26 matt Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe thor...@netbsd.org.
@@ -61,7 +61,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: xdryp.c,v 1.31 2012/03/13 21:13:49 christos Exp $);
+__RCSID($NetBSD: xdryp.c,v 1.32 2012/03/20 16:30:26 matt Exp $);
#endif
/*
@@ -115,10 +115,10 @@ __weak_alias(xdr_ypresp_val,_xdr_ypresp_
/*
* Functions used only within this file.
*/
-static bool_t xdr_ypbind_binding __P((XDR *, struct ypbind_binding *));
-static bool_t xdr_ypbind_resptype __P((XDR *, enum ypbind_resptype *));
-static bool_t xdr_ypstat __P((XDR *, enum ypbind_resptype *));
-static bool_t xdr_ypmaplist_str __P((XDR *, char *));
+static bool_t xdr_ypbind_binding(XDR *, struct ypbind_binding *);
+static bool_t xdr_ypbind_resptype(XDR *, enum ypbind_resptype *);
+static bool_t xdr_ypstat(XDR *, enum ypbind_resptype *);
+static bool_t xdr_ypmaplist_str(XDR *, char *);
__warn_references(xdr_domainname,
warning: this program uses xdr_domainname(), which is deprecated and buggy.)
Index: src/lib/libc/yp/yp_match.c
diff -u src/lib/libc/yp/yp_match.c:1.18 src/lib/libc/yp/yp_match.c:1.19
--- src/lib/libc/yp/yp_match.c:1.18 Fri Mar 2 17:27:49 2012
+++ src/lib/libc/yp/yp_match.c Tue Mar 20 16:30:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: yp_match.c,v 1.18 2012/03/02 17:27:49 christos Exp $ */
+/* $NetBSD: yp_match.c,v 1.19 2012/03/20 16:30:26 matt Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt dera...@fsa.ca
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: yp_match.c,v 1.18 2012/03/02 17:27:49 christos Exp $);
+__RCSID($NetBSD: yp_match.c,v 1.19 2012/03/20 16:30:26 matt Exp $);
#endif
#include namespace.h
@@ -65,17 +65,12 @@ static struct ypmatch_ent {
time_t expire_t;
} *ypmc;
-static bool_t ypmatch_add __P((const char *, const char *, int, char *, int));
-static bool_t ypmatch_find __P((const char *, const char *, int, const char **,
-int *));
+static bool_t ypmatch_add(const char *, const char *, int, char *, int);
+static bool_t ypmatch_find(const char *, const char *, int, const char **,
+int *);
static bool_t
-ypmatch_add(map, key, keylen, val, vallen)
- const char *map;
- const char *key;
- int keylen;
- char *val;
- int vallen;
+ypmatch_add(const char *map, const char *key, int keylen, char *val, int vallen)
{
struct ypmatch_ent *ep;
time_t t;
@@ -138,12 +133,8 @@ ypmatch_add(map, key, keylen, val, valle
}
static bool_t
-ypmatch_find(map, key, keylen, val, vallen)
- const char *map;
- const char *key;
- int keylen;
- const char**val;
- int*vallen;
+ypmatch_find(const char *map, const char *key, int keylen, const char **val,
+ int *vallen)
{
struct ypmatch_ent *ep;
time_t t;
@@ -176,13 +167,8 @@ ypmatch_find(map, key, keylen, val, vall
#endif
int
-yp_match(indomain, inmap, inkey, inkeylen, outval, outvallen)
- const char *indomain;
- const char *inmap;
- const char *inkey;
- int inkeylen;
- char **outval;
- int*outvallen;
+yp_match(const char *indomain, const char *inmap, const char *inkey,
+ int inkeylen, char **outval, int *outvallen)
{
struct dom_binding *ysd;
struct ypresp_val yprv;
Index: src/lib/libc/yp/yplib.c
diff -u src/lib/libc/yp/yplib.c:1.44
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: matt
Date: Tue Mar 20 16:36:05 UTC 2012
Modified Files:
src/lib/libc/gen: _sysconf.c disklabel.c fmtmsg.c ftok.c getmntinfo.c
getnetgrent.c nlist.c nlist_elf32.c nlist_private.h
pthread_atfork.c pw_private.h setmode.c sysctl.c uname.c wait.c
wait3.c
Log Message:
Use C89 definitions.
Remove use of __P
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/gen/_sysconf.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libc/gen/disklabel.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/gen/fmtmsg.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/gen/ftok.c src/lib/libc/gen/uname.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/gen/getmntinfo.c
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/gen/getnetgrent.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/gen/nlist.c
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/gen/nlist_elf32.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/nlist_private.h
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/gen/pthread_atfork.c \
src/lib/libc/gen/wait.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/pw_private.h
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/gen/setmode.c \
src/lib/libc/gen/sysctl.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gen/wait3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/_sysconf.c
diff -u src/lib/libc/gen/_sysconf.c:1.5 src/lib/libc/gen/_sysconf.c:1.6
--- src/lib/libc/gen/_sysconf.c:1.5 Wed Oct 21 01:07:45 2009
+++ src/lib/libc/gen/_sysconf.c Tue Mar 20 16:36:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: _sysconf.c,v 1.5 2009/10/21 01:07:45 snj Exp $ */
+/* $NetBSD: _sysconf.c,v 1.6 2012/03/20 16:36:04 matt Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -26,7 +26,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: _sysconf.c,v 1.5 2009/10/21 01:07:45 snj Exp $);
+__RCSID($NetBSD: _sysconf.c,v 1.6 2012/03/20 16:36:04 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#if defined(__indr_reference)
@@ -34,11 +34,10 @@ __indr_reference(__sysconf, sysconf)
#else
#include unistd.h
-long __sysconf __P((int)); /* XXX */
+long __sysconf(int); /* XXX */
long
-sysconf(name)
- int name;
+sysconf(int name)
{
return __sysconf(name);
Index: src/lib/libc/gen/disklabel.c
diff -u src/lib/libc/gen/disklabel.c:1.35 src/lib/libc/gen/disklabel.c:1.36
--- src/lib/libc/gen/disklabel.c:1.35 Tue Mar 13 21:13:34 2012
+++ src/lib/libc/gen/disklabel.c Tue Mar 20 16:36:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.35 2012/03/13 21:13:34 christos Exp $ */
+/* $NetBSD: disklabel.c,v 1.36 2012/03/20 16:36:05 matt Exp $ */
/*
* Copyright (c) 1983, 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = @(#)disklabel.c 8.2 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: disklabel.c,v 1.35 2012/03/13 21:13:34 christos Exp $);
+__RCSID($NetBSD: disklabel.c,v 1.36 2012/03/20 16:36:05 matt Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,9 +71,9 @@ __weak_alias(getdiskbyname,_getdiskbynam
#endif
#if 0
-static void error __P((int));
+static void error(int);
#endif
-static int gettype __P((char *, const char *const *));
+static int gettype(char *, const char *const *);
static const char *db_array[2] = { _PATH_DISKTAB, 0 };
@@ -208,9 +208,7 @@ getdiskbyname(name)
}
static int
-gettype(t, names)
- char *t;
- const char *const *names;
+gettype(char *t, const char *const *names)
{
const char *const *nm;
Index: src/lib/libc/gen/fmtmsg.c
diff -u src/lib/libc/gen/fmtmsg.c:1.4 src/lib/libc/gen/fmtmsg.c:1.5
--- src/lib/libc/gen/fmtmsg.c:1.4 Mon Apr 28 20:22:59 2008
+++ src/lib/libc/gen/fmtmsg.c Tue Mar 20 16:36:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fmtmsg.c,v 1.4 2008/04/28 20:22:59 martin Exp $ */
+/* $NetBSD: fmtmsg.c,v 1.5 2012/03/20 16:36:05 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fmtmsg.c,v 1.4 2008/04/28 20:22:59 martin Exp $);
+__RCSID($NetBSD: fmtmsg.c,v 1.5 2012/03/20 16:36:05 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include fmtmsg.h
@@ -40,11 +40,11 @@ __RCSID($NetBSD: fmtmsg.c,v 1.4 2008/04
#include stdlib.h
#include string.h
-static unsigned int msgverb __P((const char *));
-static const char * severity2str __P((int));
-static int writeit __P((FILE *, unsigned int, const char *,
+static unsigned int msgverb(const char *);
+static const char * severity2str(int);
+static int writeit(FILE *, unsigned int, const char *,
const char *, const char *, const char *,
- const char *));
+ const char *);
#define MM_VERBLABEL 0x01U
#define MM_VERBSEVERITY 0x02U
@@ -74,8 +74,7 @@ static const size_t nkeywords = sizeof (
* keywords.
*/
static unsigned int
-msgverb(str)
- const char *str;
+msgverb(const char *str)
{
u_int i;
unsigned int result;
@@ -107,7 +106,7 @@
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: matt
Date: Tue Mar 20 16:38:45 UTC 2012
Modified Files:
src/lib/libc/stdlib: lsearch.c twalk.c
Log Message:
Remove use of __P
Switch to using C89 definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/stdlib/lsearch.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/stdlib/twalk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/lsearch.c
diff -u src/lib/libc/stdlib/lsearch.c:1.5 src/lib/libc/stdlib/lsearch.c:1.6
--- src/lib/libc/stdlib/lsearch.c:1.5 Wed May 18 19:36:36 2011
+++ src/lib/libc/stdlib/lsearch.c Tue Mar 20 16:38:44 2012
@@ -35,7 +35,7 @@
#if 0
static char sccsid[] = @(#)lsearch.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: lsearch.c,v 1.5 2011/05/18 19:36:36 dsl Exp $);
+__RCSID($NetBSD: lsearch.c,v 1.6 2012/03/20 16:38:44 matt Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -80,12 +80,8 @@ lfind(key, base, nelp, width, compar)
}
static void *
-linear_base(key, base, nelp, width, compar, add_flag)
- const void *key;
- void *base;
- size_t *nelp, width;
- cmp_fn_t compar;
- int add_flag;
+linear_base(const void *key, void *base, size_t *nelp, size_t width,
+ cmp_fn_t compar, int add_flag)
{
char *element, *end;
Index: src/lib/libc/stdlib/twalk.c
diff -u src/lib/libc/stdlib/twalk.c:1.3 src/lib/libc/stdlib/twalk.c:1.4
--- src/lib/libc/stdlib/twalk.c:1.3 Wed May 18 19:36:36 2011
+++ src/lib/libc/stdlib/twalk.c Tue Mar 20 16:38:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: twalk.c,v 1.3 2011/05/18 19:36:36 dsl Exp $ */
+/* $NetBSD: twalk.c,v 1.4 2012/03/20 16:38:45 matt Exp $ */
/*
* Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -13,7 +13,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: twalk.c,v 1.3 2011/05/18 19:36:36 dsl Exp $);
+__RCSID($NetBSD: twalk.c,v 1.4 2012/03/20 16:38:45 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include assert.h
@@ -21,15 +21,12 @@ __RCSID($NetBSD: twalk.c,v 1.3 2011/05/
#include search.h
#include stdlib.h
-static void trecurse(const node_t *,
-void (*action)(const void *, VISIT, int), int level);
+typedef void (*cmp_fn_t)(const void *, VISIT, int);
/* Walk the nodes of a tree */
static void
-trecurse(root, action, level)
- const node_t *root; /* Root of the tree to be walked */
- void (*action)(const void *, VISIT, int);
- int level;
+trecurse(const node_t *root, /* Root of the tree to be walked */
+ cmp_fn_t action, int level)
{
_DIAGASSERT(root != NULL);
_DIAGASSERT(action != NULL);
@@ -49,9 +46,7 @@ trecurse(root, action, level)
/* Walk the nodes of a tree */
void
-twalk(vroot, action)
- const void *vroot; /* Root of the tree to be walked */
- void (*action)(const void *, VISIT, int);
+twalk(const void *vroot, cmp_fn_t action) /* Root of the tree to be walked */
{
if (vroot != NULL action != NULL)
trecurse(vroot, action, 0);
CVS commit: src/lib/libc/time
Module Name:src
Committed By: matt
Date: Tue Mar 20 16:39:08 UTC 2012
Modified Files:
src/lib/libc/time: difftime.c localtime.c strftime.c
Log Message:
Remove use of __P
Switch to using C89 definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/time/difftime.c
cvs rdiff -u -r1.66 -r1.67 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/time/strftime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/difftime.c
diff -u src/lib/libc/time/difftime.c:1.10 src/lib/libc/time/difftime.c:1.11
--- src/lib/libc/time/difftime.c:1.10 Thu Dec 31 22:49:16 2009
+++ src/lib/libc/time/difftime.c Tue Mar 20 16:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: difftime.c,v 1.10 2009/12/31 22:49:16 mlelstv Exp $ */
+/* $NetBSD: difftime.c,v 1.11 2012/03/20 16:39:08 matt Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
#if 0
static char elsieid[] = @(#)difftime.c 8.1;
#else
-__RCSID($NetBSD: difftime.c,v 1.10 2009/12/31 22:49:16 mlelstv Exp $);
+__RCSID($NetBSD: difftime.c,v 1.11 2012/03/20 16:39:08 matt Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -19,9 +19,7 @@ __RCSID($NetBSD: difftime.c,v 1.10 2009
#include private.h /* for time_t, TYPE_INTEGRAL, and TYPE_SIGNED */
double
-difftime(time1, time0)
-const time_t time1;
-const time_t time0;
+difftime(const time_t time1, const time_t time0)
{
/*
** If (sizeof (double) sizeof (time_t)) simply convert and subtract
Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.66 src/lib/libc/time/localtime.c:1.67
--- src/lib/libc/time/localtime.c:1.66 Tue Mar 13 21:13:48 2012
+++ src/lib/libc/time/localtime.c Tue Mar 20 16:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.66 2012/03/13 21:13:48 christos Exp $ */
+/* $NetBSD: localtime.c,v 1.67 2012/03/20 16:39:08 matt Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
#if 0
static char elsieid[] = @(#)localtime.c 8.17;
#else
-__RCSID($NetBSD: localtime.c,v 1.66 2012/03/13 21:13:48 christos Exp $);
+__RCSID($NetBSD: localtime.c,v 1.67 2012/03/20 16:39:08 matt Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -659,8 +659,7 @@ static const int year_lengths[2] = {
*/
static const char *
-getzname(strp)
-const char * strp;
+getzname(const char *strp)
{
char c;
@@ -697,11 +696,7 @@ getqzname(const char *strp, const int de
*/
static const char *
-getnum(strp, nump, min, max)
-const char * strp;
-int * const nump;
-const int min;
-const int max;
+getnum(const char *strp, int * const nump, const int min, const int max)
{
char c;
int num;
Index: src/lib/libc/time/strftime.c
diff -u src/lib/libc/time/strftime.c:1.21 src/lib/libc/time/strftime.c:1.22
--- src/lib/libc/time/strftime.c:1.21 Thu Dec 16 18:38:07 2010
+++ src/lib/libc/time/strftime.c Tue Mar 20 16:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: strftime.c,v 1.21 2010/12/16 18:38:07 christos Exp $ */
+/* $NetBSD: strftime.c,v 1.22 2012/03/20 16:39:08 matt Exp $ */
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
@@ -6,7 +6,7 @@
static char elsieid[] = @(#)strftime.c 7.64;
static char elsieid[] = @(#)strftime.c 8.3;
#else
-__RCSID($NetBSD: strftime.c,v 1.21 2010/12/16 18:38:07 christos Exp $);
+__RCSID($NetBSD: strftime.c,v 1.22 2012/03/20 16:39:08 matt Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -585,11 +585,8 @@ strftime(char * const s, const size_t ma
}
static char *
-_conv(n, format, pt, ptlim)
-const int n;
-const char * const format;
-char * const pt;
-const char * const ptlim;
+_conv(const int n, const char * const format, char * const pt,
+const char * const ptlim)
{
char buf[INT_STRLEN_MAXIMUM(int) + 1];
@@ -598,10 +595,7 @@ const char * const ptlim;
}
static char *
-_add(str, pt, ptlim)
-const char * str;
-char * pt;
-const char * const ptlim;
+_add(const char *str, char *pt, const char * const ptlim)
{
while (pt ptlim (*pt = *str++) != '\0')
++pt;
@@ -617,13 +611,8 @@ const char * const ptlim;
*/
static char *
-_yconv(a, b, convert_top, convert_yy, pt, ptlim)
-const int a;
-const int b;
-const int convert_top;
-const int convert_yy;
-char * pt;
-const char * const ptlim;
+_yconv(const int a, const int b, const int convert_top, const int convert_yy,
+char *pt, const char * const ptlim)
{
register int lead;
register int trail;
CVS commit: src/lib/libc/hash/md2
Module Name:src
Committed By: matt
Date: Tue Mar 20 17:06:43 UTC 2012
Modified Files:
src/lib/libc/hash/md2: md2.c
Log Message:
Use C89 definition.
u_int*_t - uint*_t
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/hash/md2/md2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/hash/md2/md2.c
diff -u src/lib/libc/hash/md2/md2.c:1.5 src/lib/libc/hash/md2/md2.c:1.6
--- src/lib/libc/hash/md2/md2.c:1.5 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/hash/md2/md2.c Tue Mar 20 17:06:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md2.c,v 1.5 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: md2.c,v 1.6 2012/03/20 17:06:43 matt Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: md2.c,v 1.5 2008/04/28 20:23:00 martin Exp $);
+__RCSID($NetBSD: md2.c,v 1.6 2012/03/20 17:06:43 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -168,10 +168,9 @@ MD2Final(digest, context)
}
/*static*/ void
-MD2Transform(context)
- MD2_CTX *context;
+MD2Transform(MD2_CTX *context)
{
- u_int32_t l, j, k, t;
+ uint32_t l, j, k, t;
/* set block 3 and update checksum */
for (l = context-C[15], j = 0; j 16; j++) {
CVS commit: src/lib/libc/inet
Module Name:src
Committed By: matt
Date: Tue Mar 20 17:08:13 UTC 2012
Modified Files:
src/lib/libc/inet: inet_cidr_pton.c inet_net_ntop.c inet_net_pton.c
inet_ntop.c
Log Message:
Use C89 definitions
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/inet/inet_cidr_pton.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/inet/inet_net_ntop.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/inet/inet_net_pton.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/inet/inet_ntop.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/inet/inet_cidr_pton.c
diff -u src/lib/libc/inet/inet_cidr_pton.c:1.7 src/lib/libc/inet/inet_cidr_pton.c:1.8
--- src/lib/libc/inet/inet_cidr_pton.c:1.7 Tue Mar 13 21:13:38 2012
+++ src/lib/libc/inet/inet_cidr_pton.c Tue Mar 20 17:08:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: inet_cidr_pton.c,v 1.7 2012/03/13 21:13:38 christos Exp $ */
+/* $NetBSD: inet_cidr_pton.c,v 1.8 2012/03/20 17:08:13 matt Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. (ISC)
@@ -22,7 +22,7 @@
#if 0
static const char rcsid[] = Id: inet_cidr_pton.c,v 1.6 2005/04/27 04:56:19 sra Exp;
#else
-__RCSID($NetBSD: inet_cidr_pton.c,v 1.7 2012/03/13 21:13:38 christos Exp $);
+__RCSID($NetBSD: inet_cidr_pton.c,v 1.8 2012/03/20 17:08:13 matt Exp $);
#endif
#endif
@@ -55,10 +55,9 @@ __RCSID($NetBSD: inet_cidr_pton.c,v 1.7
__weak_alias(inet_cidr_pton,_inet_cidr_pton)
#endif
-static int inet_cidr_pton_ipv4 __P((const char *src, u_char *dst,
- int *bits, int ipv6));
-static int inet_cidr_pton_ipv6 __P((const char *src, u_char *dst,
- int *bits));
+static int inet_cidr_pton_ipv4(const char *src, u_char *dst,
+ int *bits, int ipv6);
+static int inet_cidr_pton_ipv6(const char *src, u_char *dst, int *bits);
static int getbits(const char *, int ipv6);
Index: src/lib/libc/inet/inet_net_ntop.c
diff -u src/lib/libc/inet/inet_net_ntop.c:1.2 src/lib/libc/inet/inet_net_ntop.c:1.3
--- src/lib/libc/inet/inet_net_ntop.c:1.2 Sat Feb 7 07:25:22 2009
+++ src/lib/libc/inet/inet_net_ntop.c Tue Mar 20 17:08:13 2012
@@ -20,7 +20,7 @@
#ifdef notdef
static const char rcsid[] = Id: inet_net_ntop.c,v 1.1.2.1 2002/08/02 02:17:21 marka Exp ;
#else
-__RCSID($NetBSD: inet_net_ntop.c,v 1.2 2009/02/07 07:25:22 lukem Exp $);
+__RCSID($NetBSD: inet_net_ntop.c,v 1.3 2012/03/20 17:08:13 matt Exp $);
#endif
#endif
@@ -49,10 +49,10 @@ __weak_alias(inet_net_ntop,_inet_net_nto
# define SPRINTF(x) sprintf x
#endif
-static char * inet_net_ntop_ipv4 __P((const u_char *src, int bits,
- char *dst, size_t size));
-static char * inet_net_ntop_ipv6 __P((const u_char *src, int bits,
- char *dst, size_t size));
+static char * inet_net_ntop_ipv4(const u_char *src, int bits,
+ char *dst, size_t size);
+static char * inet_net_ntop_ipv6(const u_char *src, int bits,
+ char *dst, size_t size);
/*
* char *
@@ -65,12 +65,7 @@ static char * inet_net_ntop_ipv6 __P((co
* Paul Vixie (ISC), July 1996
*/
char *
-inet_net_ntop(af, src, bits, dst, size)
- int af;
- const void *src;
- int bits;
- char *dst;
- size_t size;
+inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size)
{
switch (af) {
case AF_INET:
@@ -97,11 +92,7 @@ inet_net_ntop(af, src, bits, dst, size)
* Paul Vixie (ISC), July 1996
*/
static char *
-inet_net_ntop_ipv4(src, bits, dst, size)
- const u_char *src;
- int bits;
- char *dst;
- size_t size;
+inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
{
char *odst = dst;
char *t;
@@ -176,7 +167,8 @@ inet_net_ntop_ipv4(src, bits, dst, size)
*/
static char *
-inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) {
+inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
+{
u_int m;
int b;
size_t p;
Index: src/lib/libc/inet/inet_net_pton.c
diff -u src/lib/libc/inet/inet_net_pton.c:1.3 src/lib/libc/inet/inet_net_pton.c:1.4
--- src/lib/libc/inet/inet_net_pton.c:1.3 Tue Mar 13 21:13:38 2012
+++ src/lib/libc/inet/inet_net_pton.c Tue Mar 20 17:08:13 2012
@@ -20,7 +20,7 @@
#if 0
static const char rcsid[] = Id: inet_net_pton.c,v 1.4.2.1 2002/08/02 02:17:21 marka Exp ;
#else
-__RCSID($NetBSD: inet_net_pton.c,v 1.3 2012/03/13 21:13:38 christos Exp $);
+__RCSID($NetBSD: inet_net_pton.c,v 1.4 2012/03/20 17:08:13 matt Exp $);
#endif
#endif
@@ -71,7 +71,8 @@ __weak_alias(inet_net_pton,_inet_net_pto
* Paul Vixie (ISC), June 1996
*/
static int
-inet_net_pton_ipv4( const char *src, u_char *dst, size_t size) {
+inet_net_pton_ipv4(const char *src, u_char *dst, size_t size)
+{
static const char xdigits[] = 0123456789abcdef;
static const char digits[] = 0123456789;
int ch, dirty, bits;
@@ -197,7 +198,8 @@ inet_net_pton_ipv4( const char *src, u_c
}
static int
-getbits(const char *src, int *bitsp) {
+getbits(const char *src, int *bitsp)
+{
static const char digits[] =
CVS commit: src/lib/libc
Module Name:src
Committed By: matt
Date: Tue Mar 20 17:44:18 UTC 2012
Modified Files:
src/lib/libc/isc: ev_timers.c
src/lib/libc/locale: current_locale.c
src/lib/libc/net: ethers.c getnameinfo.c getnetent.c hesiod.c ip6opt.c
iso_addr.c linkaddr.c nslexer.l nsparser.y recv.c send.c
sethostent.c sockatmark.c
src/lib/libc/nls: catopen.c
src/lib/libc/resolv: res_init.c res_send.c
src/lib/libc/string: __strsignal.c
Log Message:
Use C89 Prototypes.
Remove use of __P
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/isc/ev_timers.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/locale/current_locale.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/net/ethers.c
cvs rdiff -u -r1.51 -r1.52 src/lib/libc/net/getnameinfo.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/net/getnetent.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/net/hesiod.c
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/net/ip6opt.c \
src/lib/libc/net/iso_addr.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/net/linkaddr.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/net/nslexer.l \
src/lib/libc/net/nsparser.y
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/net/recv.c src/lib/libc/net/send.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/net/sethostent.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/net/sockatmark.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/nls/catopen.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/resolv/res_init.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/resolv/res_send.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/string/__strsignal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/isc/ev_timers.c
diff -u src/lib/libc/isc/ev_timers.c:1.9 src/lib/libc/isc/ev_timers.c:1.10
--- src/lib/libc/isc/ev_timers.c:1.9 Tue Mar 13 21:13:38 2012
+++ src/lib/libc/isc/ev_timers.c Tue Mar 20 17:44:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ev_timers.c,v 1.9 2012/03/13 21:13:38 christos Exp $ */
+/* $NetBSD: ev_timers.c,v 1.10 2012/03/20 17:44:17 matt Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. (ISC)
@@ -26,7 +26,7 @@
#ifdef notdef
static const char rcsid[] = Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp;
#else
-__RCSID($NetBSD: ev_timers.c,v 1.9 2012/03/13 21:13:38 christos Exp $);
+__RCSID($NetBSD: ev_timers.c,v 1.10 2012/03/20 17:44:17 matt Exp $);
#endif
#endif
@@ -120,7 +120,8 @@ evCmpTime(struct timespec a, struct time
}
struct timespec
-evNowTime() {
+evNowTime(void)
+{
struct timeval now;
#ifdef CLOCK_REALTIME
struct timespec tsnow;
Index: src/lib/libc/locale/current_locale.c
diff -u src/lib/libc/locale/current_locale.c:1.2 src/lib/libc/locale/current_locale.c:1.3
--- src/lib/libc/locale/current_locale.c:1.2 Sun Jan 11 02:46:28 2009
+++ src/lib/libc/locale/current_locale.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: current_locale.c,v 1.2 2009/01/11 02:46:28 christos Exp $ */
+/* $NetBSD: current_locale.c,v 1.3 2012/03/20 17:44:18 matt Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: current_locale.c,v 1.2 2009/01/11 02:46:28 christos Exp $);
+__RCSID($NetBSD: current_locale.c,v 1.3 2012/03/20 17:44:18 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include sys/cdefs.h
@@ -43,7 +43,7 @@ __RCSID($NetBSD: current_locale.c,v 1.2
static struct _locale_impl_t *__current_locale = _global_locale;
struct _locale_impl_t **
-_current_locale()
+_current_locale(void)
{
return __current_locale;
}
Index: src/lib/libc/net/ethers.c
diff -u src/lib/libc/net/ethers.c:1.22 src/lib/libc/net/ethers.c:1.23
--- src/lib/libc/net/ethers.c:1.22 Tue Mar 13 21:13:40 2012
+++ src/lib/libc/net/ethers.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ethers.c,v 1.22 2012/03/13 21:13:40 christos Exp $ */
+/* $NetBSD: ethers.c,v 1.23 2012/03/20 17:44:18 matt Exp $ */
/*
* ethers(3N) a la Sun.
@@ -9,7 +9,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: ethers.c,v 1.22 2012/03/13 21:13:40 christos Exp $);
+__RCSID($NetBSD: ethers.c,v 1.23 2012/03/20 17:44:18 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -44,8 +44,7 @@ __weak_alias(ether_ntohost,_ether_ntohos
#endif
char *
-ether_ntoa(e)
- const struct ether_addr *e;
+ether_ntoa(const struct ether_addr *e)
{
static char a[18];
@@ -59,8 +58,7 @@ ether_ntoa(e)
}
struct ether_addr *
-ether_aton(s)
- const char *s;
+ether_aton(const char *s)
{
static struct ether_addr n;
u_int i[6];
@@ -81,9 +79,7 @@ ether_aton(s)
}
int
-ether_ntohost(hostname, e)
- char *hostname;
- const struct ether_addr *e;
+ether_ntohost(char *hostname, const struct ether_addr *e)
{
FILE *f;
char *p;
@@ -143,9 +139,7 @@ ether_ntohost(hostname, e)
}
int
-ether_hostton(hostname, e)
- const char *hostname;
- struct ether_addr *e;
CVS commit: src/tests/fs/vfs
Module Name:src Committed By: njoly Date: Tue Mar 20 18:20:49 UTC 2012 Modified Files: src/tests/fs/vfs: t_io.c t_vnops.c Log Message: Remove unneeded atf_tc_expect_pass calls. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/fs/vfs/t_io.c cvs rdiff -u -r1.32 -r1.33 src/tests/fs/vfs/t_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/vfs/t_io.c diff -u src/tests/fs/vfs/t_io.c:1.9 src/tests/fs/vfs/t_io.c:1.10 --- src/tests/fs/vfs/t_io.c:1.9 Tue Mar 20 05:21:45 2012 +++ src/tests/fs/vfs/t_io.c Tue Mar 20 18:20:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: t_io.c,v 1.9 2012/03/20 05:21:45 jruoho Exp $ */ +/* $NetBSD: t_io.c,v 1.10 2012/03/20 18:20:49 njoly Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -89,7 +89,6 @@ extendbody(const atf_tc_t *tc, off_t see RL(rump_sys_ftruncate(fd, seekcnt)); RL(rump_sys_fstat(fd, sb)); ATF_REQUIRE_EQ(sb.st_size, seekcnt); - atf_tc_expect_pass(); ATF_REQUIRE_EQ(rump_sys_write(fd, TESTSTR, TESTSZ), TESTSZ); ATF_REQUIRE_EQ(rump_sys_pread(fd, buf, TESTSZ, seekcnt), TESTSZ); Index: src/tests/fs/vfs/t_vnops.c diff -u src/tests/fs/vfs/t_vnops.c:1.32 src/tests/fs/vfs/t_vnops.c:1.33 --- src/tests/fs/vfs/t_vnops.c:1.32 Mon Mar 19 03:33:54 2012 +++ src/tests/fs/vfs/t_vnops.c Tue Mar 20 18:20:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: t_vnops.c,v 1.32 2012/03/19 03:33:54 pgoyette Exp $ */ +/* $NetBSD: t_vnops.c,v 1.33 2012/03/20 18:20:49 njoly Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -317,7 +317,6 @@ rename_dotdot(const atf_tc_t *tc, const if (rump_sys_rename(dir1/.., sometarget) != -1 || errno != EINVAL) atf_tc_fail_errno(self-dotdot from); - atf_tc_expect_pass(); if (rump_sys_rename(dir1, dir2/..) != -1 || errno != EINVAL) atf_tc_fail(other-dotdot);
CVS commit: src/bin
Module Name:src
Committed By: matt
Date: Tue Mar 20 18:42:29 UTC 2012
Modified Files:
src/bin/pax: ar_io.c ftree.c options.c tar.c
src/bin/ps: print.c
src/bin/sh: arith.y arith_lex.l exec.c histedit.c nodes.c.pat options.c
redir.c
Log Message:
Use C89 function definitions
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/bin/pax/ar_io.c
cvs rdiff -u -r1.40 -r1.41 src/bin/pax/ftree.c
cvs rdiff -u -r1.112 -r1.113 src/bin/pax/options.c
cvs rdiff -u -r1.68 -r1.69 src/bin/pax/tar.c
cvs rdiff -u -r1.119 -r1.120 src/bin/ps/print.c
cvs rdiff -u -r1.21 -r1.22 src/bin/sh/arith.y
cvs rdiff -u -r1.15 -r1.16 src/bin/sh/arith_lex.l
cvs rdiff -u -r1.42 -r1.43 src/bin/sh/exec.c src/bin/sh/options.c
cvs rdiff -u -r1.44 -r1.45 src/bin/sh/histedit.c
cvs rdiff -u -r1.12 -r1.13 src/bin/sh/nodes.c.pat
cvs rdiff -u -r1.32 -r1.33 src/bin/sh/redir.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/pax/ar_io.c
diff -u src/bin/pax/ar_io.c:1.53 src/bin/pax/ar_io.c:1.54
--- src/bin/pax/ar_io.c:1.53 Wed Aug 31 16:24:54 2011
+++ src/bin/pax/ar_io.c Tue Mar 20 18:42:28 2012
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)ar_io.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: ar_io.c,v 1.53 2011/08/31 16:24:54 plunky Exp $);
+__RCSID($NetBSD: ar_io.c,v 1.54 2012/03/20 18:42:28 matt Exp $);
#endif
#endif /* not lint */
@@ -1613,12 +1613,7 @@ ar_start_gzip(int fd, const char *gzp, i
}
static const char *
-timefmt(buf, size, sz, tm, unitstr)
- char *buf;
- size_t size;
- off_t sz;
- time_t tm;
- const char *unitstr;
+timefmt(char *buf, size_t size, off_t sz, time_t tm, const char *unitstr)
{
(void)snprintf(buf, size, %lu secs ( OFFT_F %s/sec),
(unsigned long)tm, (OFFT_T)(sz / tm), unitstr);
@@ -1626,10 +1621,7 @@ timefmt(buf, size, sz, tm, unitstr)
}
static const char *
-sizefmt(buf, size, sz)
- char *buf;
- size_t size;
- off_t sz;
+sizefmt(char *buf, size_t size, off_t sz)
{
(void)snprintf(buf, size, OFFT_F bytes, (OFFT_T)sz);
return buf;
Index: src/bin/pax/ftree.c
diff -u src/bin/pax/ftree.c:1.40 src/bin/pax/ftree.c:1.41
--- src/bin/pax/ftree.c:1.40 Sat Feb 14 08:10:06 2009
+++ src/bin/pax/ftree.c Tue Mar 20 18:42:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ftree.c,v 1.40 2009/02/14 08:10:06 lukem Exp $ */
+/* $NetBSD: ftree.c,v 1.41 2012/03/20 18:42:28 matt Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -71,7 +71,7 @@
#if 0
static char sccsid[] = @(#)ftree.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: ftree.c,v 1.40 2009/02/14 08:10:06 lukem Exp $);
+__RCSID($NetBSD: ftree.c,v 1.41 2012/03/20 18:42:28 matt Exp $);
#endif
#endif /* not lint */
@@ -135,7 +135,7 @@ static int ftree_arg(void);
*/
int
-ftree_start()
+ftree_start(void)
{
#ifndef SMALL
Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.112 src/bin/pax/options.c:1.113
--- src/bin/pax/options.c:1.112 Wed Aug 31 16:24:54 2011
+++ src/bin/pax/options.c Tue Mar 20 18:42:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.112 2011/08/31 16:24:54 plunky Exp $ */
+/* $NetBSD: options.c,v 1.113 2012/03/20 18:42:28 matt Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)options.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: options.c,v 1.112 2011/08/31 16:24:54 plunky Exp $);
+__RCSID($NetBSD: options.c,v 1.113 2012/03/20 18:42:28 matt Exp $);
#endif
#endif /* not lint */
@@ -1379,8 +1379,7 @@ tar_options(int argc, char **argv)
}
int
-mkpath(path)
- char *path;
+mkpath(char *path)
{
char *slash;
int done = 0;
Index: src/bin/pax/tar.c
diff -u src/bin/pax/tar.c:1.68 src/bin/pax/tar.c:1.69
--- src/bin/pax/tar.c:1.68 Thu Nov 3 21:59:45 2011
+++ src/bin/pax/tar.c Tue Mar 20 18:42:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tar.c,v 1.68 2011/11/03 21:59:45 christos Exp $ */
+/* $NetBSD: tar.c,v 1.69 2012/03/20 18:42:28 matt Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)tar.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: tar.c,v 1.68 2011/11/03 21:59:45 christos Exp $);
+__RCSID($NetBSD: tar.c,v 1.69 2012/03/20 18:42:28 matt Exp $);
#endif
#endif /* not lint */
@@ -1366,8 +1366,7 @@ tar_gnutar_exclude_one(const char *line,
* named files.
*/
int
-tar_gnutar_minus_minus_exclude(path)
- const char *path;
+tar_gnutar_minus_minus_exclude(const char *path)
{
size_t len = strlen(path);
@@ -1378,8 +1377,7 @@ tar_gnutar_minus_minus_exclude(path)
}
int
-tar_gnutar_X_compat(path)
- const char *path;
+tar_gnutar_X_compat(const char *path)
{
char *line;
FILE *fp;
Index: src/bin/ps/print.c
diff -u src/bin/ps/print.c:1.119 src/bin/ps/print.c:1.120
--- src/bin/ps/print.c:1.119 Mon Feb 13 12:55:28 2012
+++ src/bin/ps/print.c Tue Mar 20 18:42:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.119 2012/02/13 12:55:28 wiz Exp $ */
CVS commit: src/sbin
Module Name:src
Committed By: matt
Date: Tue Mar 20 18:50:31 UTC 2012
Modified Files:
src/sbin/cgdconfig: utils.c
src/sbin/fsck_ffs: quota2.c
src/sbin/fsdb: fsdb.c
src/sbin/init: init.c
src/sbin/mount_portal: puffs_portal.c
src/sbin/wsconsctl: display.c
Log Message:
Convert to C89 function definitions
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sbin/cgdconfig/utils.c
cvs rdiff -u -r1.4 -r1.5 src/sbin/fsck_ffs/quota2.c
cvs rdiff -u -r1.43 -r1.44 src/sbin/fsdb/fsdb.c
cvs rdiff -u -r1.102 -r1.103 src/sbin/init/init.c
cvs rdiff -u -r1.5 -r1.6 src/sbin/mount_portal/puffs_portal.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/wsconsctl/display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/utils.c
diff -u src/sbin/cgdconfig/utils.c:1.20 src/sbin/cgdconfig/utils.c:1.21
--- src/sbin/cgdconfig/utils.c:1.20 Sat Apr 11 07:40:37 2009
+++ src/sbin/cgdconfig/utils.c Tue Mar 20 18:50:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: utils.c,v 1.20 2009/04/11 07:40:37 lukem Exp $ */
+/* $NetBSD: utils.c,v 1.21 2012/03/20 18:50:30 matt Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: utils.c,v 1.20 2009/04/11 07:40:37 lukem Exp $);
+__RCSID($NetBSD: utils.c,v 1.21 2012/03/20 18:50:30 matt Exp $);
#endif
#include sys/param.h
@@ -139,7 +139,7 @@ struct string {
};
string_t *
-string_zero()
+string_zero(void)
{
string_t *out;
Index: src/sbin/fsck_ffs/quota2.c
diff -u src/sbin/fsck_ffs/quota2.c:1.4 src/sbin/fsck_ffs/quota2.c:1.5
--- src/sbin/fsck_ffs/quota2.c:1.4 Sun Aug 14 12:32:01 2011
+++ src/sbin/fsck_ffs/quota2.c Tue Mar 20 18:50:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2.c,v 1.4 2011/08/14 12:32:01 christos Exp $ */
+/* $NetBSD: quota2.c,v 1.5 2012/03/20 18:50:31 matt Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -514,7 +514,7 @@ quota2_check_usage(int type)
* check if a quota check needs to be run, regardless of the clean flag
*/
int
-quota2_check_doquota()
+quota2_check_doquota(void)
{
int retval = 1;
Index: src/sbin/fsdb/fsdb.c
diff -u src/sbin/fsdb/fsdb.c:1.43 src/sbin/fsdb/fsdb.c:1.44
--- src/sbin/fsdb/fsdb.c:1.43 Mon Aug 29 14:34:59 2011
+++ src/sbin/fsdb/fsdb.c Tue Mar 20 18:50:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fsdb.c,v 1.43 2011/08/29 14:34:59 joerg Exp $ */
+/* $NetBSD: fsdb.c,v 1.44 2012/03/20 18:50:31 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fsdb.c,v 1.43 2011/08/29 14:34:59 joerg Exp $);
+__RCSID($NetBSD: fsdb.c,v 1.44 2012/03/20 18:50:31 matt Exp $);
#endif /* not lint */
#include sys/types.h
@@ -147,9 +147,6 @@ main(int argc, char *argv[])
}
#define CMDFUNC(func) static int func (int argc, char *argv[])
-#define CMDFUNCSTART(func) static int func(argc, argv) \
-int argc; \
-char *argv[];
CMDFUNC(helpfn);
CMDFUNC(focus); /* focus on inode */
@@ -326,7 +323,7 @@ static ino_t ocurrent;
/*
* Focus on given inode number
*/
-CMDFUNCSTART(focus)
+CMDFUNC(focus)
{
ino_t inum;
char *cp;
@@ -339,7 +336,7 @@ CMDFUNCSTART(focus)
return 0;
}
-CMDFUNCSTART(back)
+CMDFUNC(back)
{
curinum = ocurrent;
curinode = ginode(curinum);
@@ -347,7 +344,7 @@ CMDFUNCSTART(back)
return 0;
}
-CMDFUNCSTART(zapi)
+CMDFUNC(zapi)
{
ino_t inum;
union dinode *dp;
@@ -362,18 +359,18 @@ CMDFUNCSTART(zapi)
return 0;
}
-CMDFUNCSTART(active)
+CMDFUNC(active)
{
printactive();
return 0;
}
-CMDFUNCSTART(quit)
+CMDFUNC(quit)
{
return -1;
}
-CMDFUNCSTART(uplink)
+CMDFUNC(uplink)
{
int16_t nlink;
@@ -388,7 +385,7 @@ CMDFUNCSTART(uplink)
return 0;
}
-CMDFUNCSTART(downlink)
+CMDFUNC(downlink)
{
int16_t nlink;
@@ -435,7 +432,7 @@ scannames(struct inodesc *idesc)
return (KEEPON);
}
-CMDFUNCSTART(ls)
+CMDFUNC(ls)
{
struct inodesc idesc;
checkactivedir(); /* let it go on anyway */
@@ -451,7 +448,7 @@ CMDFUNCSTART(ls)
return 0;
}
-CMDFUNCSTART(blks)
+CMDFUNC(blks)
{
uint64_t blkno = 0;
int i, type;
@@ -492,7 +489,7 @@ CMDFUNCSTART(blks)
static int findblk_numtofind;
static int wantedblksize;
-CMDFUNCSTART(findblk)
+CMDFUNC(findblk)
{
ino_t inum, inosused;
uint32_t *wantedblk32 = NULL;
@@ -874,7 +871,7 @@ dolookup(char *name)
}
}
-CMDFUNCSTART(focusname)
+CMDFUNC(focusname)
{
char *p, *val;
@@ -904,7 +901,7 @@ CMDFUNCSTART(focusname)
return 0;
}
-CMDFUNCSTART(ln)
+CMDFUNC(ln)
{
ino_t inum;
int rval;
@@ -924,7 +921,7 @@ CMDFUNCSTART(ln)
return rval;
}
-CMDFUNCSTART(rm)
+CMDFUNC(rm)
{
int rval;
@@ -954,7 +951,7 @@ chinumfunc(struct inodesc *idesc)
return KEEPON;
}
-CMDFUNCSTART(chinum)
+CMDFUNC(chinum)
{
char *cp;
ino_t inum;
@@ -1004,7 +1001,7 @@
CVS commit: src/usr.bin
Module Name:src
Committed By: matt
Date: Tue Mar 20 20:35:00 UTC 2012
Modified Files:
src/usr.bin/config: lint.c scan.l
src/usr.bin/find: find.c function.c
src/usr.bin/hesinfo: hesinfo.c
src/usr.bin/innetgr: innetgr.c
src/usr.bin/lock: lock.c
src/usr.bin/m4: gnum4.c look.c misc.c tokenizer.l trace.c
src/usr.bin/mkstr: mkstr.c
src/usr.bin/msgs: msgs.c
src/usr.bin/netgroup: netgroup.c
src/usr.bin/netstat: if.c iso.c main.c mbuf.c mroute.c mroute6.c
route.c unix.c
src/usr.bin/talk: ctl.c look_up.c
src/usr.bin/tee: tee.c
src/usr.bin/telnet: main.c
src/usr.bin/tftp: main.c tftp.c
src/usr.bin/ul: ul.c
src/usr.bin/units: units.c
src/usr.bin/users: users.c
src/usr.bin/vgrind: regexp.c vfontedpr.c
src/usr.bin/vmstat: vmstat.c
Log Message:
Use C89 function definitions
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/config/lint.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/config/scan.l
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/find/find.c
cvs rdiff -u -r1.67 -r1.68 src/usr.bin/find/function.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/hesinfo/hesinfo.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/innetgr/innetgr.c
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/lock/lock.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/m4/gnum4.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/m4/look.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/m4/misc.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/m4/tokenizer.l
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/m4/trace.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/mkstr/mkstr.c
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/msgs/msgs.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/netgroup/netgroup.c
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/netstat/if.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/netstat/iso.c
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/netstat/mbuf.c
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/netstat/mroute.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/netstat/mroute6.c
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/netstat/route.c
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/netstat/unix.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/talk/ctl.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/talk/look_up.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/tee/tee.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/telnet/main.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/tftp/main.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/tftp/tftp.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/ul/ul.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/units/units.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/users/users.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/vgrind/regexp.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/vgrind/vfontedpr.c
cvs rdiff -u -r1.186 -r1.187 src/usr.bin/vmstat/vmstat.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/config/lint.c
diff -u src/usr.bin/config/lint.c:1.13 src/usr.bin/config/lint.c:1.14
--- src/usr.bin/config/lint.c:1.13 Mon Mar 12 03:04:56 2012
+++ src/usr.bin/config/lint.c Tue Mar 20 20:34:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lint.c,v 1.13 2012/03/12 03:04:56 dholland Exp $ */
+/* $NetBSD: lint.c,v 1.14 2012/03/20 20:34:57 matt Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation.
@@ -36,7 +36,7 @@
#include defs.h
void
-emit_params()
+emit_params(void)
{
printf(version\t%d\n, CONFIG_VERSION);
@@ -196,7 +196,7 @@ emit_pseudo_instance(const char *name, v
}
void
-emit_instances()
+emit_instances(void)
{
(void)ht_enumerate(devroottab, emit_root_instance, NULL);
Index: src/usr.bin/config/scan.l
diff -u src/usr.bin/config/scan.l:1.16 src/usr.bin/config/scan.l:1.17
--- src/usr.bin/config/scan.l:1.16 Fri Apr 30 20:47:18 2010
+++ src/usr.bin/config/scan.l Tue Mar 20 20:34:57 2012
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.16 2010/04/30 20:47:18 pooka Exp $ */
+/* $NetBSD: scan.l,v 1.17 2012/03/20 20:34:57 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -541,7 +541,7 @@ include(const char *fname, int ateof, in
* Extract the pathname from a include/cinclude/package into curinclpath
*/
static int
-getincludepath()
+getincludepath(void)
{
const char *p = yytext;
ptrdiff_t len;
Index: src/usr.bin/find/find.c
diff -u src/usr.bin/find/find.c:1.28 src/usr.bin/find/find.c:1.29
--- src/usr.bin/find/find.c:1.28 Sun Mar 18 17:09:46 2012
+++ src/usr.bin/find/find.c Tue Mar 20 20:34:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: find.c,v 1.28 2012/03/18 17:09:46 dholland Exp $ */
+/* $NetBSD: find.c,v 1.29 2012/03/20 20:34:57 matt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = from: @(#)find.c 8.5 (Berkeley) 8/5/94;
#else
-__RCSID($NetBSD: find.c,v 1.28 2012/03/18 17:09:46 dholland Exp $);
+__RCSID($NetBSD: find.c,v 1.29 2012/03/20 20:34:57 matt Exp $);
#endif
#endif /* not lint */
@@ -282,10 +282,7 @@
CVS commit: src/lib/libc/softfloat/bits64
Module Name:src
Committed By: martin
Date: Tue Mar 20 21:34:51 UTC 2012
Modified Files:
src/lib/libc/softfloat/bits64: softfloat.c
Log Message:
Remove initialized but unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/softfloat/bits64/softfloat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/softfloat/bits64/softfloat.c
diff -u src/lib/libc/softfloat/bits64/softfloat.c:1.8 src/lib/libc/softfloat/bits64/softfloat.c:1.9
--- src/lib/libc/softfloat/bits64/softfloat.c:1.8 Sun Jul 10 04:52:23 2011
+++ src/lib/libc/softfloat/bits64/softfloat.c Tue Mar 20 21:34:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: softfloat.c,v 1.8 2011/07/10 04:52:23 matt Exp $ */
+/* $NetBSD: softfloat.c,v 1.9 2012/03/20 21:34:51 martin Exp $ */
/*
* This version hacked for use with gcc -msoft-float by bjh21.
@@ -46,7 +46,7 @@ this code that are retained.
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: softfloat.c,v 1.8 2011/07/10 04:52:23 matt Exp $);
+__RCSID($NetBSD: softfloat.c,v 1.9 2012/03/20 21:34:51 martin Exp $);
#endif /* LIBC_SCCS and not lint */
#ifdef SOFTFLOAT_FOR_GCC
@@ -5118,7 +5118,7 @@ according to the IEC/IEEE Standard for B
*/
float128 float128_rem( float128 a, float128 b )
{
-flag aSign, bSign, zSign;
+flag aSign, zSign;
int32 aExp, bExp, expDiff;
bits64 aSig0, aSig1, bSig0, bSig1, q, term0, term1, term2;
bits64 allZero, alternateASig0, alternateASig1, sigMean1;
@@ -5132,7 +5132,6 @@ float128 float128_rem( float128 a, float
bSig1 = extractFloat128Frac1( b );
bSig0 = extractFloat128Frac0( b );
bExp = extractFloat128Exp( b );
-bSign = extractFloat128Sign( b );
if ( aExp == 0x7FFF ) {
if (( aSig0 | aSig1 )
|| ( ( bExp == 0x7FFF ) ( bSig0 | bSig1 ) ) ) {
CVS commit: src/lib/libc/arch/sparc64
Module Name:src
Committed By: martin
Date: Tue Mar 20 21:37:20 UTC 2012
Modified Files:
src/lib/libc/arch/sparc64: Makefile.inc
Log Message:
We do not care about portability when instantiating softfloats for our
concrete environment - add appropriate lintflags.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/arch/sparc64/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc64/Makefile.inc
diff -u src/lib/libc/arch/sparc64/Makefile.inc:1.17 src/lib/libc/arch/sparc64/Makefile.inc:1.18
--- src/lib/libc/arch/sparc64/Makefile.inc:1.17 Sun Jul 10 04:52:23 2011
+++ src/lib/libc/arch/sparc64/Makefile.inc Tue Mar 20 21:37:19 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2011/07/10 04:52:23 matt Exp $
+# $NetBSD: Makefile.inc,v 1.18 2012/03/20 21:37:19 martin Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
@@ -24,4 +24,6 @@ CPPFLAGS+= -I${ARCHDIR}/softfloat -
COPTS.softfloat-wrapper.c+= -Wno-enum-compare
.endif
+LINTFLAGS.softfloat-wrapper.c+= -X117,132,218,259,298
+
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Tue Mar 20 21:48:20 UTC 2012
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Add WARNS=5 to enable -Wold-style-definitions
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.214 src/share/mk/bsd.sys.mk:1.215
--- src/share/mk/bsd.sys.mk:1.214 Sat Mar 17 18:02:41 2012
+++ src/share/mk/bsd.sys.mk Tue Mar 20 21:48:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.214 2012/03/17 18:02:41 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.215 2012/03/20 21:48:20 matt Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -60,6 +60,9 @@ CXXFLAGS+= -Wctor-dtor-privacy -Wnon-vir
CXXFLAGS+= ${${ACTIVE_CXX} == gcc:? -Wno-non-template-friend -Wno-pmf-conversions :}
.endif
.if ${WARNS} 3 (defined(HAVE_GCC) || defined(HAVE_LLVM))
+.if ${WARNS} 4
+CFLAGS+= -Wold-style-definition
+.endif
CFLAGS+= -Wsign-compare -Wformat=2
CFLAGS+= ${${ACTIVE_CC} == clang:? -Wno-error=format-nonliteral :}
CFLAGS+= ${${ACTIVE_CC} == gcc:? -Wno-format-zero-length :}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: nisimura
Date: Wed Mar 21 00:29:40 UTC 2012
Modified Files:
src/sys/dev/pci: if_iwi.c
Log Message:
Unbreak the endian issue in firmware header decoding. Comfirmed good and
running by a powerpc machine.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/pci/if_iwi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwi.c
diff -u src/sys/dev/pci/if_iwi.c:1.89 src/sys/dev/pci/if_iwi.c:1.90
--- src/sys/dev/pci/if_iwi.c:1.89 Mon Jan 30 19:41:20 2012
+++ src/sys/dev/pci/if_iwi.c Wed Mar 21 00:29:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwi.c,v 1.89 2012/01/30 19:41:20 drochner Exp $ */
+/* $NetBSD: if_iwi.c,v 1.90 2012/03/21 00:29:39 nisimura Exp $ */
/* $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwi.c,v 1.89 2012/01/30 19:41:20 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwi.c,v 1.90 2012/03/21 00:29:39 nisimura Exp $);
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -2154,7 +2154,7 @@ iwi_cache_firmware(struct iwi_softc *sc)
{
struct iwi_firmware *kfw = sc-fw;
firmware_handle_t fwh;
- const struct iwi_firmware_hdr *hdr;
+ struct iwi_firmware_hdr *hdr;
off_t size;
char *fw;
int error;
@@ -2192,8 +2192,12 @@ iwi_cache_firmware(struct iwi_softc *sc)
if (error != 0)
goto fail2;
+ hdr = (struct iwi_firmware_hdr *)sc-sc_blob;
+ hdr-version = le32toh(hdr-version);
+ hdr-bsize = le32toh(hdr-bsize);
+ hdr-usize = le32toh(hdr-usize);
+ hdr-fsize = le32toh(hdr-fsize);
- hdr = (const struct iwi_firmware_hdr *)sc-sc_blob;
if (size sizeof(struct iwi_firmware_hdr) + hdr-bsize + hdr-usize + hdr-fsize) {
aprint_error_dev(sc-sc_dev, image '%s' too small\n,
sc-sc_fwname);
@@ -2201,14 +2205,13 @@ iwi_cache_firmware(struct iwi_softc *sc)
goto fail2;
}
- hdr = (const struct iwi_firmware_hdr *)sc-sc_blob;
- DPRINTF((firmware version = %d\n, le32toh(hdr-version)));
- if ((IWI_FW_GET_MAJOR(le32toh(hdr-version)) != IWI_FW_REQ_MAJOR) ||
- (IWI_FW_GET_MINOR(le32toh(hdr-version)) != IWI_FW_REQ_MINOR)) {
+ DPRINTF((firmware version = %d\n, hdr-version));
+ if ((IWI_FW_GET_MAJOR(hdr-version) != IWI_FW_REQ_MAJOR) ||
+ (IWI_FW_GET_MINOR(hdr-version) != IWI_FW_REQ_MINOR)) {
aprint_error_dev(sc-sc_dev,
version for '%s' %d.%d != %d.%d\n, sc-sc_fwname,
- IWI_FW_GET_MAJOR(le32toh(hdr-version)),
- IWI_FW_GET_MINOR(le32toh(hdr-version)),
+ IWI_FW_GET_MAJOR(hdr-version),
+ IWI_FW_GET_MINOR(hdr-version),
IWI_FW_REQ_MAJOR, IWI_FW_REQ_MINOR);
error = EIO;
goto fail2;
CVS commit: src/lib/libc/arch/sparc/gen
Module Name:src Committed By: christos Date: Wed Mar 21 00:34:04 UTC 2012 Modified Files: src/lib/libc/arch/sparc/gen: _lwp.c Log Message: void cast To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc/gen/_lwp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/sparc/gen/_lwp.c diff -u src/lib/libc/arch/sparc/gen/_lwp.c:1.6 src/lib/libc/arch/sparc/gen/_lwp.c:1.7 --- src/lib/libc/arch/sparc/gen/_lwp.c:1.6 Wed Feb 23 23:28:43 2011 +++ src/lib/libc/arch/sparc/gen/_lwp.c Tue Mar 20 20:34:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: _lwp.c,v 1.6 2011/02/24 04:28:43 joerg Exp $ */ +/* $NetBSD: _lwp.c,v 1.7 2012/03/21 00:34:04 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: _lwp.c,v 1.6 2011/02/24 04:28:43 joerg Exp $); +__RCSID($NetBSD: _lwp.c,v 1.7 2012/03/21 00:34:04 christos Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -53,7 +53,7 @@ _lwp_makecontext(ucontext_t *u, void (*s u-uc_stack.ss_size = stack_size; - sp = (ulong *)(stack_base + stack_size); + sp = (void *)(stack_base + stack_size); sp = (ulong *)((ulong)sp ~0x07); /* Make room for the fake caller stack frame (CCFSZ, only in words) */
CVS commit: src/lib/libc
Module Name:src
Committed By: christos
Date: Wed Mar 21 00:34:54 UTC 2012
Modified Files:
src/lib/libc/isc: ev_timers.c
src/lib/libc/resolv: res_send.c
Log Message:
time_t casts
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/isc/ev_timers.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/resolv/res_send.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/isc/ev_timers.c
diff -u src/lib/libc/isc/ev_timers.c:1.10 src/lib/libc/isc/ev_timers.c:1.11
--- src/lib/libc/isc/ev_timers.c:1.10 Tue Mar 20 13:44:17 2012
+++ src/lib/libc/isc/ev_timers.c Tue Mar 20 20:34:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ev_timers.c,v 1.10 2012/03/20 17:44:17 matt Exp $ */
+/* $NetBSD: ev_timers.c,v 1.11 2012/03/21 00:34:54 christos Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. (ISC)
@@ -26,7 +26,7 @@
#ifdef notdef
static const char rcsid[] = Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp;
#else
-__RCSID($NetBSD: ev_timers.c,v 1.10 2012/03/20 17:44:17 matt Exp $);
+__RCSID($NetBSD: ev_timers.c,v 1.11 2012/03/21 00:34:54 christos Exp $);
#endif
#endif
@@ -137,7 +137,7 @@ evNowTime(void)
return (tsnow);
#endif
if (gettimeofday(now, NULL) 0)
- return (evConsTime(0L, 0L));
+ return (evConsTime((time_t)0, 0L));
return (evTimeSpec(now));
}
@@ -150,7 +150,7 @@ evUTCTime(void) {
return (tsnow);
#endif
if (gettimeofday(now, NULL) 0)
- return (evConsTime(0L, 0L));
+ return (evConsTime((time_t)0, 0L));
return (evTimeSpec(now));
}
Index: src/lib/libc/resolv/res_send.c
diff -u src/lib/libc/resolv/res_send.c:1.24 src/lib/libc/resolv/res_send.c:1.25
--- src/lib/libc/resolv/res_send.c:1.24 Tue Mar 20 13:44:18 2012
+++ src/lib/libc/resolv/res_send.c Tue Mar 20 20:34:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: res_send.c,v 1.24 2012/03/20 17:44:18 matt Exp $ */
+/* $NetBSD: res_send.c,v 1.25 2012/03/21 00:34:54 christos Exp $ */
/*
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. (ISC)
@@ -93,7 +93,7 @@
static const char sccsid[] = @(#)res_send.c 8.1 (Berkeley) 6/4/93;
static const char rcsid[] = Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp;
#else
-__RCSID($NetBSD: res_send.c,v 1.24 2012/03/20 17:44:18 matt Exp $);
+__RCSID($NetBSD: res_send.c,v 1.25 2012/03/21 00:34:54 christos Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -912,7 +912,7 @@ send_dg(res_state statp, const u_char *b
if (seconds = 0)
seconds = 1;
now = evNowTime();
- timeout = evConsTime((long)seconds, 0L);
+ timeout = evConsTime((time_t)seconds, 0L);
finish = evAddTime(now, timeout);
goto nonow;
wait:
@@ -929,7 +929,7 @@ send_dg(res_state statp, const u_char *b
#else
timeout = evSubTime(finish, now);
if (timeout.tv_sec 0)
- timeout = evConsTime(0L, 0L);
+ timeout = evConsTime((time_t)0, 0L);
polltimeout = 1000*(int)timeout.tv_sec +
(int)timeout.tv_nsec/100;
pollfd.fd = s;
CVS commit: src/sbin/apmlabel
Module Name:src
Committed By: riz
Date: Wed Mar 21 00:35:34 UTC 2012
Modified Files:
src/sbin/apmlabel: Makefile
Log Message:
Remove ${NETBSDSRCDIR}/sys/lib/libkern from .PATH; there are no
source files from there compiled.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/sbin/apmlabel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/apmlabel/Makefile
diff -u src/sbin/apmlabel/Makefile:1.1.1.1 src/sbin/apmlabel/Makefile:1.2
--- src/sbin/apmlabel/Makefile:1.1.1.1 Mon Mar 5 23:06:53 2007
+++ src/sbin/apmlabel/Makefile Wed Mar 21 00:35:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/05 23:06:53 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/21 00:35:33 riz Exp $
.include bsd.own.mk
@@ -9,5 +9,5 @@ CPPFLAGS+= -I${DISKLABELPATH}
MAN= apmlabel.8
LDADD+= -lutil
-.PATH: ${DISKLABELPATH} ${NETBSDSRCDIR}/sys/lib/libkern
+.PATH: ${DISKLABELPATH}
.include bsd.prog.mk
CVS commit: src/lib/libc/string
Module Name:src
Committed By: christos
Date: Wed Mar 21 00:35:50 UTC 2012
Modified Files:
src/lib/libc/string: strcspn.c strspn.c
Log Message:
size_t - uint8_t
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/string/strcspn.c \
src/lib/libc/string/strspn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/string/strcspn.c
diff -u src/lib/libc/string/strcspn.c:1.17 src/lib/libc/string/strcspn.c:1.18
--- src/lib/libc/string/strcspn.c:1.17 Thu Jul 30 17:42:06 2009
+++ src/lib/libc/string/strcspn.c Tue Mar 20 20:35:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: strcspn.c,v 1.17 2009/07/30 21:42:06 dsl Exp $ */
+/* $NetBSD: strcspn.c,v 1.18 2012/03/21 00:35:50 christos Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: strcspn.c,v 1.17 2009/07/30 21:42:06 dsl Exp $);
+__RCSID($NetBSD: strcspn.c,v 1.18 2012/03/21 00:35:50 christos Exp $);
#include assert.h
#include inttypes.h
@@ -39,7 +39,7 @@ __RCSID($NetBSD: strcspn.c,v 1.17 2009/
size_t
strcspn(const char *s, const char *charset)
{
- static const size_t idx[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
+ static const uint8_t idx[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
const char *t;
uint8_t set[32];
#define UC(a) ((unsigned int)(unsigned char)(a))
Index: src/lib/libc/string/strspn.c
diff -u src/lib/libc/string/strspn.c:1.17 src/lib/libc/string/strspn.c:1.18
--- src/lib/libc/string/strspn.c:1.17 Thu Jul 30 17:42:06 2009
+++ src/lib/libc/string/strspn.c Tue Mar 20 20:35:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: strspn.c,v 1.17 2009/07/30 21:42:06 dsl Exp $ */
+/* $NetBSD: strspn.c,v 1.18 2012/03/21 00:35:50 christos Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: strspn.c,v 1.17 2009/07/30 21:42:06 dsl Exp $);
+__RCSID($NetBSD: strspn.c,v 1.18 2012/03/21 00:35:50 christos Exp $);
#include assert.h
#include inttypes.h
@@ -38,7 +38,7 @@ __RCSID($NetBSD: strspn.c,v 1.17 2009/0
size_t
strspn(const char *s, const char *charset)
{
- static const size_t idx[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
+ static const uint8_t idx[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
uint8_t set[32];
const char *t;
#define UC(a) ((unsigned int)(unsigned char)(a))
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: christos
Date: Wed Mar 21 00:38:06 UTC 2012
Modified Files:
src/lib/libc/stdlib: jemalloc.c
Log Message:
uintmax_t - size_t (never called with larger than size_t)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/stdlib/jemalloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.24 src/lib/libc/stdlib/jemalloc.c:1.25
--- src/lib/libc/stdlib/jemalloc.c:1.24 Tue May 17 21:59:39 2011
+++ src/lib/libc/stdlib/jemalloc.c Tue Mar 20 20:38:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: jemalloc.c,v 1.24 2011/05/18 01:59:39 christos Exp $ */
+/* $NetBSD: jemalloc.c,v 1.25 2012/03/21 00:38:06 christos Exp $ */
/*-
* Copyright (C) 2006,2007 Jason Evans jas...@freebsd.org.
@@ -118,7 +118,7 @@
#include sys/cdefs.h
/* __FBSDID($FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $); */
-__RCSID($NetBSD: jemalloc.c,v 1.24 2011/05/18 01:59:39 christos Exp $);
+__RCSID($NetBSD: jemalloc.c,v 1.25 2012/03/21 00:38:06 christos Exp $);
#ifdef __FreeBSD__
#include libc_private.h
@@ -816,7 +816,7 @@ static void wrtmessage(const char *p1, c
#ifdef MALLOC_STATS
static void malloc_printf(const char *format, ...);
#endif
-static char *umax2s(uintmax_t x, char *s);
+static char *umax2s(size_t x, char *s);
static bool base_pages_alloc(size_t minsize);
static void *base_alloc(size_t size);
static chunk_node_t *base_chunk_node_alloc(void);
@@ -984,13 +984,13 @@ malloc_printf(const char *format, ...)
*/
#define UMAX2S_BUFSIZE 21
static char *
-umax2s(uintmax_t x, char *s)
+umax2s(size_t x, char *s)
{
unsigned i;
/* Make sure UMAX2S_BUFSIZE is large enough. */
/* LINTED */
- assert(sizeof(uintmax_t) = 8);
+ assert(sizeof(size_t) = 8);
i = UMAX2S_BUFSIZE - 1;
s[i] = '\0';
CVS commit: src/lib/libc/arch/sparc/gen
Module Name:src
Committed By: christos
Date: Wed Mar 21 00:38:35 UTC 2012
Modified Files:
src/lib/libc/arch/sparc/gen: flt_rounds.c fpgetmask.c fpgetround.c
fpgetsticky.c fpsetmask.c fpsetround.c
Log Message:
c89 prototypes, unsigned int
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc/gen/flt_rounds.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/sparc/gen/fpgetmask.c \
src/lib/libc/arch/sparc/gen/fpgetround.c \
src/lib/libc/arch/sparc/gen/fpgetsticky.c \
src/lib/libc/arch/sparc/gen/fpsetmask.c \
src/lib/libc/arch/sparc/gen/fpsetround.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc/gen/flt_rounds.c
diff -u src/lib/libc/arch/sparc/gen/flt_rounds.c:1.6 src/lib/libc/arch/sparc/gen/flt_rounds.c:1.7
--- src/lib/libc/arch/sparc/gen/flt_rounds.c:1.6 Sat Dec 24 18:10:08 2005
+++ src/lib/libc/arch/sparc/gen/flt_rounds.c Tue Mar 20 20:38:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: flt_rounds.c,v 1.6 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: flt_rounds.c,v 1.7 2012/03/21 00:38:34 christos Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: flt_rounds.c,v 1.6 2005/12/24 23:10:08 perry Exp $);
+__RCSID($NetBSD: flt_rounds.c,v 1.7 2012/03/21 00:38:34 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#include sys/types.h
@@ -21,9 +21,9 @@ static const int map[] = {
};
int
-__flt_rounds()
+__flt_rounds(void)
{
- int x;
+ unsigned int x;
__asm(st %%fsr,%0 : =m (*x));
return map[(x 30) 0x03];
Index: src/lib/libc/arch/sparc/gen/fpgetmask.c
diff -u src/lib/libc/arch/sparc/gen/fpgetmask.c:1.5 src/lib/libc/arch/sparc/gen/fpgetmask.c:1.6
--- src/lib/libc/arch/sparc/gen/fpgetmask.c:1.5 Sat Dec 24 18:10:08 2005
+++ src/lib/libc/arch/sparc/gen/fpgetmask.c Tue Mar 20 20:38:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetmask.c,v 1.5 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: fpgetmask.c,v 1.6 2012/03/21 00:38:34 christos Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpgetmask.c,v 1.5 2005/12/24 23:10:08 perry Exp $);
+__RCSID($NetBSD: fpgetmask.c,v 1.6 2012/03/21 00:38:34 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -19,9 +19,9 @@ __weak_alias(fpgetmask,_fpgetmask)
#endif
fp_except
-fpgetmask()
+fpgetmask(void)
{
- int x;
+ unsigned int x;
__asm(st %%fsr,%0 : =m (*x));
return (x 23) 0x1f;
Index: src/lib/libc/arch/sparc/gen/fpgetround.c
diff -u src/lib/libc/arch/sparc/gen/fpgetround.c:1.5 src/lib/libc/arch/sparc/gen/fpgetround.c:1.6
--- src/lib/libc/arch/sparc/gen/fpgetround.c:1.5 Sat Dec 24 18:10:08 2005
+++ src/lib/libc/arch/sparc/gen/fpgetround.c Tue Mar 20 20:38:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetround.c,v 1.5 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: fpgetround.c,v 1.6 2012/03/21 00:38:34 christos Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpgetround.c,v 1.5 2005/12/24 23:10:08 perry Exp $);
+__RCSID($NetBSD: fpgetround.c,v 1.6 2012/03/21 00:38:34 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -19,9 +19,9 @@ __weak_alias(fpgetround,_fpgetround)
#endif
fp_rnd
-fpgetround()
+fpgetround(void)
{
- int x;
+ unsigned int x;
__asm(st %%fsr,%0 : =m (*x));
return (x 30) 0x03;
Index: src/lib/libc/arch/sparc/gen/fpgetsticky.c
diff -u src/lib/libc/arch/sparc/gen/fpgetsticky.c:1.5 src/lib/libc/arch/sparc/gen/fpgetsticky.c:1.6
--- src/lib/libc/arch/sparc/gen/fpgetsticky.c:1.5 Sat Dec 24 18:10:08 2005
+++ src/lib/libc/arch/sparc/gen/fpgetsticky.c Tue Mar 20 20:38:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetsticky.c,v 1.5 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: fpgetsticky.c,v 1.6 2012/03/21 00:38:34 christos Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpgetsticky.c,v 1.5 2005/12/24 23:10:08 perry Exp $);
+__RCSID($NetBSD: fpgetsticky.c,v 1.6 2012/03/21 00:38:34 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -19,9 +19,9 @@ __weak_alias(fpgetsticky,_fpgetsticky)
#endif
fp_except
-fpgetsticky()
+fpgetsticky(void)
{
- int x;
+ unsigned int x;
__asm(st %%fsr,%0 : =m (*x));
return (x 5) 0x1f;
Index: src/lib/libc/arch/sparc/gen/fpsetmask.c
diff -u src/lib/libc/arch/sparc/gen/fpsetmask.c:1.5 src/lib/libc/arch/sparc/gen/fpsetmask.c:1.6
--- src/lib/libc/arch/sparc/gen/fpsetmask.c:1.5 Sat Dec 24 18:10:08 2005
+++ src/lib/libc/arch/sparc/gen/fpsetmask.c Tue Mar 20 20:38:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetmask.c,v 1.5 2005/12/24 23:10:08 perry
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: christos
Date: Wed Mar 21 02:18:15 UTC 2012
Modified Files:
src/lib/libc/gen: nlist_elf32.c
Log Message:
- don't compile unreachable code.
- convert uintmax_t to uintptr_t
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/gen/nlist_elf32.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/nlist_elf32.c
diff -u src/lib/libc/gen/nlist_elf32.c:1.34 src/lib/libc/gen/nlist_elf32.c:1.35
--- src/lib/libc/gen/nlist_elf32.c:1.34 Tue Mar 20 12:36:05 2012
+++ src/lib/libc/gen/nlist_elf32.c Tue Mar 20 22:18:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_elf32.c,v 1.34 2012/03/20 16:36:05 matt Exp $ */
+/* $NetBSD: nlist_elf32.c,v 1.35 2012/03/21 02:18:14 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: nlist_elf32.c,v 1.34 2012/03/20 16:36:05 matt Exp $);
+__RCSID($NetBSD: nlist_elf32.c,v 1.35 2012/03/21 02:18:14 christos Exp $);
#endif /* LIBC_SCCS and not lint */
/* If not included by nlist_elf64.c, ELFSIZE won't be defined. */
@@ -76,29 +76,32 @@ int
ELFNAMEEND(__fdnlist)(int fd, struct nlist *list)
{
struct stat st;
- struct nlist *p;
- char *mappedfile, *strtab;
- size_t mappedsize;
- Elf_Ehdr *ehdrp, ehdr;
- Elf_Shdr *shdrp, *symshdrp, *symstrshdrp;
- Elf_Sym *symp;
- Elf_Off shdr_off;
- Elf_Word shdr_size;
+ Elf_Ehdr ehdr;
+#if _LP64 || ELFSIZE == 32
#if (ELFSIZE == 32)
Elf32_Half nshdr;
#elif (ELFSIZE == 64)
Elf64_Word nshdr;
#endif
- size_t i, nsyms;
- int rv, nent;
+ /* Only support 64+32 mode on LP64; no support for 64 mode on ILP32 */
+ Elf_Ehdr *ehdrp;
+ Elf_Shdr *shdrp, *symshdrp, *symstrshdrp;
+ Elf_Sym *symp;
+ Elf_Off shdr_off;
+ Elf_Word shdr_size;
+ struct nlist *p;
+ char *mappedfile, *strtab;
+ size_t mappedsize, nsyms;
+ int nent;
+#endif
+ int rv;
+ size_t i;
_DIAGASSERT(fd != -1);
_DIAGASSERT(list != NULL);
rv = -1;
- symshdrp = symstrshdrp = NULL;
-
/*
* If we can't fstat() the file, something bad is going on.
*/
@@ -134,7 +137,10 @@ ELFNAMEEND(__fdnlist)(int fd, struct nli
default:
BAD;
}
+#if _LP64 || ELFSIZE == 32
+ symshdrp = symstrshdrp = NULL;
+ /* Only support 64+32 mode on LP64; no support for 64 mode on ILP32 */
if (S_ISCHR(st.st_mode)) {
const char *nlistname;
struct ksyms_gsymbol kg;
@@ -155,7 +161,7 @@ ELFNAMEEND(__fdnlist)(int fd, struct nli
kg.kg_name = nlistname;
kg.kg_sym = sym;
if (ioctl(fd, KIOCGSYMBOL, kg) == 0) {
-p-n_value = sym.st_value;
+p-n_value = (uintptr_t)sym.st_value;
switch (ELF_ST_TYPE(sym.st_info)) {
case STT_NOTYPE:
p-n_type = N_UNDF;
@@ -211,7 +217,7 @@ ELFNAMEEND(__fdnlist)(int fd, struct nli
if (check(shdr_off, shdr_size) ||
(sizeof *shdrp != ehdrp-e_shentsize))
BADUNMAP;
- shdrp = (Elf_Shdr *)(void *)mappedfile[shdr_off];
+ shdrp = (void *)mappedfile[(size_t)shdr_off];
for (i = 0; i nshdr; i++) {
if (shdrp[i].sh_type == SHT_SYMTAB) {
@@ -230,9 +236,9 @@ ELFNAMEEND(__fdnlist)(int fd, struct nli
if (check(symstrshdrp-sh_offset, symstrshdrp-sh_size))
BADUNMAP;
- symp = (Elf_Sym *)(void *)mappedfile[symshdrp-sh_offset];
- nsyms = symshdrp-sh_size / sizeof(*symp);
- strtab = mappedfile[symstrshdrp-sh_offset];
+ symp = (void *)mappedfile[(size_t)symshdrp-sh_offset];
+ nsyms = (size_t)(symshdrp-sh_size / sizeof(*symp));
+ strtab = mappedfile[(size_t)symstrshdrp-sh_offset];
/*
* Clean out any left-over information for all valid entries.
@@ -267,7 +273,7 @@ ELFNAMEEND(__fdnlist)(int fd, struct nli
/*
* Translate (roughly) from ELF to nlist
*/
-p-n_value = symp[i].st_value;
+p-n_value = (uintptr_t)symp[i].st_value;
switch (ELF_ST_TYPE(symp[i].st_info)) {
case STT_NOTYPE:
p-n_type = N_UNDF;
@@ -302,6 +308,7 @@ done:
rv = nent;
unmap:
munmap(mappedfile, mappedsize);
+#endif /* _LP64 || ELFSIZE == 32 */
out:
return (rv);
}
CVS commit: src/lib/libc/softfloat
Module Name:src
Committed By: christos
Date: Wed Mar 21 02:32:27 UTC 2012
Modified Files:
src/lib/libc/softfloat: softfloat-specialize
src/lib/libc/softfloat/bits64: softfloat-macros softfloat.c
Log Message:
cast to appropriate types.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/softfloat/softfloat-specialize
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/softfloat/bits64/softfloat-macros
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/softfloat/bits64/softfloat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/softfloat/softfloat-specialize
diff -u src/lib/libc/softfloat/softfloat-specialize:1.6 src/lib/libc/softfloat/softfloat-specialize:1.7
--- src/lib/libc/softfloat/softfloat-specialize:1.6 Sun Mar 6 05:27:37 2011
+++ src/lib/libc/softfloat/softfloat-specialize Tue Mar 20 22:32:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: softfloat-specialize,v 1.6 2011/03/06 10:27:37 martin Exp $ */
+/* $NetBSD: softfloat-specialize,v 1.7 2012/03/21 02:32:26 christos Exp $ */
/* This is a derivative work. */
@@ -114,7 +114,7 @@ static
flag float32_is_nan( float32 a )
{
-return ( 0xFF00 (bits32) ( a1 ) );
+return ( (bits32)0xFF00 (bits32) ( a1 ) );
}
@@ -163,7 +163,7 @@ precision floating-point format.
static float32 commonNaNToFloat32( commonNaNT a )
{
-return ( ( (bits32) a.sign )31 ) | 0x7FC0 | ( a.high41 );
+return ( ( (bits32) a.sign )31 ) | 0x7FC0 | (bits32)( a.high41 );
}
@@ -213,7 +213,7 @@ static
flag float64_is_nan( float64 a )
{
-return ( LIT64( 0xFFE0 )
+return ( (bits64)LIT64( 0xFFE0 )
(bits64) ( FLOAT64_DEMANGLE(a)1 ) );
}
@@ -249,7 +249,7 @@ static commonNaNT float64ToCommonNaN( fl
commonNaNT z;
if ( float64_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-z.sign = FLOAT64_DEMANGLE(a)63;
+z.sign = (flag)(FLOAT64_DEMANGLE(a)63);
z.low = 0;
z.high = FLOAT64_DEMANGLE(a)12;
return z;
@@ -427,7 +427,7 @@ flag float128_is_nan( float128 a )
{
return
- ( LIT64( 0xFFFE ) = (bits64) ( a.high1 ) )
+ ( (bits64)LIT64( 0xFFFE ) = (bits64) ( a.high1 ) )
( a.low || ( a.high LIT64( 0x ) ) );
}
@@ -459,7 +459,7 @@ static commonNaNT float128ToCommonNaN( f
commonNaNT z;
if ( float128_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-z.sign = a.high63;
+z.sign = (flag)(a.high63);
shortShift128Left( a.high, a.low, 16, z.high, z.low );
return z;
Index: src/lib/libc/softfloat/bits64/softfloat-macros
diff -u src/lib/libc/softfloat/bits64/softfloat-macros:1.2 src/lib/libc/softfloat/bits64/softfloat-macros:1.3
--- src/lib/libc/softfloat/bits64/softfloat-macros:1.2 Mon Feb 16 05:23:35 2009
+++ src/lib/libc/softfloat/bits64/softfloat-macros Tue Mar 20 22:32:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: softfloat-macros,v 1.2 2009/02/16 10:23:35 tron Exp $ */
+/* $NetBSD: softfloat-macros,v 1.3 2012/03/21 02:32:26 christos Exp $ */
/*
===
@@ -464,10 +464,10 @@ INLINE void mul64To128( bits64 a, bits64
bits32 aHigh, aLow, bHigh, bLow;
bits64 z0, zMiddleA, zMiddleB, z1;
-aLow = a;
-aHigh = a32;
-bLow = b;
-bHigh = b32;
+aLow = (bits32)a;
+aHigh = (bits32)(a32);
+bLow = (bits32)b;
+bHigh = (bits32)(b32);
z1 = ( (bits64) aLow ) * bLow;
zMiddleA = ( (bits64) aLow ) * bHigh;
zMiddleB = ( (bits64) aHigh ) * bLow;
@@ -616,7 +616,7 @@ static bits32 estimateSqrt32( int16 aExp
z = 0x8000 + ( a17 ) - sqrtEvenAdjustments[ idx ];
z = a / z + z;
z = ( 0x2 = z ) ? 0x8000 : ( z15 );
-if ( z = a ) return (bits32) ( ( (sbits32) a )1 );
+if ( z = a ) return (bits32) ( ( (bits32) a )1 );
}
return ( (bits32) ( ( ( (bits64) a )31 ) / z ) ) + ( z1 );
@@ -682,7 +682,7 @@ static int8 countLeadingZeros64( bits64
else {
a = 32;
}
-shiftCount += countLeadingZeros32( a );
+shiftCount += (int8)countLeadingZeros32( (bits32)a );
return shiftCount;
}
Index: src/lib/libc/softfloat/bits64/softfloat.c
diff -u src/lib/libc/softfloat/bits64/softfloat.c:1.9 src/lib/libc/softfloat/bits64/softfloat.c:1.10
--- src/lib/libc/softfloat/bits64/softfloat.c:1.9 Tue Mar 20 17:34:51 2012
+++ src/lib/libc/softfloat/bits64/softfloat.c Tue Mar 20 22:32:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: softfloat.c,v 1.9 2012/03/20 21:34:51 martin Exp $ */
+/* $NetBSD: softfloat.c,v 1.10 2012/03/21 02:32:26 christos Exp $ */
/*
* This version hacked for use with gcc -msoft-float by bjh21.
@@ -46,7 +46,7 @@ this code that are retained.
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: softfloat.c,v 1.9 2012/03/20 21:34:51 martin
CVS commit: src/lib
Module Name:src
Committed By: matt
Date: Wed Mar 21 05:33:27 UTC 2012
Modified Files:
src/lib/libcrypt: bcrypt.c
src/lib/libedit: readline.c
src/lib/libisns: isns_pdu.c isns_util.c
src/lib/libmenu: item.c menu.c
src/lib/libtelnet: auth.c enc_des.c encrypt.c genget.c getent.c misc.c
Log Message:
Use C89 functions definitions.
Remove use of __P
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libcrypt/bcrypt.c
cvs rdiff -u -r1.100 -r1.101 src/lib/libedit/readline.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libisns/isns_pdu.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/lib/libisns/isns_util.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libmenu/item.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libmenu/menu.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libtelnet/auth.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libtelnet/enc_des.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libtelnet/encrypt.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libtelnet/genget.c \
src/lib/libtelnet/misc.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libtelnet/getent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcrypt/bcrypt.c
diff -u src/lib/libcrypt/bcrypt.c:1.15 src/lib/libcrypt/bcrypt.c:1.16
--- src/lib/libcrypt/bcrypt.c:1.15 Wed Dec 28 03:12:38 2011
+++ src/lib/libcrypt/bcrypt.c Wed Mar 21 05:33:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bcrypt.c,v 1.15 2011/12/28 03:12:38 christos Exp $ */
+/* $NetBSD: bcrypt.c,v 1.16 2012/03/21 05:33:26 matt Exp $ */
/* $OpenBSD: bcrypt.c,v 1.16 2002/02/19 19:39:36 millert Exp $ */
/*
@@ -46,7 +46,7 @@
*
*/
#include sys/cdefs.h
-__RCSID($NetBSD: bcrypt.c,v 1.15 2011/12/28 03:12:38 christos Exp $);
+__RCSID($NetBSD: bcrypt.c,v 1.16 2012/03/21 05:33:26 matt Exp $);
#include stdio.h
#include stdlib.h
@@ -210,9 +210,7 @@ bcrypt_gensalt(u_int8_t log_rounds)
i.e. $2$04$iwouldntknowwhattosayetKdJ6iFtacBqJdKe6aW7ou */
char *
-__bcrypt(key, salt)
- const char *key;
- const char *salt;
+__bcrypt(const char *key, const char *salt)
{
blf_ctx state;
u_int32_t rounds, i, k;
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.100 src/lib/libedit/readline.c:1.101
--- src/lib/libedit/readline.c:1.100 Fri Nov 18 20:38:42 2011
+++ src/lib/libedit/readline.c Wed Mar 21 05:33:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.100 2011/11/18 20:38:42 christos Exp $ */
+/* $NetBSD: readline.c,v 1.101 2012/03/21 05:33:26 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include config.h
#if !defined(lint) !defined(SCCSID)
-__RCSID($NetBSD: readline.c,v 1.100 2011/11/18 20:38:42 christos Exp $);
+__RCSID($NetBSD: readline.c,v 1.101 2012/03/21 05:33:26 matt Exp $);
#endif /* not lint not SCCSID */
#include sys/types.h
@@ -1922,7 +1922,7 @@ rl_add_defun(const char *name, Function
}
void
-rl_callback_read_char()
+rl_callback_read_char(void)
{
int count = 0, done = 0;
const char *buf = el_gets(e, count);
Index: src/lib/libisns/isns_pdu.c
diff -u src/lib/libisns/isns_pdu.c:1.2 src/lib/libisns/isns_pdu.c:1.3
--- src/lib/libisns/isns_pdu.c:1.2 Tue Oct 25 00:02:30 2011
+++ src/lib/libisns/isns_pdu.c Wed Mar 21 05:33:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isns_pdu.c,v 1.2 2011/10/25 00:02:30 christos Exp $ */
+/* $NetBSD: isns_pdu.c,v 1.3 2012/03/21 05:33:27 matt Exp $ */
/*-
* Copyright (c) 2004,2009 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
-__RCSID($NetBSD: isns_pdu.c,v 1.2 2011/10/25 00:02:30 christos Exp $);
+__RCSID($NetBSD: isns_pdu.c,v 1.3 2012/03/21 05:33:27 matt Exp $);
#include sys/types.h
@@ -93,7 +93,7 @@ static struct isns_buffer_pool_s G_buffe
* isns_init_buffer_pool - initialize buffer pool for use
*/
void
-isns_init_buffer_pool()
+isns_init_buffer_pool(void)
{
pthread_mutexattr_t mutexattr;
Index: src/lib/libisns/isns_util.c
diff -u src/lib/libisns/isns_util.c:1.1.1.1 src/lib/libisns/isns_util.c:1.2
--- src/lib/libisns/isns_util.c:1.1.1.1 Sun Jan 16 01:22:50 2011
+++ src/lib/libisns/isns_util.c Wed Mar 21 05:33:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isns_util.c,v 1.1.1.1 2011/01/16 01:22:50 agc Exp $ */
+/* $NetBSD: isns_util.c,v 1.2 2012/03/21 05:33:27 matt Exp $ */
/*-
* Copyright (c) 2004,2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: isns_util.c,v 1.1.1.1 2011/01/16 01:22:50 agc Exp $);
+__RCSID($NetBSD: isns_util.c,v 1.2 2012/03/21 05:33:27 matt Exp $);
#include sys/types.h
@@ -82,7 +82,7 @@ isns_change_kevent_list(struct isns_conf
struct isns_config_s *
-isns_new_config()
+isns_new_config(void)
{
struct isns_config_s *cfg_p;
pthread_mutexattr_t mutexattr;
Index: src/lib/libmenu/item.c
diff -u src/lib/libmenu/item.c:1.11 src/lib/libmenu/item.c:1.12
--- src/lib/libmenu/item.c:1.11 Mon Jul 23 12:12:19 2007
+++ src/lib/libmenu/item.c Wed Mar 21 05:33:27 2012
@@ -1,4 +1,4 @@
-/*
CVS commit: src/lib/libdm
Module Name:src
Committed By: matt
Date: Wed Mar 21 05:36:24 UTC 2012
Modified Files:
src/lib/libdm: Makefile
Log Message:
Use WARNS=2 (the previous WARN=4 was incorrect and ignored).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libdm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libdm/Makefile
diff -u src/lib/libdm/Makefile:1.1 src/lib/libdm/Makefile:1.2
--- src/lib/libdm/Makefile:1.1 Tue Feb 8 03:20:15 2011
+++ src/lib/libdm/Makefile Wed Mar 21 05:36:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/02/08 03:20:15 haad Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/21 05:36:24 matt Exp $
USE_FORT?= no # network protocol library
LIB=dm
@@ -6,7 +6,7 @@ LIB=dm
SRCS= libdm_ioctl.c
MAN= dm.3
-WARN= 4
+WARNS= 2
CPPFLAGS+= -I${.CURDIR}
#CFLAGS+= -g -O0
CVS commit: src/lib
Module Name:src
Committed By: matt
Date: Wed Mar 21 05:37:44 UTC 2012
Modified Files:
src/lib/libcrypt: Makefile
src/lib/libedit: Makefile
src/lib/libisns: Makefile
src/lib/libm: Makefile
src/lib/libnpf: Makefile
src/lib/libperfuse: Makefile
src/lib/libppath: Makefile
src/lib/libprop: Makefile
src/lib/libpthread: Makefile
src/lib/libpthread_dbg: Makefile
src/lib/libpuffs: Makefile
src/lib/libquota: Makefile
src/lib/librefuse: Makefile
src/lib/librt: Makefile
src/lib/librumphijack: Makefile
src/lib/librumpuser: Makefile
src/lib/libtelnet: Makefile
src/lib/libterminfo: Makefile
src/lib/libutil: Makefile
Log Message:
These directories default to WARNS?=5
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/libcrypt/Makefile
cvs rdiff -u -r1.49 -r1.50 src/lib/libedit/Makefile
cvs rdiff -u -r1.3 -r1.4 src/lib/libisns/Makefile
cvs rdiff -u -r1.121 -r1.122 src/lib/libm/Makefile
cvs rdiff -u -r1.1 -r1.2 src/lib/libnpf/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libperfuse/Makefile
cvs rdiff -u -r1.1 -r1.2 src/lib/libppath/Makefile
cvs rdiff -u -r1.19 -r1.20 src/lib/libprop/Makefile
cvs rdiff -u -r1.74 -r1.75 src/lib/libpthread/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libpthread_dbg/Makefile
cvs rdiff -u -r1.24 -r1.25 src/lib/libpuffs/Makefile
cvs rdiff -u -r1.9 -r1.10 src/lib/libquota/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/librefuse/Makefile
cvs rdiff -u -r1.15 -r1.16 src/lib/librt/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/librumphijack/Makefile
cvs rdiff -u -r1.5 -r1.6 src/lib/librumpuser/Makefile
cvs rdiff -u -r1.34 -r1.35 src/lib/libtelnet/Makefile
cvs rdiff -u -r1.21 -r1.22 src/lib/libterminfo/Makefile
cvs rdiff -u -r1.70 -r1.71 src/lib/libutil/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcrypt/Makefile
diff -u src/lib/libcrypt/Makefile:1.22 src/lib/libcrypt/Makefile:1.23
--- src/lib/libcrypt/Makefile:1.22 Mon Jun 20 07:43:58 2011
+++ src/lib/libcrypt/Makefile Wed Mar 21 05:37:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2011/06/20 07:43:58 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2012/03/21 05:37:42 matt Exp $
USE_SHLIBDIR= yes
@@ -7,7 +7,7 @@ LIB= crypt
SRCS= crypt.c md5crypt.c bcrypt.c crypt-sha1.c util.c pw_gensalt.c
SRCS+= hmac_sha1.c
-WARNS= 4
+WARNS?= 5
MAN= crypt.3
MLINKS= crypt.3 encrypt.3 crypt.3 setkey.3
Index: src/lib/libedit/Makefile
diff -u src/lib/libedit/Makefile:1.49 src/lib/libedit/Makefile:1.50
--- src/lib/libedit/Makefile:1.49 Tue Aug 16 16:25:15 2011
+++ src/lib/libedit/Makefile Wed Mar 21 05:37:42 2012
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2011/08/16 16:25:15 christos Exp $
+# $NetBSD: Makefile,v 1.50 2012/03/21 05:37:42 matt Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
WIDECHAR ?= yes
-WARNS= 4
+WARNS?= 5
LIB= edit
LIBDPLIBS+= terminfo ${.CURDIR}/../libterminfo
Index: src/lib/libisns/Makefile
diff -u src/lib/libisns/Makefile:1.3 src/lib/libisns/Makefile:1.4
--- src/lib/libisns/Makefile:1.3 Wed Aug 17 10:08:43 2011
+++ src/lib/libisns/Makefile Wed Mar 21 05:37:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/08/17 10:08:43 christos Exp $
+# $NetBSD: Makefile,v 1.4 2012/03/21 05:37:42 matt Exp $
.include bsd.own.mk
@@ -11,6 +11,6 @@ MAN= isns.3
INCS= isns.h isns_defs.h
INCSDIR=/usr/include
-WARNS= 4
+WARNS?= 5
.include bsd.lib.mk
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.121 src/lib/libm/Makefile:1.122
--- src/lib/libm/Makefile:1.121 Fri Mar 9 08:03:53 2012
+++ src/lib/libm/Makefile Wed Mar 21 05:37:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2012/03/09 08:03:53 njoly Exp $
+# $NetBSD: Makefile,v 1.122 2012/03/21 05:37:42 matt Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -108,10 +108,10 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S
# XXX - ripped out due to lack of the insn polyd in the Mariah chip,
# and emulation code isn't written yet.
ARCHS_SRCS = n_scalbn.S
-WARNS?=4
+WARNS?=5
.endif
-WARNS?=4
+WARNS?=5
.PATH: ${.CURDIR}/man
.PATH: ${.CURDIR}/src
Index: src/lib/libnpf/Makefile
diff -u src/lib/libnpf/Makefile:1.1 src/lib/libnpf/Makefile:1.2
--- src/lib/libnpf/Makefile:1.1 Wed Feb 2 02:20:25 2011
+++ src/lib/libnpf/Makefile Wed Mar 21 05:37:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/02/02 02:20:25 rmind Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/21 05:37:42 matt Exp $
.include bsd.own.mk
@@ -14,7 +14,7 @@ LIBDPLIBS+= prop ${.CURDIR}/../libprop
LDADD+= -lprop
DPADD+= ${LIBPROP}
-WARNS?= 4
+WARNS?= 5
NOLINT= # defined (note: deliberately)
.include bsd.lib.mk
Index: src/lib/libperfuse/Makefile
diff -u src/lib/libperfuse/Makefile:1.8 src/lib/libperfuse/Makefile:1.9
--- src/lib/libperfuse/Makefile:1.8 Sun Aug 14 08:19:04 2011
+++
CVS commit: src/sys/sys
Module Name:src
Committed By: matt
Date: Wed Mar 21 05:42:26 UTC 2012
Modified Files:
src/sys/sys: timepps.h
Log Message:
Use C89 function definitions for the inlines.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/sys/timepps.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/timepps.h
diff -u src/sys/sys/timepps.h:1.19 src/sys/sys/timepps.h:1.20
--- src/sys/sys/timepps.h:1.19 Sun Jun 14 13:16:32 2009
+++ src/sys/sys/timepps.h Wed Mar 21 05:42:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: timepps.h,v 1.19 2009/06/14 13:16:32 kardel Exp $ */
+/* $NetBSD: timepps.h,v 1.20 2012/03/21 05:42:26 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone
@@ -177,9 +177,7 @@ static __inline int time_pps_kcbind(pps_
const int);
static __inline int
-time_pps_create(filedes, handle)
- int filedes;
- pps_handle_t *handle;
+time_pps_create(int filedes, pps_handle_t *handle)
{
*handle = filedes;
@@ -187,57 +185,44 @@ time_pps_create(filedes, handle)
}
static __inline int
-time_pps_destroy(handle)
- pps_handle_t handle;
+time_pps_destroy(pps_handle_t handle)
{
return (0);
}
static __inline int
-time_pps_setparams(handle, ppsparams)
- pps_handle_t handle;
- const pps_params_t *ppsparams;
+time_pps_setparams(pps_handle_t handle, const pps_params_t *ppsparams)
{
return (ioctl(handle, PPS_IOC_SETPARAMS, __UNCONST(ppsparams)));
}
static __inline int
-time_pps_getparams(handle, ppsparams)
- pps_handle_t handle;
- pps_params_t *ppsparams;
+time_pps_getparams(pps_handle_t handle, pps_params_t *ppsparams)
{
return (ioctl(handle, PPS_IOC_GETPARAMS, ppsparams));
}
static __inline int
-time_pps_getcap(handle, mode)
- pps_handle_t handle;
- int *mode;
+time_pps_getcap(pps_handle_t handle, int *mode)
{
return (ioctl(handle, PPS_IOC_GETCAP, mode));
}
static __inline int
-time_pps_fetch(handle, tsformat, ppsinfobuf, timeout)
- pps_handle_t handle;
- const int tsformat;
- pps_info_t *ppsinfobuf;
- const struct timespec *timeout;
+time_pps_fetch(pps_handle_t handle, const int tsformat, pps_info_t *ppsinfobuf,
+ const struct timespec *timeout)
{
return (ioctl(handle, PPS_IOC_FETCH, ppsinfobuf));
}
static __inline int
-time_pps_kcbind(handle, kernel_consumer, edge, tsformat)
- pps_handle_t handle;
- const int kernel_consumer;
- const int edge;
- const int tsformat;
+time_pps_kcbind(pps_handle_t handle, const int kernel_consumer, const int edge,
+ const int tsformat)
{
if (tsformat != PPS_TSFMT_TSPEC) {
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: matt Date: Wed Mar 21 05:43:09 UTC 2012 Added Files: src/distrib/sets/lists/xcomp: md.evbmips Log Message: Add missing MKDEBUG=yes X11 files To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xcomp/md.evbmips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/distrib/sets/lists/xcomp/md.evbmips diff -u /dev/null src/distrib/sets/lists/xcomp/md.evbmips:1.1 --- /dev/null Wed Mar 21 05:43:09 2012 +++ src/distrib/sets/lists/xcomp/md.evbmips Wed Mar 21 05:43:09 2012 @@ -0,0 +1,26 @@ +# $NetBSD: md.evbmips,v 1.1 2012/03/21 05:43:09 matt Exp $ +./usr/libdata/debug/usr/X11R6/bin/Xews4800mips.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libsiliconmotion_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libsis_drv.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libextmod.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libglx.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/extensions/librecord.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libshadow.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/libexa.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/libi2c.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/libshadowfb.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug
CVS commit: src/usr.bin/nvi/build
Module Name:src
Committed By: matt
Date: Wed Mar 21 05:44:39 UTC 2012
Modified Files:
src/usr.bin/nvi/build: Makefile
Log Message:
Use WARNS=4
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/nvi/build/Makefile
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/nvi/build/Makefile
diff -u src/usr.bin/nvi/build/Makefile:1.16 src/usr.bin/nvi/build/Makefile:1.17
--- src/usr.bin/nvi/build/Makefile:1.16 Wed Aug 17 12:57:19 2011
+++ src/usr.bin/nvi/build/Makefile Wed Mar 21 05:44:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/08/17 12:57:19 christos Exp $
+# $NetBSD: Makefile,v 1.17 2012/03/21 05:44:39 matt Exp $
.include bsd.own.mk
@@ -56,6 +56,8 @@ options_def.h: options.awk options.c
.include ../Makefile.inc
.include ../../Makefile.inc
+WARNS= 4
+
.PATH: ${DIST}/vi ${DIST}/ex ${DIST}/cl
.PATH: ${DIST}/common
.PATH: ${DIST}/regex
CVS commit: src
Module Name:src
Committed By: matt
Date: Wed Mar 21 05:47:54 UTC 2012
Modified Files:
src/bin: Makefile.inc
src/sbin: Makefile.inc
src/usr.bin: Makefile.inc
Log Message:
Default to WARNS=5
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/bin/Makefile.inc
cvs rdiff -u -r1.21 -r1.22 src/sbin/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/Makefile.inc
diff -u src/bin/Makefile.inc:1.16 src/bin/Makefile.inc:1.17
--- src/bin/Makefile.inc:1.16 Sat Feb 14 08:31:13 2009
+++ src/bin/Makefile.inc Wed Mar 21 05:47:53 2012
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.16 2009/02/14 08:31:13 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.17 2012/03/21 05:47:53 matt Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93
.include bsd.own.mk # for MKDYNAMICROOT definition
-WARNS?= 4
+WARNS?= 5
BINDIR?= /bin
.if (${MKDYNAMICROOT} == no)
Index: src/sbin/Makefile.inc
diff -u src/sbin/Makefile.inc:1.21 src/sbin/Makefile.inc:1.22
--- src/sbin/Makefile.inc:1.21 Sat Apr 11 07:58:11 2009
+++ src/sbin/Makefile.inc Wed Mar 21 05:47:53 2012
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.21 2009/04/11 07:58:11 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.22 2012/03/21 05:47:53 matt Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/8/93
.include bsd.own.mk # for MKDYNAMICROOT definition
-WARNS?= 4
+WARNS?= 5
BINDIR?= /sbin
.if (${MKDYNAMICROOT} == no)
Index: src/usr.bin/Makefile.inc
diff -u src/usr.bin/Makefile.inc:1.9 src/usr.bin/Makefile.inc:1.10
--- src/usr.bin/Makefile.inc:1.9 Tue Apr 14 22:15:16 2009
+++ src/usr.bin/Makefile.inc Wed Mar 21 05:47:53 2012
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.9 2009/04/14 22:15:16 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.10 2012/03/21 05:47:53 matt Exp $
# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93
-WARNS?= 4
+WARNS?= 5
BINDIR?=/usr/bin
CVS commit: src/distrib/vax/ramdisk
Module Name:src Committed By: matt Date: Wed Mar 21 05:49:18 UTC 2012 Modified Files: src/distrib/vax/ramdisk: list Log Message: Use special ed and umount. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/distrib/vax/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/vax/ramdisk/list diff -u src/distrib/vax/ramdisk/list:1.28 src/distrib/vax/ramdisk/list:1.29 --- src/distrib/vax/ramdisk/list:1.28 Sun Jul 3 23:11:34 2011 +++ src/distrib/vax/ramdisk/list Wed Mar 21 05:49:17 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.28 2011/07/03 23:11:34 tron Exp $ +# $NetBSD: list,v 1.29 2012/03/21 05:49:17 matt Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -54,10 +54,12 @@ PROG usr/sbin/installboot # init invokes the shell as -sh ARGVLN sh -sh +SPECIAL ed srcdir distrib/utils/x_ed SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route +SPECIAL umount srcdir distrib/utils/x_umount LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
CVS commit: src/distrib/vax/ramdisk
Module Name:src
Committed By: matt
Date: Wed Mar 21 05:49:39 UTC 2012
Modified Files:
src/distrib/vax/ramdisk: Makefile
Log Message:
Add a Makefile dependency
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/vax/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/ramdisk/Makefile
diff -u src/distrib/vax/ramdisk/Makefile:1.27 src/distrib/vax/ramdisk/Makefile:1.28
--- src/distrib/vax/ramdisk/Makefile:1.27 Sun Mar 18 14:12:55 2012
+++ src/distrib/vax/ramdisk/Makefile Wed Mar 21 05:49:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/03/18 14:12:55 he Exp $
+# $NetBSD: Makefile,v 1.28 2012/03/21 05:49:39 matt Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -17,7 +17,7 @@ IMAGEENDIAN= le
MAKEDEVTARGETS= std mt0 st0 rd0 rd1 dz0 dl0 dhu0 rx0 ra0 ra1 ra2 ra3 hp0 hp1 \
sd0 sd1 sd2 md0 pty0 cd0 cd1
IMAGEDEPENDS= ${CRUNCHBIN} \
- dot.profile \
+ Makefile dot.profile \
${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
