--- a/usr/src/cmd/availdevs/availdevs.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/cmd/availdevs/availdevs.c Tue Jan 26 20:03:58 2010 -0800
@@ -18,13 +18,12 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include "availdevs.h"
#include <libzfs.h>
#include <libzfs_jni_diskmgt.h>
@@ -58,7 +57,7 @@
{
static char tmp[64];
(void) snprintf(tmp, sizeof (tmp), "%llu", value);
- xmlSetProp(node, (xmlChar *)attr, (xmlChar *)tmp);
+ (void) xmlSetProp(node, (xmlChar *)attr, (xmlChar *)tmp);
}
static int
@@ -69,19 +68,19 @@
xmlNodePtr disk = xmlNewChild(
available, NULL, (xmlChar *)ELEMENT_DISK, NULL);
- xmlSetProp(disk,
+ (void) xmlSetProp(disk,
(xmlChar *)ATTR_DISK_NAME, (xmlChar *)dp->name);
set_uint64_prop(disk, ATTR_DISK_SIZE, dp->size);
- xmlSetProp(disk, (xmlChar *)ATTR_DISK_INUSE, (xmlChar *)
+ (void) xmlSetProp(disk, (xmlChar *)ATTR_DISK_INUSE, (xmlChar *)
(dp->in_use ? VAL_ATTR_TRUE : VAL_ATTR_FALSE));
if (dp->aliases != NULL) {
for (i = 0; dp->aliases[i] != NULL; i++) {
xmlNodePtr alias = xmlNewChild(
disk, NULL, (xmlChar *)ELEMENT_ALIAS, NULL);
- xmlSetProp(alias,
+ (void) xmlSetProp(alias,
(xmlChar *)ATTR_ALIAS_NAME,
(xmlChar *)dp->aliases[i]);
}
@@ -92,20 +91,21 @@
dmgt_slice_t *sp = dp->slices[i];
xmlNodePtr slice = xmlNewChild(
disk, NULL, (xmlChar *)ELEMENT_SLICE, NULL);
- xmlSetProp(slice,
+ (void) xmlSetProp(slice,
(xmlChar *)ATTR_SLICE_NAME, (xmlChar *)sp->name);
set_uint64_prop(slice, ATTR_SLICE_SIZE, sp->size);
set_uint64_prop(slice, ATTR_SLICE_START, sp->start);
if (sp->used_name != NULL) {
- xmlSetProp(slice,
+ (void) xmlSetProp(slice,
(xmlChar *)ATTR_SLICE_USED_NAME,
(xmlChar *)sp->used_name);
}
if (sp->used_by != NULL) {
- xmlSetProp(slice, (xmlChar *)ATTR_SLICE_USED_BY,
+ (void) xmlSetProp(slice,
+ (xmlChar *)ATTR_SLICE_USED_BY,
(xmlChar *)sp->used_by);
}
}
@@ -139,7 +139,7 @@
}
pool = xmlNewChild(importable, NULL, (xmlChar *)ELEMENT_POOL, NULL);
- xmlSetProp(pool, (xmlChar *)ATTR_POOL_NAME, (xmlChar *)name);
+ (void) xmlSetProp(pool, (xmlChar *)ATTR_POOL_NAME, (xmlChar *)name);
set_uint64_prop(pool, ATTR_POOL_ID, guid);
set_uint64_prop(pool, ATTR_POOL_VERSION, version);
@@ -159,16 +159,16 @@
set_uint64_prop(pool, ATTR_POOL_CHECKSUM_ERRORS,
vs->vs_checksum_errors);
- xmlSetProp(pool, (xmlChar *)ATTR_DEVICE_STATE,
+ (void) xmlSetProp(pool, (xmlChar *)ATTR_DEVICE_STATE,
(xmlChar *)zjni_vdev_state_to_str(vs->vs_state));
- xmlSetProp(pool, (xmlChar *)ATTR_DEVICE_STATUS,
+ (void) xmlSetProp(pool, (xmlChar *)ATTR_DEVICE_STATUS,
(xmlChar *)zjni_vdev_aux_to_str(vs->vs_aux));
- xmlSetProp(pool, (xmlChar *)ATTR_POOL_STATE,
+ (void) xmlSetProp(pool, (xmlChar *)ATTR_POOL_STATE,
(xmlChar *)zjni_pool_state_to_str(state));
- xmlSetProp(pool, (xmlChar *)ATTR_POOL_STATUS, (xmlChar *)
+ (void) xmlSetProp(pool, (xmlChar *)ATTR_POOL_STATUS, (xmlChar *)
zjni_pool_status_to_str(zpool_import_status(config, &c)));
return (0);
@@ -183,7 +183,7 @@
/* Create the root node */
xmlNodePtr root = xmlNewDocNode(
doc, NULL, (xmlChar *)ELEMENT_ROOT, NULL);
- xmlAddChild((xmlNodePtr) doc, (xmlNodePtr)root);
+ (void) xmlAddChild((xmlNodePtr) doc, (xmlNodePtr)root);
return (doc);
}
@@ -251,7 +251,7 @@
if (!error) {
/* Print out XML */
- xmlDocFormatDump(stdout, doc, 1);
+ (void) xmlDocFormatDump(stdout, doc, 1);
}
xmlFreeDoc(doc);
--- a/usr/src/cmd/mdb/sparc/kmdb/kaif.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/cmd/mdb/sparc/kmdb/kaif.c Tue Jan 26 20:03:58 2010 -0800
@@ -18,13 +18,12 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* The debugger/PROM interface
*/
@@ -334,7 +333,8 @@
if (len == 8)
return (0xff);
- for (pow = 0; len > 1; len /= 256, pow++);
+ for (pow = 0; len > 1; len /= 256, pow++)
+ ;
return (~((1 << pow) - 1));
}
@@ -878,13 +878,13 @@
void
kaif_trap_set_debugger(void)
{
- set_tba(kaif_tba);
+ (void) set_tba((void *)kaif_tba);
}
void
kaif_trap_set_saved(kaif_cpusave_t *save)
{
- set_tba((caddr_t)save->krs_gregs.kregs[KREG_TBA]);
+ (void) set_tba((void *)save->krs_gregs.kregs[KREG_TBA]);
}
static void
@@ -930,7 +930,7 @@
* saved when the debugger was initially entered. It'll be saved in
* the cpusave area for the current CPU.
*/
- set_tba((caddr_t)kaif_cpusave[cpuid].krs_gregs.kregs[KREG_TBA]);
+ (void) set_tba((void *)kaif_cpusave[cpuid].krs_gregs.kregs[KREG_TBA]);
kmdb_kdi_kernpanic(®s, kaif_cb_save.krs_gregs.kregs[KREG_TT]);
}
--- a/usr/src/cmd/mdb/sparc/kmdb/kmdb_asmutil.h Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/cmd/mdb/sparc/kmdb/kmdb_asmutil.h Tue Jan 26 20:03:58 2010 -0800
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,16 +18,15 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#ifndef _KMDB_ASMUTIL_H
#define _KMDB_ASMUTIL_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/types.h>
#ifdef __cplusplus
@@ -43,7 +41,7 @@
extern void interrupts_on(void);
extern void interrupts_off(void);
extern caddr_t get_tba(void);
-extern void set_tba(caddr_t);
+extern void *set_tba(void *);
extern uint64_t rdasi(uint32_t, uintptr_t);
extern void wrasi(uint32_t, uintptr_t, uint64_t);
--- a/usr/src/cmd/mdb/sparc/kmdb/kmdb_asmutil.s Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/cmd/mdb/sparc/kmdb/kmdb_asmutil.s Tue Jan 26 20:03:58 2010 -0800
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,13 +18,12 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Utility Assembly routines used by the debugger.
*/
@@ -120,9 +118,10 @@
#if defined(__lint)
/*ARGSUSED*/
-void
-set_tba(caddr_t new)
+void *
+set_tba(void *new)
{
+ return (0);
}
#else
--- a/usr/src/lib/fm/topo/modules/SUNW,SPARC-Enterprise/ioboard/opl_hostbridge.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/SUNW,SPARC-Enterprise/ioboard/opl_hostbridge.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,12 +20,10 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <string.h>
#include <strings.h>
#include <libdevinfo.h>
@@ -153,13 +151,13 @@
topo_mod_dprintf(mp,
"dev:///%s fmri creation failed.\n",
dnpath);
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
di_devfs_path_free(dnpath);
return (NULL);
}
if (topo_node_asru_set(rcn, fmri, 0, &err) < 0) {
topo_mod_dprintf(mp, "topo_node_asru_set failed\n");
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
nvlist_free(fmri);
di_devfs_path_free(dnpath);
return (NULL);
@@ -177,13 +175,13 @@
if (topo_pgroup_create(rcn, &io_pgroup, &err) < 0) {
topo_mod_dprintf(mp, "topo_pgroup_create failed\n");
di_devfs_path_free(dnpath);
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
return (NULL);
}
if (topo_pgroup_create(rcn, &pci_pgroup, &err) < 0) {
topo_mod_dprintf(mp, "topo_pgroup_create failed\n");
di_devfs_path_free(dnpath);
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
return (NULL);
}
/* Add the devfs path property */
@@ -192,7 +190,7 @@
TOPO_PROP_IMMUTABLE, dnpath, &err) != 0) {
topo_mod_dprintf(mp, "Failed to set DEV property\n");
di_devfs_path_free(dnpath);
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
}
di_devfs_path_free(dnpath);
}
@@ -226,7 +224,7 @@
}
/* Make room for children */
- topo_node_range_create(mp, rcn, PCIEX_BUS, 0, OPL_BUS_MAX);
+ (void) topo_node_range_create(mp, rcn, PCIEX_BUS, 0, OPL_BUS_MAX);
return (rcn);
}
@@ -249,7 +247,7 @@
(void) topo_node_label_set(hbn, NULL, &err);
/* Make room for children */
- topo_node_range_create(mp, hbn, PCIEX_ROOT, 0, OPL_RC_MAX);
+ (void) topo_node_range_create(mp, hbn, PCIEX_ROOT, 0, OPL_RC_MAX);
return (hbn);
}
--- a/usr/src/lib/fm/topo/modules/SUNW,SPARC-Enterprise/ioboard/opl_ioboard.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/SUNW,SPARC-Enterprise/ioboard/opl_ioboard.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,12 +20,10 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* SUNW,OPL-Enterprise platform ioboard topology enumerator
*/
@@ -75,7 +73,7 @@
topo_mod_setdebug(modhdl);
topo_mod_dprintf(modhdl, "initializing ioboard enumerator\n");
- topo_mod_register(modhdl, &IobInfo, TOPO_VERSION);
+ (void) topo_mod_register(modhdl, &IobInfo, TOPO_VERSION);
}
void
--- a/usr/src/lib/fm/topo/modules/sun4/ioboard/ioboard.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4/ioboard/ioboard.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,12 +20,10 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <string.h>
#include <sys/fm/protocol.h>
#include <fm/topo_mod.h>
@@ -80,7 +78,7 @@
topo_mod_setdebug(modhdl);
topo_mod_dprintf(modhdl, "initializing ioboard enumerator\n");
- topo_mod_register(modhdl, &Iob_info, TOPO_VERSION);
+ (void) topo_mod_register(modhdl, &Iob_info, TOPO_VERSION);
topo_mod_dprintf(modhdl, "Ioboard enumr initd\n");
}
--- a/usr/src/lib/fm/topo/modules/sun4v/cpuboard/cpuboard.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/cpuboard/cpuboard.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -174,7 +174,7 @@
continue;
}
if ((id >= CPUBOARD_MAX) || cpubs[id].present) {
- topo_mod_seterrno(mod, EMOD_NVL_INVAL);
+ (void) topo_mod_seterrno(mod, EMOD_NVL_INVAL);
topo_mod_dprintf(mod, "cpuboard_get_pri_info: "
"id %llx out of range. (%d: %s)\n",
id, errno, strerror(errno));
--- a/usr/src/lib/fm/topo/modules/sun4v/cpuboard/cpuboard_hostbridge.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/cpuboard/cpuboard_hostbridge.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -125,13 +125,13 @@
topo_mod_dprintf(mp,
"dev:///%s fmri creation failed.\n",
dnpath);
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
di_devfs_path_free(dnpath);
return (NULL);
}
if (topo_node_asru_set(rcn, fmri, 0, &err) < 0) {
topo_mod_dprintf(mp, "topo_node_asru_set failed\n");
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
nvlist_free(fmri);
di_devfs_path_free(dnpath);
return (NULL);
@@ -149,13 +149,13 @@
if (topo_pgroup_create(rcn, &io_pgroup, &err) < 0) {
topo_mod_dprintf(mp, "topo_pgroup_create failed\n");
di_devfs_path_free(dnpath);
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
return (NULL);
}
if (topo_pgroup_create(rcn, &pci_pgroup, &err) < 0) {
topo_mod_dprintf(mp, "topo_pgroup_create failed\n");
di_devfs_path_free(dnpath);
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
return (NULL);
}
/* Add the devfs path property */
@@ -163,7 +163,7 @@
if (topo_prop_set_string(rcn, TOPO_PGROUP_IO, TOPO_IO_DEV,
TOPO_PROP_IMMUTABLE, rcpath, &err) != 0) {
topo_mod_dprintf(mp, "Failed to set DEV property\n");
- topo_mod_seterrno(mp, err);
+ (void) topo_mod_seterrno(mp, err);
}
}
if (dnpath) {
@@ -199,7 +199,7 @@
}
/* Make room for children */
- topo_node_range_create(mp, rcn, PCIEX_BUS, 0, CPUBOARD_MAX);
+ (void) topo_node_range_create(mp, rcn, PCIEX_BUS, 0, CPUBOARD_MAX);
return (rcn);
}
@@ -227,7 +227,7 @@
(void) topo_node_label_set(hbn, NULL, &err);
/* Make room for children */
- topo_node_range_create(mp, hbn, PCIEX_ROOT, 0, CPUBOARD_MAX);
+ (void) topo_node_range_create(mp, hbn, PCIEX_ROOT, 0, CPUBOARD_MAX);
topo_mod_dprintf(mp, "cpuboard_hb_node_create: EXIT hbn=%p\n", hbn);
--- a/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_sun4v.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_sun4v.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,12 +20,10 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <strings.h>
#include <sys/fm/protocol.h>
#include <fm/topo_hc.h>
@@ -160,7 +158,7 @@
}
/* Make room for children */
- topo_node_range_create(mod, hbn, PCIEX_ROOT, 0, MAX_HB_BUSES);
+ (void) topo_node_range_create(mod, hbn, PCIEX_ROOT, 0, MAX_HB_BUSES);
return (hbn);
}
@@ -199,7 +197,7 @@
}
if (topo_node_asru_set(rcn, fmri, 0, &err) < 0) {
topo_mod_dprintf(mod, "topo_node_asru_set failed\n");
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
nvlist_free(fmri);
return (NULL);
}
@@ -212,12 +210,12 @@
/* Add the io and pci property groups */
if (topo_pgroup_create(rcn, &io_pgroup, &err) < 0) {
topo_mod_dprintf(mod, "topo_pgroup_create(iogrp) failed\n");
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
return (NULL);
}
if (topo_pgroup_create(rcn, &pci_pgroup, &err) < 0) {
topo_mod_dprintf(mod, "topo_pgroup_create(pcigrp) failed\n");
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
return (NULL);
}
/* Add the devfs path property */
@@ -225,7 +223,7 @@
TOPO_PROP_IMMUTABLE, dnpath, &err) != 0) {
topo_mod_dprintf(mod, "Failed to set %s property\n",
TOPO_IO_DEV);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
return (NULL);
}
@@ -258,7 +256,7 @@
}
/* Make room for children */
- topo_node_range_create(mod, rcn, PCIEX_BUS, 0, MAX_HB_BUSES);
+ (void) topo_node_range_create(mod, rcn, PCIEX_BUS, 0, MAX_HB_BUSES);
return (rcn);
}
--- a/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -255,7 +255,7 @@
}
if (rc != 0) {
result = TOPO_WALK_TERMINATE;
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
}
}
topo_mod_strfree(mod, location);
--- a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_defer.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_defer.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,11 +20,10 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-
/*
* Some topology creation routines may need to defer completing enumeration
* until after the entire PRI graph has been visited. This file includes
@@ -90,7 +89,7 @@
*/
dnp = topo_mod_zalloc(mod, sizeof (pi_defernode_t));
if (dnp == NULL) {
- topo_mod_seterrno(mod, EMOD_NOMEM);
+ (void) topo_mod_seterrno(mod, EMOD_NOMEM);
return (-1);
}
uu_list_node_init(dnp, &(dnp->defer_node), defer_pool);
@@ -157,7 +156,7 @@
(uint64_t)mde_node);
/* Move on to the next node */
- topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
continue;
}
@@ -169,7 +168,7 @@
(uint64_t)mde_node);
/* Move on to the next node */
- topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
continue;
}
topo_mod_dprintf(mod,
@@ -183,7 +182,7 @@
topo_mod_dprintf(mod,
"deferred enumeration for node_0x%llx failed\n",
(uint64_t)mde_node);
- topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
}
/* Clean up from the deferred call */
@@ -208,14 +207,14 @@
sizeof (pi_defernode_t), offsetof(pi_defernode_t, defer_node),
pi_deferlist_compare, 0);
if (defer_pool == NULL) {
- topo_mod_seterrno(mod, EMOD_NOMEM);
+ (void) topo_mod_seterrno(mod, EMOD_NOMEM);
return (-1);
}
defer_list = uu_list_create(defer_pool, NULL, 0);
if (defer_list == NULL) {
uu_list_pool_destroy(defer_pool);
defer_pool = NULL;
- topo_mod_seterrno(mod, EMOD_NOMEM);
+ (void) topo_mod_seterrno(mod, EMOD_NOMEM);
return (-1);
}
--- a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_pciexrc.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_pciexrc.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -254,7 +254,7 @@
if (result != 0) {
topo_mod_dprintf(mod, "%s node_0x%llx failed to set ASRU\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
goto out;
}
@@ -266,7 +266,7 @@
topo_mod_dprintf(mod, "%s node_0x%llx "
"topo_pgroup_create for io pgroup failed\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
goto out;
}
@@ -276,7 +276,7 @@
topo_mod_dprintf(mod, "%s node_0x%llx "
"topo_pgroup_create for pci pgroup failed\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
goto out;
}
}
@@ -287,7 +287,7 @@
topo_mod_dprintf(mod,
"%s node_0x%llx failed to set DEV property\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
goto out;
}
@@ -298,7 +298,7 @@
topo_mod_dprintf(mod,
"%s node_0x%llx failed to set DEVTYPE property\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
goto out;
}
@@ -344,7 +344,7 @@
topo_mod_dprintf(mod,
"%s node_0x%llx failed to set DRIVER property\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
goto out;
}
@@ -353,7 +353,7 @@
topo_mod_dprintf(mod,
"%s node_0x%llx failed to create module fmri\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
result = -1;
goto out;
}
@@ -364,7 +364,7 @@
topo_mod_dprintf(mod,
"%s node_0x%llx failed to set MODULE property\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
goto out;
}
@@ -376,7 +376,7 @@
topo_mod_dprintf(mod,
"%s node_0x%llx failed to set EXCAP property\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
goto out;
}
@@ -387,7 +387,7 @@
topo_mod_dprintf(mod,
"%s node_0x%llx failed to set BDF property\n",
_enum_name, (uint64_t)mde_node);
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
goto out;
}
--- a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -90,7 +90,7 @@
if (*nodes == NULL) {
/* We have no memory. Set an error code and return failure */
*nsize = 0;
- topo_mod_seterrno(mod, EMOD_NOMEM);
+ (void) topo_mod_seterrno(mod, EMOD_NOMEM);
return (-1);
}
@@ -727,7 +727,7 @@
* We failed to create the property group and it was not
* already defined. Set the err code and return failure.
*/
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
return (-1);
}
@@ -776,7 +776,7 @@
&err);
if (result != 0) {
/* Preserve the error and continue */
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
topo_mod_dprintf(mod, "pi_set_auth: failed to "
"set property %s (%d) : %s\n",
FM_FMRI_AUTH_CHASSIS, err,
@@ -823,7 +823,7 @@
&err);
if (result != 0) {
/* Preserve the error and continue */
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
topo_mod_dprintf(mod, "pi_set_auth: failed to "
"set property %s (%d) : %s\n",
FM_FMRI_AUTH_PRODUCT_SN, err,
@@ -870,7 +870,7 @@
&err);
if (result != 0) {
/* Preserve the error and continue */
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
topo_mod_dprintf(mod, "pi_set_auth: failed to "
"set property %s (%d) : %s\n",
FM_FMRI_AUTH_CHASSIS, err,
@@ -917,7 +917,7 @@
&err);
if (result != 0) {
/* Preserve the error and continue */
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
topo_mod_dprintf(mod, "pi_set_auth: failed to "
"set property %s (%d) : %s\n",
FM_FMRI_AUTH_SERVER, err,
@@ -960,7 +960,7 @@
result = pi_get_fru(mod, mdp, mde_node, &is_fru);
if (result != 0 || is_fru == 0) {
/* This node is not a FRU. Inherit from parent and return */
- topo_node_fru_set(t_node, NULL, 0, &result);
+ (void) topo_node_fru_set(t_node, NULL, 0, &result);
return (0);
}
@@ -985,7 +985,7 @@
/* Set the FRU, whether NULL or not */
result = topo_node_fru_set(t_node, frufmri, 0, &err);
if (result != 0) {
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
}
nvlist_free(frufmri);
@@ -1013,7 +1013,7 @@
result = topo_node_label_set(t_node, label, &err);
topo_mod_strfree(mod, label);
if (result != 0) {
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
topo_mod_dprintf(mod, "pi_set_label: failed with label %s "
"on node_0x%llx: %s\n", (label == NULL ? "NULL" : label),
(uint64_t)mde_node, topo_strerror(err));
@@ -1045,7 +1045,7 @@
* We failed to create the property group and it was not
* already defined. Set the err code and return failure.
*/
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
return (-1);
}
@@ -1065,7 +1065,7 @@
TOPO_PROP_IMMUTABLE, isa, &err);
if (result != 0) {
/* Preserve the error and continue */
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
topo_mod_dprintf(mod, "pi_set_auth: failed to "
"set property %s (%d) : %s\n",
TOPO_PROP_ISA, err, topo_strerror(err));
@@ -1079,7 +1079,7 @@
result = uname(&uts);
if (result == -1) {
/* Preserve the error and continue */
- topo_mod_seterrno(mod, errno);
+ (void) topo_mod_seterrno(mod, errno);
topo_mod_dprintf(mod, "pi_set_system: failed to "
"read uname: %d\n", errno);
}
@@ -1089,7 +1089,7 @@
TOPO_PROP_IMMUTABLE, uts.machine, &err);
if (result != 0) {
/* Preserve the error and continue */
- topo_mod_seterrno(mod, err);
+ (void) topo_mod_seterrno(mod, err);
topo_mod_dprintf(mod, "pi_set_auth: failed to "
"set property %s (%d) : %s\n",
TOPO_PROP_MACHINE, err, topo_strerror(err));
--- a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_walker.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_walker.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -226,7 +226,7 @@
if (result != 0) {
pi_walkerlist_destroy(mod);
topo_mod_dprintf(mod, "walker could not add to list\n");
- topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
return (result);
}
@@ -249,7 +249,7 @@
topo_mod_dprintf(mod,
"walker could not register enumerator for type "
"%s\n", hc_name);
- topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
return (-1);
}
topo_mod_dprintf(mod,
@@ -271,7 +271,7 @@
* Store that we have a partial enumeration and return
* that we have encountered an error.
*/
- topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
result = -1;
break;
@@ -284,7 +284,7 @@
topo_mod_dprintf(mod,
"walker encountered invalid result: %d. "
"Continuing\n", result);
- topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
result = 0;
break;
}
@@ -351,7 +351,7 @@
*/
topo_mod_dprintf(mod, "walker skipping node_0x%llx: "
"no instance\n", (uint64_t)mde_node);
- topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
return (MDE_WALK_NEXT);
}
@@ -375,7 +375,7 @@
topo_mod_dprintf(mod, "no topo parent found for node_0x%llx\n",
mde_node);
result = pi_walker_node_range(mod, mdp, NULL, mde_node);
- topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
return (result);
}
@@ -395,7 +395,7 @@
* node with a topology parent. This will propgate the
* creation error down this MDE branch.
*/
- topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
return (result);
}
@@ -514,7 +514,7 @@
arcp = topo_mod_zalloc(mod, arcsize);
if (arcp == NULL) {
topo_mod_dprintf(mod, "out of memory\n");
- topo_mod_seterrno(mod, EMOD_NOMEM);
+ (void) topo_mod_seterrno(mod, EMOD_NOMEM);
return (MDE_WALK_ERROR);
}
num_arcs = md_get_prop_arcs(mdp, mde_node, MD_STR_FWD, arcp, arcsize);
@@ -530,7 +530,7 @@
result = topo_mod_nvalloc(mod, &typelist, NV_UNIQUE_NAME);
if (result != 0) {
topo_mod_free(mod, arcp, arcsize);
- topo_mod_seterrno(mod, EMOD_NOMEM);
+ (void) topo_mod_seterrno(mod, EMOD_NOMEM);
return (MDE_WALK_ERROR);
}
@@ -568,7 +568,7 @@
nvlist_free(typelist);
topo_mod_strfree(mod, hc_name);
topo_mod_free(mod, arcp, arcsize);
- topo_mod_seterrno(mod,
+ (void) topo_mod_seterrno(mod,
EMOD_PARTIAL_ENUM);
return (MDE_WALK_ERROR);
}
@@ -698,7 +698,7 @@
sizeof (pi_walkernode_t), offsetof(pi_walkernode_t, walker_node),
pi_walkerlist_compare, NULL);
if (walker_pool == NULL) {
- topo_mod_seterrno(mod, EMOD_NOMEM);
+ (void) topo_mod_seterrno(mod, EMOD_NOMEM);
return (-1);
}
walker_list = uu_list_create(walker_pool, NULL, 0);
--- a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/sun4vpi.c Tue Jan 26 15:18:15 2010 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/sun4vpi.c Tue Jan 26 20:03:58 2010 -0800
@@ -20,12 +20,10 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Main entry points for SUN4V Platform Independent topology enumerator
*/
@@ -71,7 +69,7 @@
topo_mod_dprintf(mod, "sun4vpi module initializing.\n");
if (version != TOPO_VERSION) {
- topo_mod_seterrno(mod, EMOD_VER_NEW);
+ (void) topo_mod_seterrno(mod, EMOD_VER_NEW);
topo_mod_dprintf(mod, "incompatible topo version %d\n",
version);
return;
@@ -136,7 +134,7 @@
/* Initialize the walker */
result = pi_walker_init(mod);
if (result != 0) {
- topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
return (-1);
}
@@ -146,7 +144,7 @@
if (result != 0) {
pi_walker_fini(mod);
topo_mod_dprintf(mod, "could not open LDOM PRI\n");
- topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
return (-1);
}
pi.mod = mod;
@@ -161,7 +159,7 @@
/* No nodes were found */
pi_walker_fini(mod);
topo_mod_dprintf(mod, "could not find components in PRI\n");
- topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_UKNOWN_ENUM);
return (-1);
}
@@ -237,7 +235,7 @@
if (t_parent == NULL) {
topo_mod_dprintf(mod,
"walker failed to create node range with a NULL parent\n");
- topo_mod_seterrno(mod, EMOD_METHOD_INVAL);
+ (void) topo_mod_seterrno(mod, EMOD_METHOD_INVAL);
return (-1);
}
@@ -248,7 +246,7 @@
* This components node has no children and is not a topo
* node itself, so set partial enumeration and return.
*/
- topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
return (0);
}
topo_mod_dprintf(mod, "node_0x%llx has %d children\n",
@@ -259,7 +257,7 @@
arcp = topo_mod_zalloc(mod, arcsize);
if (arcp == NULL) {
topo_mod_dprintf(mod, "out of memory\n");
- topo_mod_seterrno(mod, EMOD_NOMEM);
+ (void) topo_mod_seterrno(mod, EMOD_NOMEM);
return (-1);
}
num_arcs = md_get_prop_arcs(mdp, mde_node, MD_STR_FWD, arcp,
@@ -274,7 +272,7 @@
result = pi_walker(pip, t_parent, hc_name,
arcp[arcidx], component_cookie, arc_cookie);
if (result != 0) {
- topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
+ (void) topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM);
}
}
topo_mod_free(mod, arcp, arcsize);