diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-04-29 04:46:19 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-04-29 04:46:19 +0000 |
| commit | 8251f6e97f202d8bcbee85420c1fa5164854bce1 (patch) | |
| tree | 712992aacd94565c687543df39093403195346bd /usr/src/lib/libc | |
| parent | c119c338b0fdc54642dc9718a65dbf3dca158822 (diff) | |
| parent | 3e5de5d019b8b1edc6c40c035fa29f3a41341841 (diff) | |
| download | illumos-joyent-8251f6e97f202d8bcbee85420c1fa5164854bce1.tar.gz | |
[illumos-gate merge]
commit 3e5de5d019b8b1edc6c40c035fa29f3a41341841
5863 psiginfo arguments should be const
commit 4b92079ba1c38eb015d4df99305947dbeccbb80d
5861 clean up obsolete init scripts
commit 8622ec4569457733001d4982ef7f5b44427069be
1527 SMB server in non-global zones
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/port/gen/psiginfo.c | 5 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/llib-lc | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/lib/libc/port/gen/psiginfo.c b/usr/src/lib/libc/port/gen/psiginfo.c index 6775fef969..e7cf46abef 100644 --- a/usr/src/lib/libc/port/gen/psiginfo.c +++ b/usr/src/lib/libc/port/gen/psiginfo.c @@ -18,6 +18,9 @@ * * CDDL HEADER END */ +/* + * Copyright 2015 Circonus, Inc. All rights reserved. + */ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. @@ -44,7 +47,7 @@ #define strsignal(i) (_libc_gettext(_sys_siglistp[i])) void -psiginfo(siginfo_t *sip, char *s) +psiginfo(const siginfo_t *sip, const char *s) { char buf[256]; char *c; diff --git a/usr/src/lib/libc/port/llib-lc b/usr/src/lib/libc/port/llib-lc index 34a1e30481..41c7ecf879 100644 --- a/usr/src/lib/libc/port/llib-lc +++ b/usr/src/lib/libc/port/llib-lc @@ -26,6 +26,7 @@ * Copyright (c) 2013 Gary Mills * Copyright 2014 Garrett D'Amore <garrett@damore.org> * Copyright 2015 Joyent, Inc. + * Copyright 2015 Circonus, Inc. All rights reserved. */ /* LINTLIBRARY */ @@ -764,7 +765,7 @@ void perror(const char *s); int pipe(int *fds); /* psiginfo.c */ -void psiginfo(siginfo_t *sip, char *s); +void psiginfo(const siginfo_t *sip, const char *s); /* psignal.c */ void psignal(int sig, const char *s); |