From 79fc2be66fc6087db41a5057877e6ae8b319e57c Mon Sep 17 00:00:00 2001 From: miod Date: Wed, 14 Jan 2015 19:02:59 +0000 Subject: [PATCH] Make x[dy]c_e2str return a const char *. Remove obsolete comments in x[dy]dump(). --- sys/arch/sparc/dev/xd.c | 19 +++---------------- sys/arch/sparc/dev/xy.c | 19 +++---------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c index b7026d86b48..ee58b1691cf 100644 --- a/sys/arch/sparc/dev/xd.c +++ b/sys/arch/sparc/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.65 2015/01/14 19:01:00 miod Exp $ */ +/* $OpenBSD: xd.c,v 1.66 2015/01/14 19:02:59 miod Exp $ */ /* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */ /* @@ -204,7 +204,7 @@ extern int pil_to_vme[]; /* from obio.c */ /* internals */ int xdc_cmd(struct xdc_softc *, int, int, int, int, int, char *, int); -char *xdc_e2str(int); +const char *xdc_e2str(int); int xdc_error(struct xdc_softc *, struct xd_iorq *, struct xd_iopb *, int, int); void xdc_perror(struct xd_iorq *, struct xd_iopb *, int); @@ -785,19 +785,6 @@ xddump(dev, blkno, va, size) 'a' + part); return ENXIO; - - /* outline: globals: "dumplo" == sector number of partition to start - * dump at (convert to physical sector with partition table) - * "dumpsize" == size of dump in clicks "physmem" == size of physical - * memory (clicks, ptoa() to get bytes) (normal case: dumpsize == - * physmem) - * - * dump a copy of physical memory to the dump device starting at sector - * "dumplo" in the swap partition (make sure > 0). map in pages as - * we go. use polled I/O. - * - * XXX how to handle NON_CONTIG? */ - } /* @@ -2117,7 +2104,7 @@ xdc_tick(arg) /* * xdc_e2str: convert error code number into an error string */ -char * +const char * xdc_e2str(no) int no; { diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index 8a16c28f900..8d7aebd1e99 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.62 2015/01/14 19:01:00 miod Exp $ */ +/* $OpenBSD: xy.c,v 1.63 2015/01/14 19:02:59 miod Exp $ */ /* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */ /* @@ -140,7 +140,7 @@ extern int pil_to_vme[]; /* from obio.c */ /* internals */ struct xy_iopb *xyc_chain(struct xyc_softc *, struct xy_iorq *); int xyc_cmd(struct xyc_softc *, int, int, int, int, int, char *, int); -char *xyc_e2str(int); +const char *xyc_e2str(int); int xyc_entoact(int); int xyc_error(struct xyc_softc *, struct xy_iorq *, struct xy_iopb *, int); @@ -742,19 +742,6 @@ xydump(dev, blkno, va, size) 'a' + part); return ENXIO; - - /* outline: globals: "dumplo" == sector number of partition to start - * dump at (convert to physical sector with partition table) - * "dumpsize" == size of dump in clicks "physmem" == size of physical - * memory (clicks, ptoa() to get bytes) (normal case: dumpsize == - * physmem) - * - * dump a copy of physical memory to the dump device starting at sector - * "dumplo" in the swap partition (make sure > 0). map in pages as - * we go. use polled I/O. - * - * XXX how to handle NON_CONTIG? */ - } /* @@ -1926,7 +1913,7 @@ xyc_tick(arg) /* * xyc_e2str: convert error code number into an error string */ -char * +const char * xyc_e2str(no) int no; { -- 2.20.1