[src/trunk]: src/sys/ufs/chfs Don't shadow some stupid function defined globa...

[ahoka <ahoka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b76a5b4d5d21
branches:  trunk
changeset: 771565:b76a5b4d5d21
user:      ahoka <ahoka%NetBSD.org@localhost>
date:      Fri Nov 25 11:15:24 2011 +0000

description:
Don't shadow some stupid function defined globally in random platforms.

diffstat:

 sys/ufs/chfs/ebh.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 5c70977e9a74 -r b76a5b4d5d21 sys/ufs/chfs/ebh.c
--- a/sys/ufs/chfs/ebh.c        Fri Nov 25 09:00:51 2011 +0000
+++ b/sys/ufs/chfs/ebh.c        Fri Nov 25 11:15:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ebh.c,v 1.1 2011/11/24 15:51:32 ahoka Exp $    */
+/*     $NetBSD: ebh.c,v 1.2 2011/11/25 11:15:24 ahoka Exp $    */
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -1369,16 +1369,17 @@
 {
        int err, erase_cnt, leb_status;
        uint64_t max_serial;
-       bool isbad;
+       /* isbad() is defined on some ancient platforms, heh */
+       bool is_bad;
 
        /* Check block is bad */
        err = flash_block_isbad(ebh->flash_dev,
-           pebnr * ebh->flash_if->erasesize, &isbad);
+           pebnr * ebh->flash_if->erasesize, &is_bad);
        if (err) {
                chfs_err("checking block is bad failed\n");
                return err;
        }
-       if (isbad) {
+       if (is_bad) {
                si->bad_peb_cnt++;
                return 0;
        }