diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-10-11 16:00:17 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-10-11 16:00:17 +0100 |
| commit | c00ed4fa5a593e8e48ded4fb5ad22ecf0348f01d (patch) | |
| tree | 909f29a065a94e61f2919a39f46a243c3f5c295b /usr/src/common/util/strtol.c | |
| parent | d322ce9e5e9bb437d93bf09b5354eede23491de7 (diff) | |
| parent | ea3068a71489464a7cde899773f9ae3541209461 (diff) | |
| download | illumos-joyent-c00ed4fa5a593e8e48ded4fb5ad22ecf0348f01d.tar.gz | |
Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade
Conflicts:
usr/src/cmd/avs/dsw/iiadm.c
Diffstat (limited to 'usr/src/common/util/strtol.c')
| -rw-r--r-- | usr/src/common/util/strtol.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/usr/src/common/util/strtol.c b/usr/src/common/util/strtol.c index 8a67da740f..e46e86b7d1 100644 --- a/usr/src/common/util/strtol.c +++ b/usr/src/common/util/strtol.c @@ -20,6 +20,10 @@ */ /* + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + */ + +/* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -96,6 +100,7 @@ strtol(const char *str, char **nptr, int base) #if defined(_KERNEL) && !defined(_BOOT) return (EINVAL); #else /* _KERNEL && !_BOOT */ + errno = EINVAL; return (0); #endif /* _KERNEL && !_BOOT */ } |