git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebase master to b117
[zfs.git]
/
module
/
zfs
/
spa_errlog.c
diff --git
a/module/zfs/spa_errlog.c
b/module/zfs/spa_errlog.c
index
c642bd7
..
ac0a20a
100644
(file)
--- a/
module/zfs/spa_errlog.c
+++ b/
module/zfs/spa_errlog.c
@@
-19,12
+19,10
@@
* CDDL HEADER END
*/
/*
* CDDL HEADER END
*/
/*
- * Copyright 200
8
Sun Microsystems, Inc. All rights reserved.
+ * Copyright 200
9
Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Routines to manage the on-disk persistent error log.
*
/*
* Routines to manage the on-disk persistent error log.
*
@@
-61,8
+59,8
@@
* lowercase hexidecimal numbers that don't overflow.
*/
#ifdef _KERNEL
* lowercase hexidecimal numbers that don't overflow.
*/
#ifdef _KERNEL
-
static
uint64_t
-strtonum(char *str, char **nptr)
+uint64_t
+strtonum(c
onst c
har *str, char **nptr)
{
uint64_t val = 0;
char c;
{
uint64_t val = 0;
char c;
@@
-82,7
+80,8
@@
strtonum(char *str, char **nptr)
str++;
}
str++;
}
- *nptr = str;
+ if (nptr)
+ *nptr = (char *)str;
return (val);
}
return (val);
}