diff options
| author | th199096 <none@none> | 2007-09-04 18:46:23 -0700 |
|---|---|---|
| committer | th199096 <none@none> | 2007-09-04 18:46:23 -0700 |
| commit | a3175730a459223fb8f26a2915aa0a31f6b36f98 (patch) | |
| tree | 25105e002a501b8a405470e4daaf30be71286b29 /usr/src/lib | |
| parent | b7e32555fc1a5af52617bd619aa97d5e6868f7ef (diff) | |
| download | illumos-joyent-a3175730a459223fb8f26a2915aa0a31f6b36f98.tar.gz | |
6563073 Fix cstyle in the sharefs code
6575901 libc`sharefs() and ld.so have conspired to kill smdiskless
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/common/inc/c_synonyms.h | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/inc/synonyms.h | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/mapfile-vers | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/sys/sharefs.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libshare/common/libsharecore.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/lib/common/inc/c_synonyms.h b/usr/src/lib/common/inc/c_synonyms.h index 650724957d..57030f98d4 100644 --- a/usr/src/lib/common/inc/c_synonyms.h +++ b/usr/src/lib/common/inc/c_synonyms.h @@ -820,7 +820,7 @@ extern "C" { #define setutxent _setutxent #define sfconvert _sfconvert #define sgconvert _sgconvert -#define sharefs _sharefs +#define _sharefs __sharefs #define shmat _shmat #define shmctl64 _shmctl64 #define shmctl _shmctl diff --git a/usr/src/lib/libc/inc/synonyms.h b/usr/src/lib/libc/inc/synonyms.h index 7cc9783c1a..a9af340145 100644 --- a/usr/src/lib/libc/inc/synonyms.h +++ b/usr/src/lib/libc/inc/synonyms.h @@ -940,7 +940,7 @@ extern "C" { #define s_fcntl _s_fcntl #define sfconvert _sfconvert #define sgconvert _sgconvert -#define sharefs _sharefs +#define _sharefs __sharefs #define shmat _shmat #define shmctl64 _shmctl64 #define shmctl _shmctl diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers index 235f72987b..5b8612a19c 100644 --- a/usr/src/lib/libc/port/mapfile-vers +++ b/usr/src/lib/libc/port/mapfile-vers @@ -110,7 +110,7 @@ SUNW_1.23 { # SunOS 5.11 (Solaris 11) sem_trywait; sem_unlink; sem_wait; - sharefs; + _sharefs; shm_open; shm_unlink; sigqueue; diff --git a/usr/src/lib/libc/port/sys/sharefs.c b/usr/src/lib/libc/port/sys/sharefs.c index 219964dbf4..241790aad6 100644 --- a/usr/src/lib/libc/port/sys/sharefs.c +++ b/usr/src/lib/libc/port/sys/sharefs.c @@ -25,7 +25,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak sharefs = _sharefs +#pragma weak _sharefs = __sharefs #include "synonyms.h" #include <sys/types.h> @@ -44,7 +44,7 @@ } int -sharefs(enum sharefs_sys_op opcode, struct share *sh) +_sharefs(enum sharefs_sys_op opcode, struct share *sh) { uint32_t i, j; diff --git a/usr/src/lib/libshare/common/libsharecore.c b/usr/src/lib/libshare/common/libsharecore.c index ba9d7f4b97..503a424cc6 100644 --- a/usr/src/lib/libshare/common/libsharecore.c +++ b/usr/src/lib/libshare/common/libsharecore.c @@ -2006,7 +2006,7 @@ sa_update_sharetab(sa_share_t share, char *proto) * Fill in share structure and send it to the kernel. */ (void) sa_fillshare(share, proto, &sh); - (void) sharefs(SHAREFS_ADD, &sh); + (void) _sharefs(SHAREFS_ADD, &sh); sa_emptyshare(&sh); sa_free_attr_string(path); } @@ -2036,7 +2036,7 @@ sa_delete_sharetab(char *path, char *proto) sh.sh_path = path; sh.sh_fstype = proto; - ret = sharefs(SHAREFS_REMOVE, &sh); + ret = _sharefs(SHAREFS_REMOVE, &sh); } return (ret); |