From 2f970352f7b2a33caad161f95721021750494718 Mon Sep 17 00:00:00 2001 From: ps Date: Wed, 28 Mar 2001 01:37:29 +0000 Subject: Last commit was broken.. It always prints '[CTRL-C to abort]'. Move duplicate code for printing the status of the dump and checking for abort into a separate function. Pointy hat to: me --- sys/dev/ida/ida_disk.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'sys/dev/ida') diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c index d2d99f5..0aaeadc 100644 --- a/sys/dev/ida/ida_disk.c +++ b/sys/dev/ida/ida_disk.c @@ -232,22 +232,12 @@ idad_dump(dev_t dev) if (error) return (error); - if (addr % (1024 * 1024) == 0) { -#ifdef HW_WDOG - if (wdog_tickler) - (*wdog_tickler)(); -#endif - printf("%ld ", (long)(count * DEV_BSIZE)/(1024 * 1024)); - } + if (dumpstatus(addr, (long)(count * DEV_BSIZE)) < 0) + return (EINTR); blkno += blkcnt * dumppages; count -= blkcnt * dumppages; addr += PAGE_SIZE * dumppages; - - if (cncheckc() == 0x03) - return (EINTR); - else - printf("[CTRL-C to abort] "); } return (0); } -- cgit v1.1