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/common/smbsrv/smb_string.c | |
| 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/common/smbsrv/smb_string.c')
| -rw-r--r-- | usr/src/common/smbsrv/smb_string.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/common/smbsrv/smb_string.c b/usr/src/common/smbsrv/smb_string.c index 9824c8ff70..992c660c7a 100644 --- a/usr/src/common/smbsrv/smb_string.c +++ b/usr/src/common/smbsrv/smb_string.c @@ -19,6 +19,7 @@ * CDDL HEADER END */ /* + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -45,7 +46,7 @@ * Global pointer to the current codepage: defaults to ASCII, * and a flag indicating whether the codepage is Unicode or ASCII. */ -static smb_codepage_t *current_codepage = usascii_codepage; +static const smb_codepage_t *current_codepage = usascii_codepage; static boolean_t is_unicode = B_FALSE; static smb_codepage_t *smb_unicode_init(void); @@ -113,7 +114,7 @@ strcanon(char *buf, const char *class) void smb_codepage_init(void) { - smb_codepage_t *cp; + const smb_codepage_t *cp; if (is_unicode) return; |