Date: Sun, 30 Nov 2008 21:04:53 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r185487 - user/peter/kinfo/sys/kern Message-ID: <200811302104.mAUL4rs6001875@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Sun Nov 30 21:04:53 2008 New Revision: 185487 URL: http://svn.freebsd.org/changeset/base/185487 Log: Properly wrap this giant block of duplicate code inside COMPAT_FREEBSD7 Modified: user/peter/kinfo/sys/kern/kern_descrip.c Modified: user/peter/kinfo/sys/kern/kern_descrip.c ============================================================================== --- user/peter/kinfo/sys/kern/kern_descrip.c Sun Nov 30 21:00:22 2008 (r185486) +++ user/peter/kinfo/sys/kern/kern_descrip.c Sun Nov 30 21:04:53 2008 (r185487) @@ -2509,7 +2509,6 @@ sysctl_kern_file(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD, 0, 0, sysctl_kern_file, "S,xfile", "Entire file table"); - /* * Sadly, the libgtop port has already been compiled for 7.1, but the code * does not do enough error checking and bad things might happen. Even @@ -2524,6 +2523,7 @@ SYSCTL_PROC(_kern, KERN_FILE, file, CTLT CTASSERT(sizeof(struct kinfo_ofile) == KINFO_OFILE_SIZE); #endif +#ifdef COMPAT_FREEBSD7 static int export_vnode_for_osysctl(struct vnode *vp, int type, struct kinfo_ofile *kif, struct filedesc *fdp, struct sysctl_req *req) @@ -2766,7 +2766,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLE static SYSCTL_NODE(_kern_proc, KERN_PROC_OFILEDESC, ofiledesc, CTLFLAG_RD, sysctl_kern_proc_ofiledesc, "Process ofiledesc entries"); - +#endif /* COMPAT_FREEBSD7 */ #ifdef KINFO_FILE_SIZE CTASSERT(sizeof(struct kinfo_file) == KINFO_FILE_SIZE);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811302104.mAUL4rs6001875>