diff options
| author | peter <peter@FreeBSD.org> | 1999-05-09 16:04:14 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-05-09 16:04:14 +0000 |
| commit | 5350e97b5abcf4b8708d21566bc597a726853519 (patch) | |
| tree | d21e89313019628f57dd161c5e864394cfbc7d9f /sys | |
| parent | 586a0280e6e145819a839cca9112964648c6161f (diff) | |
| download | FreeBSD-src-5350e97b5abcf4b8708d21566bc597a726853519.zip FreeBSD-src-5350e97b5abcf4b8708d21566bc597a726853519.tar.gz | |
Fix a couple of warnings and some bitrot in comments.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 4 | ||||
| -rw-r--r-- | sys/compat/svr4/imgact_svr4.c | 4 | ||||
| -rw-r--r-- | sys/i386/ibcs2/imgact_coff.c | 6 | ||||
| -rw-r--r-- | sys/i386/linux/imgact_linux.c | 7 | ||||
| -rw-r--r-- | sys/i386/linux/linux_ioctl.c | 4 | ||||
| -rw-r--r-- | sys/kern/imgact_aout.c | 4 | ||||
| -rw-r--r-- | sys/kern/imgact_elf.c | 4 | ||||
| -rw-r--r-- | sys/kern/imgact_gzip.c | 5 | ||||
| -rw-r--r-- | sys/kern/imgact_shell.c | 4 | ||||
| -rw-r--r-- | sys/svr4/imgact_svr4.c | 4 |
10 files changed, 16 insertions, 30 deletions
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 3b4efd9..30f94d6 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_ioctl.c,v 1.31 1999/04/29 04:37:57 luoqi Exp $ + * $Id: linux_ioctl.c,v 1.32 1999/05/06 18:44:22 peter Exp $ */ #include <sys/param.h> @@ -484,6 +484,7 @@ struct linux_cdrom_tocentry u_char cdte_datamode; }; +#if 0 static void linux_to_bsd_msf_lba(u_char address_format, union linux_cdrom_addr *lp, union msf_lba *bp) @@ -496,6 +497,7 @@ linux_to_bsd_msf_lba(u_char address_format, bp->msf.frame = lp->msf.frame; } } +#endif static void bsd_to_linux_msf_lba(u_char address_format, diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c index c3a0be6..5c2dc0d 100644 --- a/sys/compat/svr4/imgact_svr4.c +++ b/sys/compat/svr4/imgact_svr4.c @@ -229,9 +229,7 @@ exec_svr4_imgact(imgp) /* * Tell kern_execve.c about it, with a little help from the linker. - * Since `const' objects end up in the text segment, TEXT_SET is the - * correct directive to use. */ -const struct execsw svr4_execsw = { exec_svr4_imgact, "svr4 ELF" }; +const execsw svr4_execsw = { exec_svr4_imgact, "svr4 ELF" }; EXEC_SET(execsw_set, svr4_execsw); diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index da41412..3c70d00 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_coff.c,v 1.34 1999/01/17 20:39:08 peter Exp $ + * $Id: imgact_coff.c,v 1.35 1999/01/28 01:59:52 dillon Exp $ */ #include <sys/param.h> @@ -474,8 +474,6 @@ exec_coff_imgact(imgp) /* * Tell kern_execve.c about it, with a little help from the linker. - * Since `const' objects end up in the text segment, TEXT_SET is the - * correct directive to use. */ -static const struct execsw coff_execsw = { exec_coff_imgact, "coff" }; +static struct execsw coff_execsw = { exec_coff_imgact, "coff" }; EXEC_SET(coff, coff_execsw); diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 59ee247..3850a4d 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_linux.c,v 1.30 1998/10/16 03:55:00 peter Exp $ + * $Id: imgact_linux.c,v 1.31 1999/01/17 20:36:14 peter Exp $ */ #include <sys/param.h> @@ -233,9 +233,6 @@ exec_linux_imgact(imgp) /* * Tell kern_execve.c about it, with a little help from the linker. - * Since `const' objects end up in the text segment, TEXT_SET is the - * correct directive to use. */ -static const struct execsw linux_execsw = { exec_linux_imgact, "linux a.out" }; +static struct execsw linux_execsw = { exec_linux_imgact, "linux a.out" }; EXEC_SET(linuxaout, linux_execsw); - diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c index 3b4efd9..30f94d6 100644 --- a/sys/i386/linux/linux_ioctl.c +++ b/sys/i386/linux/linux_ioctl.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_ioctl.c,v 1.31 1999/04/29 04:37:57 luoqi Exp $ + * $Id: linux_ioctl.c,v 1.32 1999/05/06 18:44:22 peter Exp $ */ #include <sys/param.h> @@ -484,6 +484,7 @@ struct linux_cdrom_tocentry u_char cdte_datamode; }; +#if 0 static void linux_to_bsd_msf_lba(u_char address_format, union linux_cdrom_addr *lp, union msf_lba *bp) @@ -496,6 +497,7 @@ linux_to_bsd_msf_lba(u_char address_format, bp->msf.frame = lp->msf.frame; } } +#endif static void bsd_to_linux_msf_lba(u_char address_format, diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index 0092aeb..8378f43 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_aout.c,v 1.48 1999/03/10 07:07:42 alc Exp $ + * $Id: imgact_aout.c,v 1.49 1999/04/03 22:20:01 jdp Exp $ */ #include <sys/param.h> @@ -309,8 +309,6 @@ out: /* * Tell kern_execve.c about it, with a little help from the linker. - * Since `const' objects end up in the text segment, TEXT_SET is the - * correct directive to use. */ static struct execsw aout_execsw = { exec_aout_imgact, "a.out" }; EXEC_SET(aout, aout_execsw); diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 8aadb7e..c1fef52 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_elf.c,v 1.54 1999/02/19 14:25:34 luoqi Exp $ + * $Id: imgact_elf.c,v 1.55 1999/02/20 23:52:34 jdp Exp $ */ #include "opt_rlimit.h" @@ -1028,8 +1028,6 @@ elf_putnote(void *dst, size_t *off, const char *name, int type, /* * Tell kern_execve.c about it, with a little help from the linker. - * Since `const' objects end up in the text segment, TEXT_SET is the - * correct directive to use. */ static struct execsw elf_execsw = {exec_elf_imgact, "ELF"}; EXEC_SET(elf, elf_execsw); diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c index 35cfe43..0c410f3 100644 --- a/sys/kern/imgact_gzip.c +++ b/sys/kern/imgact_gzip.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: imgact_gzip.c,v 1.35 1998/10/16 03:55:00 peter Exp $ + * $Id: imgact_gzip.c,v 1.36 1999/01/29 22:59:43 dillon Exp $ * * This module handles execution of a.out files which have been run through * "gzip". This saves diskspace, but wastes cpu-cycles and VM. @@ -370,9 +370,6 @@ Flush(void *vp, u_char * ptr, u_long siz) /* * Tell kern_execve.c about it, with a little help from the linker. - * Since `const' objects end up in the text segment, TEXT_SET is the - * correct directive to use. */ - static struct execsw gzip_execsw = {exec_gzip_imgact, "gzip"}; EXEC_SET(execgzip, gzip_execsw); diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c index 361cf18..4a6e6f7 100644 --- a/sys/kern/imgact_shell.c +++ b/sys/kern/imgact_shell.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_shell.c,v 1.17 1998/10/16 03:55:00 peter Exp $ + * $Id: imgact_shell.c,v 1.18 1999/01/29 22:59:43 dillon Exp $ */ #include <sys/param.h> @@ -131,8 +131,6 @@ exec_shell_imgact(imgp) /* * Tell kern_execve.c about it, with a little help from the linker. - * Since `const' objects end up in the text segment, TEXT_SET is the - * correct directive to use. */ static struct execsw shell_execsw = { exec_shell_imgact, "#!" }; EXEC_SET(shell, shell_execsw); diff --git a/sys/svr4/imgact_svr4.c b/sys/svr4/imgact_svr4.c index c3a0be6..5c2dc0d 100644 --- a/sys/svr4/imgact_svr4.c +++ b/sys/svr4/imgact_svr4.c @@ -229,9 +229,7 @@ exec_svr4_imgact(imgp) /* * Tell kern_execve.c about it, with a little help from the linker. - * Since `const' objects end up in the text segment, TEXT_SET is the - * correct directive to use. */ -const struct execsw svr4_execsw = { exec_svr4_imgact, "svr4 ELF" }; +const execsw svr4_execsw = { exec_svr4_imgact, "svr4 ELF" }; EXEC_SET(execsw_set, svr4_execsw); |
