6563073 Fix cstyle in the sharefs code

6575901 libc`sharefs() and ld.so have conspired to kill smdiskless

8 files changed, 23 insertions, 23 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);
diff --git a/usr/src/uts/common/fs/sharefs/sharefs_vfsops.c b/usr/src/uts/common/fs/sharefs/sharefs_vfsops.c
index 1e6b012549..ed02061fb9 100644
--- a/usr/src/uts/common/fs/sharefs/sharefs_vfsops.c
+++ b/usr/src/uts/common/fs/sharefs/sharefs_vfsops.c
@@ -170,7 +170,7 @@ sharefs_init(int fstype, char *name)
 
 	if ((sharefs_major = getudev()) == (major_t)-1) {
 		cmn_err(CE_WARN,
-			"sharefs_init: can't get unique device number");
+		    "sharefs_init: can't get unique device number");
 		sharefs_major = 0;
 	}
 
diff --git a/usr/src/uts/common/fs/sharefs/sharefs_vnops.c b/usr/src/uts/common/fs/sharefs/sharefs_vnops.c
index c425131210..1818c4ee03 100644
--- a/usr/src/uts/common/fs/sharefs/sharefs_vnops.c
+++ b/usr/src/uts/common/fs/sharefs/sharefs_vnops.c
@@ -94,12 +94,12 @@ sharefs_snap_create(shnode_t *sft)
 
 		for (i = 0; i < SHARETAB_HASHES; i++) {
 			for (sh = sht->s_buckets[i].ssh_sh;
-					sh != NULL;
-					sh = sh->sh_next) {
+			    sh != NULL;
+			    sh = sh->sh_next) {
 				int	n;
 
 				if ((sWritten + sh->sh_size) >
-						sft->sharefs_size) {
+				    sft->sharefs_size) {
 					goto error_fault;
 				}
 
@@ -112,13 +112,13 @@ sharefs_snap_create(shnode_t *sft)
 				 * each share by the EOS marker.
 				 */
 				n = snprintf(&buf[sWritten],
-					sh->sh_size + 1,
-					"%s\t%s\t%s\t%s\t%s\n",
-					sh->sh_path,
-					sh->sh_res,
-					sh->sh_fstype,
-					sh->sh_opts,
-					sh->sh_descr);
+				    sh->sh_size + 1,
+				    "%s\t%s\t%s\t%s\t%s\n",
+				    sh->sh_path,
+				    sh->sh_res,
+				    sh->sh_fstype,
+				    sh->sh_opts,
+				    sh->sh_descr);
 
 				if (n != sh->sh_size) {
 					goto error_fault;
@@ -329,7 +329,7 @@ sharefs_read(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr,
 
 	if (len != 0) {
 		error = uiomove(sft->sharefs_snap + off,
-				len, UIO_READ, uio);
+		    len, UIO_READ, uio);
 	}
 
 	rw_exit(&sharefs_lock);
@@ -362,7 +362,7 @@ sharefs_create_root_file(vfs_t *vfsp)
 	shnode_t	*sft;
 
 	vp = gfs_root_create_file(sizeof (shnode_t),
-			vfsp, sharefs_ops_data, SHAREFS_INO_FILE);
+	    vfsp, sharefs_ops_data, SHAREFS_INO_FILE);
 
 	sft = VTOSH(vp);
 
diff --git a/usr/src/uts/common/sharefs/share.h b/usr/src/uts/common/sharefs/share.h
index 08cbe0a680..f43542f78a 100644
--- a/usr/src/uts/common/sharefs/share.h
+++ b/usr/src/uts/common/sharefs/share.h
@@ -71,12 +71,12 @@ enum sharefs_sys_op { SHAREFS_ADD, SHAREFS_REMOVE, SHAREFS_REPLACE };
 
 #ifdef _KERNEL
 
-extern int	sharefs(enum sharefs_sys_op opcode, struct share *sh,
-			uint32_t iMaxLen);
+extern int sharefs(enum sharefs_sys_op opcode, struct share *sh,
+    uint32_t iMaxLen);
 
 #else
 
-extern int	sharefs(enum sharefs_sys_op opcode, struct share *sh);
+extern int _sharefs(enum sharefs_sys_op opcode, struct share *sh);
 
 #endif