diff options
| author | Brian Behlendorf <[email protected]> | 2009-07-02 15:44:48 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-07-02 15:44:48 -0700 |
| commit | 9babb37438b58e77bad04e820d5702e15b79e6a6 (patch) | |
| tree | e369da81095eca3fc155b0c02bdd4a9f06506781 /module/zfs/spa_errlog.c | |
| parent | d164b2093561a9771db07346e6fffc9ca19427a2 (diff) | |
Rebase master to b117
Diffstat (limited to 'module/zfs/spa_errlog.c')
| -rw-r--r-- | module/zfs/spa_errlog.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/module/zfs/spa_errlog.c b/module/zfs/spa_errlog.c index c642bd768..ac0a20aaf 100644 --- a/module/zfs/spa_errlog.c +++ b/module/zfs/spa_errlog.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Routines to manage the on-disk persistent error log. * @@ -61,8 +59,8 @@ * lowercase hexidecimal numbers that don't overflow. */ #ifdef _KERNEL -static uint64_t -strtonum(char *str, char **nptr) +uint64_t +strtonum(const char *str, char **nptr) { uint64_t val = 0; char c; @@ -82,7 +80,8 @@ strtonum(char *str, char **nptr) str++; } - *nptr = str; + if (nptr) + *nptr = (char *)str; return (val); } |