Module Name: src
Committed By: christos
Date: Mon Jul 18 02:47:52 UTC 2011
Modified Files:
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c
Log Message:
better fix for gcc uninitialized.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.13 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.14
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.13 Sun Jul 17 20:43:35 2011
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sun Jul 17 22:47:52 2011
@@ -6939,8 +6939,12 @@
#if defined(sun)
if (cr == NULL || PRIV_POLICY_ONLY(cr, PRIV_ALL, B_FALSE)) {
/*
- * For DTRACE_PRIV_ALL, the uid and zoneid don't matter.
+ * For DTRACE_PRIV_ALL, the uid and zoneid don't matter,
+ * but for GCC they do.
*/
+ *uidp = 0;
+ *zoneidp = 0;
+
priv = DTRACE_PRIV_ALL;
} else {
*uidp = crgetuid(cr);
@@ -6960,6 +6964,8 @@
}
#else
priv = DTRACE_PRIV_ALL;
+ *uidp = 0;
+ *zoneidp = 0;
#endif
*privp = priv;
@@ -8092,8 +8098,8 @@
{
dtrace_probekey_t pkey;
uint32_t priv;
- uid_t uid = 0; /* XXX: gcc */
- zoneid_t zoneid = 0; /* XXX: gcc */
+ uid_t uid;
+ zoneid_t zoneid;
ASSERT(MUTEX_HELD(&dtrace_lock));
dtrace_ecb_create_cache = NULL;
