6268963 cmd/wbem and gcc don't get along

4 files changed, 20 insertions, 20 deletions

diff --git a/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/header.sh b/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/header.sh
index e1ce45346d..b82a0ba971 100644
--- a/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/header.sh
+++ b/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/header.sh
@@ -23,7 +23,7 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -409,9 +409,9 @@ echo "" >> $HEADER
 echo "static char *classNameTable [] = {" >> $HEADER
 for x in `cat $CLASSFILE`
 do
-        echo "{\"$x\"}," >> $HEADER
+        echo "\"$x\"," >> $HEADER
 done
-echo "{\"$LIBNAME\"}};" >> $HEADER
+echo "\"$LIBNAME\"};" >> $HEADER
 
 ##############################################################
 #
@@ -421,6 +421,6 @@ echo "" >> $HEADER
 echo "static char *assocclassNameTable [] = {" >> $HEADER
 for x in `cat $ASSOCCLASSFILE`
 do
-        echo "{\"$x\"}," >> $HEADER
+        echo "\"$x\"," >> $HEADER
 done
-echo "{\"$LIBNAME\"}};" >> $HEADER
+echo "\"$LIBNAME\"};" >> $HEADER
diff --git a/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/nfs_filesystem/Solaris_NFS.c b/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/nfs_filesystem/Solaris_NFS.c
index 40f799a9e6..44cc98770c 100644
--- a/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/nfs_filesystem/Solaris_NFS.c
+++ b/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/nfs_filesystem/Solaris_NFS.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -723,7 +723,7 @@ populate_property_values(nfs_mntlist_t *nfs_mount,
 	unsigned long long	usedsize;
 	unsigned long		maxfilenamelen;
 	unsigned long		fragsize;
-	unsigned int		codeSet[1] = { {0} };
+	unsigned int		codeSet[1] = { 0 };
 	boolean_t		readonly;
 	boolean_t		optHasEquals;
 	cimchar			*codeSetValue;
diff --git a/usr/src/cmd/wbem/provider/c/wbem_disk/lib/header.sh b/usr/src/cmd/wbem/provider/c/wbem_disk/lib/header.sh
index f116909326..b82a0ba971 100644
--- a/usr/src/cmd/wbem/provider/c/wbem_disk/lib/header.sh
+++ b/usr/src/cmd/wbem/provider/c/wbem_disk/lib/header.sh
@@ -23,7 +23,7 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -409,9 +409,9 @@ echo "" >> $HEADER
 echo "static char *classNameTable [] = {" >> $HEADER
 for x in `cat $CLASSFILE`
 do
-        echo "{\"$x\"}," >> $HEADER
+        echo "\"$x\"," >> $HEADER
 done
-echo "{\"$LIBNAME\"}};" >> $HEADER
+echo "\"$LIBNAME\"};" >> $HEADER
 
 ##############################################################
 #
@@ -421,6 +421,6 @@ echo "" >> $HEADER
 echo "static char *assocclassNameTable [] = {" >> $HEADER
 for x in `cat $ASSOCCLASSFILE`
 do
-        echo "{\"$x\"}," >> $HEADER
+        echo "\"$x\"," >> $HEADER
 done
-echo "{\"$LIBNAME\"}};" >> $HEADER
+echo "\"$LIBNAME\"};" >> $HEADER
diff --git a/usr/src/lib/libdiskmgt/common/entry.c b/usr/src/lib/libdiskmgt/common/entry.c
index e898e30a15..cc760dbb83 100644
--- a/usr/src/lib/libdiskmgt/common/entry.c
+++ b/usr/src/lib/libdiskmgt/common/entry.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -60,7 +60,7 @@ dm_free_descriptor(dm_descriptor_t desc)
 	if (desc == NULL) {
 	    return;
 	}
-	dp = (descriptor_t *)desc;
+	dp = (descriptor_t *)(uintptr_t)desc;
 
 	cache_wlock();
 	cache_free_descriptor(dp);
@@ -102,7 +102,7 @@ dm_get_associated_descriptors(dm_descriptor_t desc, dm_desc_type_t type,
 	descriptor_t  *dp;
 
 
-	dp = (descriptor_t *)desc;
+	dp = (descriptor_t *)(uintptr_t)desc;
 
 	cache_wlock();
 
@@ -186,7 +186,7 @@ dm_get_attributes(dm_descriptor_t desc, int *errp)
 	nvlist_t	*attrs = NULL;
 
 
-	dp = (descriptor_t *)desc;
+	dp = (descriptor_t *)(uintptr_t)desc;
 
 	cache_rlock();
 
@@ -333,7 +333,7 @@ dm_get_name(dm_descriptor_t desc, int *errp)
 	char		*nm = NULL;
 	char		*name = NULL;
 
-	dp = (descriptor_t *)desc;
+	dp = (descriptor_t *)(uintptr_t)desc;
 
 	cache_rlock();
 
@@ -398,7 +398,7 @@ dm_get_stats(dm_descriptor_t desc, int stat_type, int *errp)
 	nvlist_t	*stats = NULL;
 
 
-	dp = (descriptor_t *)desc;
+	dp = (descriptor_t *)(uintptr_t)desc;
 
 	cache_rlock();
 
@@ -455,7 +455,7 @@ dm_get_type(dm_descriptor_t desc)
 {
 	descriptor_t  *dp;
 
-	dp = (descriptor_t *)desc;
+	dp = (descriptor_t *)(uintptr_t)desc;
 
 	cache_rlock();
 
@@ -555,7 +555,7 @@ desc_array_to_ptr_array(dm_descriptor_t *descs, int *errp)
 	}
 
 	for (i = 0; descs[i]; i++) {
-	    da[i] = (descriptor_t *)descs[i];
+	    da[i] = (descriptor_t *)(uintptr_t)descs[i];
 	}
 	*errp = 0;
 	free(descs);