CVS commit: src/usr.bin/banner
Module Name:src Committed By: wiz Date: Wed Feb 29 08:54:55 UTC 2012 Modified Files: src/usr.bin/banner: banner.1 Log Message: Remove trailing whitespace. From Bug Hunting in PR 46102. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/banner/banner.1 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/banner/banner.1 diff -u src/usr.bin/banner/banner.1:1.8 src/usr.bin/banner/banner.1:1.9 --- src/usr.bin/banner/banner.1:1.8 Sun Feb 26 21:04:10 2012 +++ src/usr.bin/banner/banner.1 Wed Feb 29 08:54:55 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: banner.1,v 1.8 2012/02/26 21:04:10 wiz Exp $ +.\ $NetBSD: banner.1,v 1.9 2012/02/29 08:54:55 wiz Exp $ .\ .\ @(#)Copyright (c) 1995, Simon J. Gerraty. .\ @@ -57,7 +57,7 @@ Use the more attractive LPD font instead .Nm font. .El -.Sh EXIT STATUS -.Ex -std +.Sh EXIT STATUS +.Ex -std .Sh SEE ALSO .Xr banner 6
CVS commit: src/usr.bin/banner
Module Name:src
Committed By: wiz
Date: Wed Feb 29 08:55:25 UTC 2012
Modified Files:
src/usr.bin/banner: banner.c
Log Message:
Sync usage with man page. From Bug Hunting in PR 46102.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/banner/banner.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/banner/banner.c
diff -u src/usr.bin/banner/banner.c:1.14 src/usr.bin/banner/banner.c:1.15
--- src/usr.bin/banner/banner.c:1.14 Sun Feb 26 21:04:10 2012
+++ src/usr.bin/banner/banner.c Wed Feb 29 08:55:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: banner.c,v 1.14 2012/02/26 21:04:10 wiz Exp $ */
+/* $NetBSD: banner.c,v 1.15 2012/02/29 08:55:25 wiz Exp $ */
/*
* Changes for banner(1)
@@ -58,7 +58,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)printjob.c 8.2 (Berkeley) 4/16/94;
#else
-__RCSID($NetBSD: banner.c,v 1.14 2012/02/26 21:04:10 wiz Exp $);
+__RCSID($NetBSD: banner.c,v 1.15 2012/02/29 08:55:25 wiz Exp $);
#endif
#endif /* not lint */
@@ -205,7 +205,7 @@ main(int argc, char **argv)
static void
usage(void)
{
-fprintf(stderr, usage: %s [-l] [b bg] [-f fg] message...\n,
+fprintf(stderr, usage: %s [-l] [-b bg] [-f fg] string ...\n,
getprogname());
exit(1);
}
CVS commit: [matt-nb5-mips64] src/sys
Module Name:src
Committed By: matt
Date: Wed Feb 29 18:03:40 UTC 2012
Modified Files:
src/sys/miscfs/genfs [matt-nb5-mips64]: genfs_io.c
src/sys/uvm [matt-nb5-mips64]: files.uvm uvm.h uvm_amap.c uvm_aobj.c
uvm_bio.c uvm_fault.c uvm_km.c uvm_loan.c uvm_map.c uvm_page.c
uvm_page.h uvm_pdaemon.c uvm_pglist.c uvm_vnode.c
Log Message:
Improve UVM_PAGE_TRKOWN.
Add more asserts to uvm_page.
To generate a diff of this commit:
cvs rdiff -u -r1.13.4.2.4.4 -r1.13.4.2.4.5 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.11 -r1.11.12.1 src/sys/uvm/files.uvm
cvs rdiff -u -r1.55.16.3 -r1.55.16.4 src/sys/uvm/uvm.h
cvs rdiff -u -r1.84.20.1.4.1 -r1.84.20.1.4.2 src/sys/uvm/uvm_amap.c
cvs rdiff -u -r1.104.10.2 -r1.104.10.3 src/sys/uvm/uvm_aobj.c
cvs rdiff -u -r1.65 -r1.65.14.1 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.125.6.1.4.3 -r1.125.6.1.4.4 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.101.4.2.4.8 -r1.101.4.2.4.9 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.72 -r1.72.10.1 src/sys/uvm/uvm_loan.c
cvs rdiff -u -r1.263.4.3.4.7 -r1.263.4.3.4.8 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.140.6.3.4.9 -r1.140.6.3.4.10 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.55.14.8 -r1.55.14.9 src/sys/uvm/uvm_page.h
cvs rdiff -u -r1.93.4.2.4.7 -r1.93.4.2.4.8 src/sys/uvm/uvm_pdaemon.c
cvs rdiff -u -r1.42.16.12 -r1.42.16.13 src/sys/uvm/uvm_pglist.c
cvs rdiff -u -r1.90.28.3 -r1.90.28.4 src/sys/uvm/uvm_vnode.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.13.4.2.4.4 src/sys/miscfs/genfs/genfs_io.c:1.13.4.2.4.5
--- src/sys/miscfs/genfs/genfs_io.c:1.13.4.2.4.4 Thu Feb 9 03:08:31 2012
+++ src/sys/miscfs/genfs/genfs_io.c Wed Feb 29 18:03:37 2012
@@ -693,7 +693,7 @@ out:
}
uvm_pageenqueue(pg);
pg-flags = ~(PG_WANTED|PG_BUSY|PG_FAKE);
- UVM_PAGE_OWN(pg, NULL);
+ UVM_PAGE_OWN(pg, NULL, NULL);
}
}
mutex_exit(uvm_pageqlock);
@@ -1037,7 +1037,7 @@ retry:
wasclean = false;
memset(pgs, 0, sizeof(pgs));
pg-flags |= PG_BUSY;
- UVM_PAGE_OWN(pg, genfs_putpages);
+ UVM_PAGE_OWN(pg, genfs_putpages, NULL);
/*
* first look backward.
@@ -1115,6 +1115,7 @@ retry:
*/
nextpg = TAILQ_NEXT(tpg, listq.queue);
+ uvm_pagedequeue(tpg);
uvm_pagefree(tpg);
if (pagedaemon) {
uvm_page_to_pggroup(tpg)-pgrp_pdfreed++;
Index: src/sys/uvm/files.uvm
diff -u src/sys/uvm/files.uvm:1.11 src/sys/uvm/files.uvm:1.11.12.1
--- src/sys/uvm/files.uvm:1.11 Wed Jun 4 17:47:40 2008
+++ src/sys/uvm/files.uvm Wed Feb 29 18:03:38 2012
@@ -1,10 +1,10 @@
-# $NetBSD: files.uvm,v 1.11 2008/06/04 17:47:40 ad Exp $
+# $NetBSD: files.uvm,v 1.11.12.1 2012/02/29 18:03:38 matt Exp $
#
# UVM options
#
defflag opt_uvmhist.h UVMHIST UVMHIST_PRINT
-defflag opt_uvm.h USE_TOPDOWN_VM UVMMAP_COUNTERS
+defflag opt_uvm.h USE_TOPDOWN_VM UVMMAP_COUNTERS UVM_PAGE_TRKOWN
defflag opt_vmswap.h VMSWAP
defflag opt_readahead.h READAHEAD_STATS
defflag opt_ubc.h UBC_STATS
Index: src/sys/uvm/uvm.h
diff -u src/sys/uvm/uvm.h:1.55.16.3 src/sys/uvm/uvm.h:1.55.16.4
--- src/sys/uvm/uvm.h:1.55.16.3 Thu Feb 9 03:04:59 2012
+++ src/sys/uvm/uvm.h Wed Feb 29 18:03:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm.h,v 1.55.16.3 2012/02/09 03:04:59 matt Exp $ */
+/* $NetBSD: uvm.h,v 1.55.16.4 2012/02/29 18:03:38 matt Exp $ */
/*
*
@@ -204,9 +204,9 @@ void uvm_kick_pdaemon(void);
*/
#if defined(UVM_PAGE_TRKOWN)
-#define UVM_PAGE_OWN(PG, TAG) uvm_page_own(PG, TAG)
+#define UVM_PAGE_OWN(PG, TAG, ADDR) uvm_page_own(PG, TAG, ADDR)
#else
-#define UVM_PAGE_OWN(PG, TAG) /* nothing */
+#define UVM_PAGE_OWN(PG, TAG, ADDR) /* nothing */
#endif /* UVM_PAGE_TRKOWN */
#include uvm/uvm_fault_i.h
Index: src/sys/uvm/uvm_amap.c
diff -u src/sys/uvm/uvm_amap.c:1.84.20.1.4.1 src/sys/uvm/uvm_amap.c:1.84.20.1.4.2
--- src/sys/uvm/uvm_amap.c:1.84.20.1.4.1 Thu Feb 9 03:04:59 2012
+++ src/sys/uvm/uvm_amap.c Wed Feb 29 18:03:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_amap.c,v 1.84.20.1.4.1 2012/02/09 03:04:59 matt Exp $ */
+/* $NetBSD: uvm_amap.c,v 1.84.20.1.4.2 2012/02/29 18:03:38 matt Exp $ */
/*
*
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_amap.c,v 1.84.20.1.4.1 2012/02/09 03:04:59 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_amap.c,v 1.84.20.1.4.2 2012/02/29 18:03:38 matt Exp $);
#include opt_uvmhist.h
@@ -1039,7 +1039,7 @@ ReStart:
uvm_pageactivate(npg);
mutex_exit(uvm_pageqlock);
npg-flags = ~(PG_BUSY|PG_FAKE);
- UVM_PAGE_OWN(npg, NULL);
+ UVM_PAGE_OWN(npg, NULL, NULL);
mutex_exit(nanon-an_lock);
mutex_exit(anon-an_lock);
}
Index: src/sys/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.104.10.2 src/sys/uvm/uvm_aobj.c:1.104.10.3
--- src/sys/uvm/uvm_aobj.c:1.104.10.2 Fri Jun 3 07:59:57 2011
+++ src/sys/uvm/uvm_aobj.c Wed Feb 29 18:03:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_aobj.c,v
CVS commit: src
Module Name:src Committed By: tron Date: Wed Feb 29 20:07:58 UTC 2012 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/xbase: mi shl.mi src/distrib/sets/lists/xcomp: mi shl.mi src/external/mit: Makefile src/external/mit/xorg/bin/xmlwf: Makefile src/external/mit/xorg/lib: Makefile src/external/mit/xorg/lib/dri: dri.mk src/external/mit/xorg/lib/fontconfig/src: Makefile src/external/mit/xorg/tools/fc-cache: Makefile src/lib: Makefile src/share/mk: bsd.README bsd.hostprog.mk bsd.prog.mk src/x11/lib: Makefile src/x11/lib/fontconfig/src: Makefile Added Files: src/external/mit/expat: Makefile Makefile.inc src/external/mit/expat/bin: Makefile Makefile.inc src/external/mit/expat/bin/xmlwf: Makefile src/external/mit/expat/lib: Makefile Makefile.inc src/external/mit/expat/lib/libexpat: Makefile expat_config.h shlib_version Removed Files: src/external/mit/xorg/lib/expat: Makefile expat_config.h shlib_version src/x11/lib/expat: Makefile shlib_version Log Message: Move libexpat from X11 into base which fixes PR lib/40346. This change was approved by the Core Group. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.158 -r1.159 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.986 -r1.987 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.618 -r1.619 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.157 -r1.158 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.140 -r1.141 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1742 -r1.1743 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.211 -r1.212 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.1381 -r1.1382 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.133 -r1.134 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.1 -r1.2 src/external/mit/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/expat/Makefile \ src/external/mit/expat/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/mit/expat/bin/Makefile \ src/external/mit/expat/bin/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/mit/expat/bin/xmlwf/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/expat/lib/Makefile \ src/external/mit/expat/lib/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/mit/expat/lib/libexpat/Makefile \ src/external/mit/expat/lib/libexpat/expat_config.h \ src/external/mit/expat/lib/libexpat/shlib_version cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xmlwf/Makefile cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/Makefile cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/dri/dri.mk cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/expat/Makefile \ src/external/mit/xorg/lib/expat/shlib_version cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/expat/expat_config.h cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/fontconfig/src/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/fc-cache/Makefile cvs rdiff -u -r1.181 -r1.182 src/lib/Makefile cvs rdiff -u -r1.293 -r1.294 src/share/mk/bsd.README cvs rdiff -u -r1.66 -r1.67 src/share/mk/bsd.hostprog.mk cvs rdiff -u -r1.273 -r1.274 src/share/mk/bsd.prog.mk cvs rdiff -u -r1.10 -r1.11 src/x11/lib/Makefile cvs rdiff -u -r1.7 -r0 src/x11/lib/expat/Makefile cvs rdiff -u -r1.2 -r0 src/x11/lib/expat/shlib_version cvs rdiff -u -r1.10 -r1.11 src/x11/lib/fontconfig/src/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/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.84 src/distrib/sets/lists/base/ad.mips64eb:1.85 --- src/distrib/sets/lists/base/ad.mips64eb:1.84 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/base/ad.mips64eb Wed Feb 29 20:07:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.84 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: ad.mips64eb,v 1.85 2012/02/29 20:07:51 tron Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -93,6 +93,8 @@ ./usr/lib/64/libelf.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/libevent.so.3 base-compat-shlib compat,pic
CVS commit: xsrc/external/mit/expat/dist
Module Name:xsrc Committed By: tron Date: Wed Feb 29 20:08:50 UTC 2012 Removed Files: xsrc/external/mit/expat/dist: COPYING Changes MANIFEST Makefile.in README configure configure.in expat.dsw expat_config.h.in xsrc/external/mit/expat/dist/amiga: Makefile README.txt expat.xml expat_lib.c expat_vectors.c launch.c stdlib.c xsrc/external/mit/expat/dist/amiga/include/inline4: expat.h xsrc/external/mit/expat/dist/amiga/include/interfaces: expat.h xsrc/external/mit/expat/dist/amiga/include/libraries: expat.h xsrc/external/mit/expat/dist/amiga/include/proto: expat.h xsrc/external/mit/expat/dist/bcb5: README.txt all_projects.bpg elements.bpf elements.bpr elements.mak expat.bpf expat.bpr expat.mak expat_static.bpf expat_static.bpr expat_static.mak expatw.bpf expatw.bpr expatw.mak expatw_static.bpf expatw_static.bpr expatw_static.mak libexpat_mtd.def libexpatw_mtd.def makefile.mak outline.bpf outline.bpr outline.mak setup.bat xmlwf.bpf xmlwf.bpr xmlwf.mak xsrc/external/mit/expat/dist/conftools: PrintPath ac_c_bigendian_cross.m4 config.guess config.sub expat.m4 get-version.sh install-sh libtool.m4 ltmain.sh mkinstalldirs xsrc/external/mit/expat/dist/doc: expat.png reference.html style.css valid-xhtml10.png xmlwf.1 xmlwf.sgml xsrc/external/mit/expat/dist/examples: elements.c elements.dsp outline.c outline.dsp xsrc/external/mit/expat/dist/lib: Makefile.MPW amigaconfig.h ascii.h asciitab.h expat.dsp expat.h expat_external.h expat_static.dsp expatw.dsp expatw_static.dsp iasciitab.h internal.h latin1tab.h libexpat.def libexpatw.def macconfig.h nametab.h utf8tab.h winconfig.h xmlparse.c xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c xsrc/external/mit/expat/dist/tests: README.txt chardata.c chardata.h minicheck.c minicheck.h runtests.c runtestspp.cpp xmltest.sh xsrc/external/mit/expat/dist/tests/benchmark: README.txt benchmark.c benchmark.dsp benchmark.dsw xsrc/external/mit/expat/dist/vms: README.vms descrip.mms expat_config.h xsrc/external/mit/expat/dist/win32: MANIFEST.txt README.txt expat.iss xsrc/external/mit/expat/dist/xmlwf: codepage.c codepage.h ct.c filemap.h readfilemap.c unixfilemap.c win32filemap.c xmlfile.c xmlfile.h xmlmime.c xmlmime.h xmltchar.h xmlurl.h xmlwf.c xmlwf.dsp xmlwin32url.cxx Log Message: Move libexpat from X11 into base which fixes PR lib/40346. This change was approved by the Core Group. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/expat/dist/COPYING \ xsrc/external/mit/expat/dist/Changes \ xsrc/external/mit/expat/dist/MANIFEST \ xsrc/external/mit/expat/dist/Makefile.in \ xsrc/external/mit/expat/dist/README \ xsrc/external/mit/expat/dist/configure \ xsrc/external/mit/expat/dist/configure.in \ xsrc/external/mit/expat/dist/expat.dsw \ xsrc/external/mit/expat/dist/expat_config.h.in cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/expat/dist/amiga/Makefile \ xsrc/external/mit/expat/dist/amiga/README.txt \ xsrc/external/mit/expat/dist/amiga/expat.xml \ xsrc/external/mit/expat/dist/amiga/expat_lib.c \ xsrc/external/mit/expat/dist/amiga/expat_vectors.c \ xsrc/external/mit/expat/dist/amiga/launch.c \ xsrc/external/mit/expat/dist/amiga/stdlib.c cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/expat/dist/amiga/include/inline4/expat.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/expat/dist/amiga/include/interfaces/expat.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/expat/dist/amiga/include/libraries/expat.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/expat/dist/amiga/include/proto/expat.h cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/expat/dist/bcb5/README.txt \ xsrc/external/mit/expat/dist/bcb5/all_projects.bpg \ xsrc/external/mit/expat/dist/bcb5/elements.bpf \ xsrc/external/mit/expat/dist/bcb5/elements.bpr \ xsrc/external/mit/expat/dist/bcb5/elements.mak \ xsrc/external/mit/expat/dist/bcb5/expat.bpf \ xsrc/external/mit/expat/dist/bcb5/expat.bpr \ xsrc/external/mit/expat/dist/bcb5/expat.mak \ xsrc/external/mit/expat/dist/bcb5/expat_static.bpf \ xsrc/external/mit/expat/dist/bcb5/expat_static.bpr \ xsrc/external/mit/expat/dist/bcb5/expat_static.mak \ xsrc/external/mit/expat/dist/bcb5/expatw.bpf \ xsrc/external/mit/expat/dist/bcb5/expatw.bpr \ xsrc/external/mit/expat/dist/bcb5/expatw.mak \ xsrc/external/mit/expat/dist/bcb5/expatw_static.bpf \ xsrc/external/mit/expat/dist/bcb5/expatw_static.bpr \ xsrc/external/mit/expat/dist/bcb5/expatw_static.mak \ xsrc/external/mit/expat/dist/bcb5/libexpat_mtd.def \
CVS commit: [matt-nb5-mips64] src/sys/ufs/lfs
Module Name:src Committed By: matt Date: Wed Feb 29 22:23:56 UTC 2012 Modified Files: src/sys/ufs/lfs [matt-nb5-mips64]: lfs_vnops.c Log Message: Deal with UVM_PAGE_OWN changes. To generate a diff of this commit: cvs rdiff -u -r1.218 -r1.218.12.1 src/sys/ufs/lfs/lfs_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/sys/ufs/lfs/lfs_vnops.c diff -u src/sys/ufs/lfs/lfs_vnops.c:1.218 src/sys/ufs/lfs/lfs_vnops.c:1.218.12.1 --- src/sys/ufs/lfs/lfs_vnops.c:1.218 Tue Jun 24 10:47:32 2008 +++ src/sys/ufs/lfs/lfs_vnops.c Wed Feb 29 22:23:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_vnops.c,v 1.218 2008/06/24 10:47:32 gmcgarry Exp $ */ +/* lfs_vnops.c,v 1.218 2008/06/24 10:47:32 gmcgarry Exp */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lfs_vnops.c,v 1.218 2008/06/24 10:47:32 gmcgarry Exp $); +__KERNEL_RCSID(0, lfs_vnops.c,v 1.218 2008/06/24 10:47:32 gmcgarry Exp); #ifdef _KERNEL_OPT #include opt_compat_netbsd.h @@ -1887,7 +1887,7 @@ check_dirty(struct lfs *fs, struct vnode goto top; } pg-flags |= PG_BUSY; - UVM_PAGE_OWN(pg, lfs_putpages); + UVM_PAGE_OWN(pg, lfs_putpages, NULL); pmap_page_protect(pg, VM_PROT_NONE); tdirty = (pmap_clear_modify(pg) || @@ -1933,7 +1933,7 @@ check_dirty(struct lfs *fs, struct vnode if (pg-flags PG_WANTED) wakeup(pg); pg-flags = ~(PG_WANTED|PG_BUSY); - UVM_PAGE_OWN(pg, NULL); + UVM_PAGE_OWN(pg, NULL, NULL); } if (checkfirst any_dirty)
CVS commit: src/share/man/man4
Module Name:src Committed By: rjs Date: Wed Feb 29 22:53:47 UTC 2012 Modified Files: src/share/man/man4: pppoe.4 Log Message: Add some info on RFC4638. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/share/man/man4/pppoe.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/pppoe.4 diff -u src/share/man/man4/pppoe.4:1.34 src/share/man/man4/pppoe.4:1.35 --- src/share/man/man4/pppoe.4:1.34 Wed May 27 19:24:00 2009 +++ src/share/man/man4/pppoe.4 Wed Feb 29 22:53:47 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: pppoe.4,v 1.34 2009/05/27 19:24:00 snj Exp $ +.\ $NetBSD: pppoe.4,v 1.35 2012/02/29 22:53:47 rjs Exp $ .\ .\ Copyright (c) 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd July 4, 2006 +.Dd February 24, 2012 .Dt PPPOE 4 .Os .Sh NAME @@ -301,13 +301,19 @@ flag with .%T A Method for Transmitting PPP Over Ethernet (PPPoE) .%D February 1999 .Re +.Rs +.%R RFC +.%N 4638 +.%T Accommodating a Maximum Transit Unit/Maximum Recieve Unit (MTU/MRU) Greater Than 1492 in the Point-to-Point Protocol over Ethernet (PPPoE) +.%D September 2006 +.Re .Sh HISTORY The .Nm device appeared in .Nx 1.6 . .Sh DEVIATIONS FROM STANDARD -The PPPoE standard, +The original PPPoE standard, .Li RFC2516 , requires a maximal MTU of 1492 octets. This value is the maximum conservative @@ -319,7 +325,10 @@ many PPPoE services allow the use of (sl the problems described above. .Pp This implementation allows MTU values as large as possible with the actual -MTU of the used Ethernet interface. +MTU of the used Ethernet interface and conforms to the enhancement to the +PPPoE standard, +.Li RFC4638 , +to request the use of this larger MTU value with the PPPoE server. .Sh BUGS When using the wildcard address 0.0.0.0 (as described above) it is important to specify the proper
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: joerg Date: Wed Feb 29 23:34:02 UTC 2012 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Use uintmax_t for freqency computations to avoid differences between platforms. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/cpuctl/arch/i386.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.sbin/cpuctl/arch/i386.c diff -u src/usr.sbin/cpuctl/arch/i386.c:1.27 src/usr.sbin/cpuctl/arch/i386.c:1.28 --- src/usr.sbin/cpuctl/arch/i386.c:1.27 Fri Feb 3 05:07:17 2012 +++ src/usr.sbin/cpuctl/arch/i386.c Wed Feb 29 23:34:01 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: i386.c,v 1.27 2012/02/03 05:07:17 yamt Exp $ */ +/* $NetBSD: i386.c,v 1.28 2012/02/29 23:34:01 joerg Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: i386.c,v 1.27 2012/02/03 05:07:17 yamt Exp $); +__RCSID($NetBSD: i386.c,v 1.28 2012/02/29 23:34:01 joerg Exp $); #endif /* not lint */ #include sys/types.h @@ -1394,9 +1394,9 @@ identifycpu(const char *cpuname) aprint_normal(%s: %s, cpuname, cpu_model); if (ci-ci_tsc_freq != 0) - aprint_normal(, %qd.%02qd MHz, - (ci-ci_tsc_freq + 4999) / 100, - ((ci-ci_tsc_freq + 4999) / 1) % 100); + aprint_normal(, %ju.%02ju MHz, + ((uintmax_t)ci-ci_tsc_freq + 4999) / 100, + (((uintmax_t)ci-ci_tsc_freq + 4999) / 1) % 100); if (ci-ci_signature != 0) aprint_normal(, id 0x%x, ci-ci_signature); aprint_normal(\n);
CVS commit: src/usr.bin/unifdef
Module Name:src
Committed By: joerg
Date: Wed Feb 29 23:35:10 UTC 2012
Modified Files:
src/usr.bin/unifdef: unifdef.c
Log Message:
Pointer differences are generally not integers, so use %td here.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/unifdef/unifdef.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/unifdef/unifdef.c
diff -u src/usr.bin/unifdef/unifdef.c:1.20 src/usr.bin/unifdef/unifdef.c:1.21
--- src/usr.bin/unifdef/unifdef.c:1.20 Fri Sep 16 15:39:30 2011
+++ src/usr.bin/unifdef/unifdef.c Wed Feb 29 23:35:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: unifdef.c,v 1.20 2011/09/16 15:39:30 joerg Exp $ */
+/* $NetBSD: unifdef.c,v 1.21 2012/02/29 23:35:10 joerg Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -77,7 +77,7 @@ static const char copyright[] =
#endif
#ifdef __IDSTRING
__IDSTRING(Berkeley, @(#)unifdef.c 8.1 (Berkeley) 6/6/93);
-__IDSTRING(NetBSD, $NetBSD: unifdef.c,v 1.20 2011/09/16 15:39:30 joerg Exp $);
+__IDSTRING(NetBSD, $NetBSD: unifdef.c,v 1.21 2012/02/29 23:35:10 joerg Exp $);
__IDSTRING(dotat, $dotat: things/unifdef.c,v 1.161 2003/07/01 15:32:48 fanf2 Exp $);
#endif
#endif /* not lint */
@@ -241,7 +241,7 @@ static bool keepthis; /* do
static int exitstat; /* program exit status */
static void addsym(bool, bool, char *);
-static void debug(const char *, ...);
+static void debug(const char *, ...) __printflike(1, 2);
__dead static void done(void);
__dead static void error(const char *);
static int findsym(const char *);
@@ -736,26 +736,26 @@ eval_unary(const struct ops *ops, int *v
cp = skipcomment(*cpp);
if (*cp == '!') {
- debug(eval%d !, ops - eval_ops);
+ debug(eval%td !, ops - eval_ops);
cp++;
if (eval_unary(ops, valp, cp) == LT_IF)
return (LT_IF);
*valp = !*valp;
} else if (*cp == '(') {
cp++;
- debug(eval%d (, ops - eval_ops);
+ debug(eval%td (, ops - eval_ops);
if (eval_table(eval_ops, valp, cp) == LT_IF)
return (LT_IF);
cp = skipcomment(cp);
if (*cp++ != ')')
return (LT_IF);
} else if (isdigit((unsigned char)*cp)) {
- debug(eval%d number, ops - eval_ops);
+ debug(eval%td number, ops - eval_ops);
*valp = strtol(cp, ep, 0);
cp = skipsym(cp);
} else if (strncmp(cp, defined, 7) == 0 endsym(cp[7])) {
cp = skipcomment(cp+7);
- debug(eval%d defined, ops - eval_ops);
+ debug(eval%td defined, ops - eval_ops);
if (*cp++ != '(')
return (LT_IF);
cp = skipcomment(cp);
@@ -769,7 +769,7 @@ eval_unary(const struct ops *ops, int *v
return (LT_IF);
keepthis = false;
} else if (!endsym(*cp)) {
- debug(eval%d symbol, ops - eval_ops);
+ debug(eval%td symbol, ops - eval_ops);
sym = findsym(cp);
if (sym 0 || symlist)
return (LT_IF);
@@ -783,12 +783,12 @@ eval_unary(const struct ops *ops, int *v
cp = skipsym(cp);
keepthis = false;
} else {
- debug(eval%d bad expr, ops - eval_ops);
+ debug(eval%td bad expr, ops - eval_ops);
return (LT_IF);
}
*cpp = cp;
- debug(eval%d = %d, ops - eval_ops, *valp);
+ debug(eval%td = %d, ops - eval_ops, *valp);
return (*valp ? LT_TRUE : LT_FALSE);
}
@@ -802,7 +802,7 @@ eval_table(const struct ops *ops, int *v
const char *cp;
int val;
- debug(eval%d, ops - eval_ops);
+ debug(eval%td, ops - eval_ops);
cp = *cpp;
if (ops-inner(ops+1, valp, cp) == LT_IF)
return (LT_IF);
@@ -814,14 +814,14 @@ eval_table(const struct ops *ops, int *v
if (op-str == NULL)
break;
cp += strlen(op-str);
- debug(eval%d %s, ops - eval_ops, op-str);
+ debug(eval%td %s, ops - eval_ops, op-str);
if (ops-inner(ops+1, val, cp) == LT_IF)
return (LT_IF);
*valp = op-fn(*valp, val);
}
*cpp = cp;
- debug(eval%d = %d, ops - eval_ops, *valp);
+ debug(eval%td = %d, ops - eval_ops, *valp);
return (*valp ? LT_TRUE : LT_FALSE);
}
CVS commit: src/usr.bin/ktruss
Module Name:src
Committed By: joerg
Date: Wed Feb 29 23:35:50 UTC 2012
Modified Files:
src/usr.bin/ktruss: dump.c
Log Message:
Cast register_t to void * when printing with %p.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/ktruss/dump.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/ktruss/dump.c
diff -u src/usr.bin/ktruss/dump.c:1.39 src/usr.bin/ktruss/dump.c:1.40
--- src/usr.bin/ktruss/dump.c:1.39 Wed Feb 1 05:34:43 2012
+++ src/usr.bin/ktruss/dump.c Wed Feb 29 23:35:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.c,v 1.39 2012/02/01 05:34:43 dholland Exp $ */
+/* $NetBSD: dump.c,v 1.40 2012/02/29 23:35:49 joerg Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)kdump.c 8.4 (Berkeley) 4/28/95;
#endif
-__RCSID($NetBSD: dump.c,v 1.39 2012/02/01 05:34:43 dholland Exp $);
+__RCSID($NetBSD: dump.c,v 1.40 2012/02/29 23:35:49 joerg Exp $);
#endif /* not lint */
#include sys/param.h
@@ -112,7 +112,7 @@ void putpendq(struct ktr_entry *);
void syscallnameprint(int);
void syscallprint(struct ktr_header *);
void sysretprint(struct ktr_header *);
-int wprintf(const char *, ...);
+int wprintf(const char *, ...) __printflike(1, 2);
void *xrealloc(void *, size_t *, size_t);
int
@@ -635,7 +635,7 @@ sysretprint(struct ktr_header *kth)
} else
switch (ktr-ktr_code) {
case SYS_mmap:
- wprintf( = %p, (long)ret);
+ wprintf( = %p, (void *)ret);
break;
default:
wprintf( = %ld, (long)ret);
CVS commit: src/usr.bin/error
Module Name:src
Committed By: joerg
Date: Wed Feb 29 23:37:07 UTC 2012
Modified Files:
src/usr.bin/error: error.h touch.c
Log Message:
Don't use non-literal format strings. Split it up depending on the
number of arguments used.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/error/error.h
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/error/touch.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/error/error.h
diff -u src/usr.bin/error/error.h:1.18 src/usr.bin/error/error.h:1.19
--- src/usr.bin/error/error.h:1.18 Wed Aug 17 13:11:22 2011
+++ src/usr.bin/error/error.h Wed Feb 29 23:37:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: error.h,v 1.18 2011/08/17 13:11:22 christos Exp $ */
+/* $NetBSD: error.h,v 1.19 2012/02/29 23:37:07 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -114,7 +114,7 @@ extern const char *suffixlist;
extern boolean query;
extern boolean terse;
-int inquire(const char *, ...); /* inquire for yes/no */
+int inquire(const char *, ...) __printflike(1, 2); /* inquire for yes/no */
/*
* codes for inquire() to return
Index: src/usr.bin/error/touch.c
diff -u src/usr.bin/error/touch.c:1.26 src/usr.bin/error/touch.c:1.27
--- src/usr.bin/error/touch.c:1.26 Tue May 24 12:24:22 2011
+++ src/usr.bin/error/touch.c Wed Feb 29 23:37:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: touch.c,v 1.26 2011/05/24 12:24:22 joerg Exp $ */
+/* $NetBSD: touch.c,v 1.27 2012/02/29 23:37:07 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)touch.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: touch.c,v 1.26 2011/05/24 12:24:22 joerg Exp $);
+__RCSID($NetBSD: touch.c,v 1.27 2012/02/29 23:37:07 joerg Exp $);
#endif /* not lint */
#include sys/param.h
@@ -388,10 +388,13 @@ settotouch(const char *name)
int dest = TOSTDOUT;
if (query) {
- switch (inquire(terse
- ? Touch?
- : Do you want to touch file \%s\? ,
- name)) {
+ int reply;
+ if (terse)
+ reply = inquire(Touch? );
+ else
+ reply = inquire(Do you want to touch file \%s\? ,
+ name);
+ switch (reply) {
case Q_NO:
case Q_no:
case Q_error:
CVS commit: src/libexec/httpd
Module Name:src Committed By: joerg Date: Wed Feb 29 23:38:46 UTC 2012 Modified Files: src/libexec/httpd: dir-index-bozo.c Log Message: Avoid using computed string as format string, just print it as string. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/libexec/httpd/dir-index-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/dir-index-bozo.c diff -u src/libexec/httpd/dir-index-bozo.c:1.13 src/libexec/httpd/dir-index-bozo.c:1.14 --- src/libexec/httpd/dir-index-bozo.c:1.13 Fri Nov 18 09:51:31 2011 +++ src/libexec/httpd/dir-index-bozo.c Wed Feb 29 23:38:46 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: dir-index-bozo.c,v 1.13 2011/11/18 09:51:31 mrg Exp $ */ +/* $NetBSD: dir-index-bozo.c,v 1.14 2012/02/29 23:38:46 joerg Exp $ */ /* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */ @@ -162,7 +162,7 @@ bozo_dir_index(bozo_httpreq_t *request, i++; memset(spacebuf, ' ', (size_t)i); spacebuf[i] = '\0'; - bozo_printf(httpd, spacebuf); + bozo_printf(httpd, %s, spacebuf); l += i; if (nostat) @@ -180,7 +180,7 @@ bozo_dir_index(bozo_httpreq_t *request, i++; memset(spacebuf, ' ', (size_t)i); spacebuf[i] = '\0'; - bozo_printf(httpd, spacebuf); + bozo_printf(httpd, %s, spacebuf); bozo_printf(httpd, %7ukB, ((unsigned)((unsigned)(sb.st_size) 10)));
CVS commit: src/games/dab
Module Name:src
Committed By: joerg
Date: Wed Feb 29 23:39:53 UTC 2012
Modified Files:
src/games/dab: algor.cc board.h
Log Message:
Fix various format string mismatches.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/games/dab/algor.cc
cvs rdiff -u -r1.3 -r1.4 src/games/dab/board.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/dab/algor.cc
diff -u src/games/dab/algor.cc:1.4 src/games/dab/algor.cc:1.5
--- src/games/dab/algor.cc:1.4 Mon Apr 28 20:22:53 2008
+++ src/games/dab/algor.cc Wed Feb 29 23:39:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: algor.cc,v 1.4 2008/04/28 20:22:53 martin Exp $ */
+/* $NetBSD: algor.cc,v 1.5 2012/02/29 23:39:53 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
* algor.C: Computer algorithm
*/
#include defs.h
-RCSID($NetBSD: algor.cc,v 1.4 2008/04/28 20:22:53 martin Exp $)
+RCSID($NetBSD: algor.cc,v 1.5 2012/02/29 23:39:53 joerg Exp $)
#include algor.h
#include board.h
@@ -65,7 +65,7 @@ int ALGOR::find_closure(size_t y, size_
for (dir = BOX::first; dir BOX::last; dir++)
if (!box.isset(dir))
return 1;
- b.abort(find_closure: 3 sided box[%d,%d] has no free sides,
+ b.abort(find_closure: 3 sided box[%zu,%zu] has no free sides,
y, x);
}
}
@@ -112,7 +112,7 @@ size_t ALGOR::count_closure(size_t y, s
dir = tdir;
}
if ((mv = b.domove(ty, tx, tdir, getWho())) == -1)
- b.abort(count_closure: Invalid move (%d, %d, %d), y, x, dir);
+ b.abort(count_closure: Invalid move (%zu, %zu, %d), y, x, dir);
else
i += mv;
}
@@ -157,7 +157,7 @@ int ALGOR::try_good_turn(BOX box, size_
{
// Sanity check; we must have a good box
if (box.count() = 2)
- b.abort(try_good_turn: box[%d,%d] has more than 2 sides occupied,
+ b.abort(try_good_turn: box[%zu,%zu] has more than 2 sides occupied,
y, x);
// Make sure we don't make a closure in an adjacent box.
@@ -203,7 +203,7 @@ int ALGOR::try_bad_turn(BOX box, size_t
int last)
{
if (4 - box.count() = last)
- b.abort(try_bad_turn: Called at [%d,%d] for %d with %d,
+ b.abort(try_bad_turn: Called at [%zu,%zu] for %d with %d,
y, x, last, box.count());
for (dir = BOX::first; dir BOX::last; dir++)
if (!box.isset(dir)) {
@@ -246,7 +246,7 @@ size_t ALGOR::find_min_closure1(size_t
// Play a bad move that would cause the opponent's closure
if ((mv = nb.domove(ty, tx, tdir, getWho())) != 0)
- b.abort(find_min_closure1: Invalid move %d (%d, %d, %d), mv,
+ b.abort(find_min_closure1: Invalid move %d (%zu, %zu, %d), mv,
ty, tx, tdir);
// Count the opponent's closure
Index: src/games/dab/board.h
diff -u src/games/dab/board.h:1.3 src/games/dab/board.h:1.4
--- src/games/dab/board.h:1.3 Mon Aug 29 20:30:37 2011
+++ src/games/dab/board.h Wed Feb 29 23:39:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: board.h,v 1.3 2011/08/29 20:30:37 joerg Exp $ */
+/* $NetBSD: board.h,v 1.4 2012/02/29 23:39:53 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -72,7 +72,8 @@ class BOARD {
void games(size_t i, const PLAYER p); // Post games
void total(size_t i, const PLAYER p); // Post totals
void ties(const PLAYER p);// Post ties
-__dead void abort(const char *s, ...) const; // Algorithm error
+__printflike(2, 3) __dead
+void abort(const char *s, ...) const; // Algorithm error
private:
CVS commit: src/dist/pf/sbin/pflogd
Module Name:src
Committed By: joerg
Date: Wed Feb 29 23:42:29 UTC 2012
Modified Files:
src/dist/pf/sbin/pflogd: pflogd.c pflogd.h
Log Message:
Fix format string usage.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/dist/pf/sbin/pflogd/pflogd.c
cvs rdiff -u -r1.4 -r1.5 src/dist/pf/sbin/pflogd/pflogd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pf/sbin/pflogd/pflogd.c
diff -u src/dist/pf/sbin/pflogd/pflogd.c:1.8 src/dist/pf/sbin/pflogd/pflogd.c:1.9
--- src/dist/pf/sbin/pflogd/pflogd.c:1.8 Mon Dec 13 01:45:38 2010
+++ src/dist/pf/sbin/pflogd/pflogd.c Wed Feb 29 23:42:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pflogd.c,v 1.8 2010/12/13 01:45:38 christos Exp $ */
+/* $NetBSD: pflogd.c,v 1.9 2012/02/29 23:42:28 joerg Exp $ */
/* $OpenBSD: pflogd.c,v 1.45 2007/06/06 14:11:26 henning Exp $ */
/*
@@ -559,7 +559,7 @@ dump_packet(u_char *user, const struct p
#endif
if (len sizeof(*h) || h-caplen (size_t)cur_snaplen) {
- logmsg(LOG_NOTICE, invalid size %u (%u/%u), packet dropped,
+ logmsg(LOG_NOTICE, invalid size %zu (%u/%u), packet dropped,
len, cur_snaplen, snaplen);
packets_dropped++;
return;
@@ -770,7 +770,7 @@ main(int argc, char **argv)
logmsg(LOG_WARNING, Reading stats: %s, pcap_geterr(hpcap));
else
logmsg(LOG_NOTICE,
- %u packets received, %u/%u dropped (kernel/pflogd),
+ %u packets received, %u/%ld dropped (kernel/pflogd),
pstat.ps_recv, pstat.ps_drop, packets_dropped);
pcap_close(hpcap);
Index: src/dist/pf/sbin/pflogd/pflogd.h
diff -u src/dist/pf/sbin/pflogd/pflogd.h:1.4 src/dist/pf/sbin/pflogd/pflogd.h:1.5
--- src/dist/pf/sbin/pflogd/pflogd.h:1.4 Wed Jun 18 09:06:26 2008
+++ src/dist/pf/sbin/pflogd/pflogd.h Wed Feb 29 23:42:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pflogd.h,v 1.4 2008/06/18 09:06:26 yamt Exp $ */
+/* $NetBSD: pflogd.h,v 1.5 2012/02/29 23:42:28 joerg Exp $ */
/* $OpenBSD: pflogd.h,v 1.3 2006/01/15 16:38:04 canacar Exp $ */
/*
@@ -36,7 +36,7 @@
#define PFLOGD_MAXSNAPLEN INT_MAX
#define PFLOGD_BUFSIZE 65536 /* buffer size for incoming packets */
-void logmsg(int priority, const char *message, ...);
+void logmsg(int priority, const char *message, ...) __printflike(2, 3);
/* Privilege separation */
int priv_init(void);
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: joerg
Date: Thu Mar 1 01:12:48 UTC 2012
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/bin/tblgen: Makefile
Log Message:
Update to LLVM/Clang snapshot r151769 to get much better code for __BIT
on i386.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/llvm/bin/tblgen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.30 src/external/bsd/llvm/Makefile.inc:1.31
--- src/external/bsd/llvm/Makefile.inc:1.30 Tue Feb 28 17:09:29 2012
+++ src/external/bsd/llvm/Makefile.inc Thu Mar 1 01:12:48 2012
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.30 2012/02/28 17:09:29 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.31 2012/03/01 01:12:48 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include bsd.own.mk
-LLVM_REVISION= 151411
-CLANG_REVISION= 151411
+LLVM_REVISION= 151769
+CLANG_REVISION= 151769
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
Index: src/external/bsd/llvm/bin/tblgen/Makefile
diff -u src/external/bsd/llvm/bin/tblgen/Makefile:1.10 src/external/bsd/llvm/bin/tblgen/Makefile:1.11
--- src/external/bsd/llvm/bin/tblgen/Makefile:1.10 Wed Jan 11 23:24:46 2012
+++ src/external/bsd/llvm/bin/tblgen/Makefile Thu Mar 1 01:12:48 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/01/11 23:24:46 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2012/03/01 01:12:48 joerg Exp $
PROG_CXX= llvm-tblgen
NOMAN= yes
@@ -27,7 +27,6 @@ SRCS= AsmMatcherEmitter.cpp \
FastISelEmitter.cpp \
FixedLenDecoderEmitter.cpp \
FixedLenDecoderEmitter.h \
- InstrEnumEmitter.cpp \
InstrInfoEmitter.cpp \
IntrinsicEmitter.cpp \
PseudoLoweringEmitter.cpp \
