--- a/usr/src/cmd/avs/dscfglockd/dscfgcli.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dscfglockd/dscfgcli.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -52,26 +52,26 @@
if (cfg_lock(cfg, CFG_RDLOCK) < 0)
(void) printf("CFG_RDLOCK error\n");
else
- fstat(0, &sb);
+ (void) fstat(0, &sb);
cfg_unlock(cfg);
- fstat(1, &sb);
+ (void) fstat(1, &sb);
if (cfg_lock(cfg, CFG_RDLOCK) < 0)
(void) printf("CFG_RDLOCK error\n");
else
- fstat(0, &sb);
+ (void) fstat(0, &sb);
cfg_unlock(cfg);
- fstat(1, &sb);
+ (void) fstat(1, &sb);
if (cfg_lock(cfg, CFG_WRLOCK) < 0)
(void) printf("CFG_WRLOCK error\n");
else
- fstat(0, &sb);
+ (void) fstat(0, &sb);
cfg_unlock(cfg);
- fstat(1, &sb);
+ (void) fstat(1, &sb);
if (i > 0) {
if (i % 100 == 0)
--- a/usr/src/cmd/avs/dscfglockd/dscfglockd.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dscfglockd/dscfglockd.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -125,8 +125,8 @@
#define STATE_OKAYED 2
#define STATE_WANTS 3
#define lockdaemon_dead(ldp) ((ticker - (ldp)->timeout) > MAX_TIMEOUTS)
-#define CRIT_BEGIN() sighold(SIGALRM)
-#define CRIT_END() sigrelse(SIGALRM)
+#define CRIT_BEGIN() (void) sighold(SIGALRM)
+#define CRIT_END() (void) sigrelse(SIGALRM)
#define NORMAL_UNLOCK 0
#define FORCE_UNLOCK 1
@@ -280,7 +280,7 @@
s2 = (struct sockaddr_in *)&ifr->ifr_addr;
if (memcmp((char *)&s2->sin_addr,
- (char *)&s1->sin_addr, sizeof (s1->sin_addr)) == 0) {
+ (char *)&s1->sin_addr, sizeof (s1->sin_addr)) == 0) {
retval = 1;
/* it's me */
break;
@@ -301,7 +301,7 @@
ctime(&t), lockd_msg(cmd), dp_addr(dp));
}
DPF((stderr, "send %d to %s port %hu\n", cmd,
- dp_addr(dp), dp->sin_port));
+ dp_addr(dp), dp->sin_port));
message_buf.message = cmd;
message_buf.pid = pid;
message_buf.order = order;
@@ -1037,7 +1037,7 @@
continue; /* can't take lock, must be still alive */
cfg_readpid(i, &pid);
cfg_writepid(i, (pid_t)0);
- cfg_fileunlock(i);
+ (void) cfg_fileunlock(i);
if (pid != (pid_t)0)
purge_pid(pid);
}
@@ -1061,7 +1061,7 @@
}
(void) memcpy(&(localhost.sin_addr.s_addr), *(hp->h_addr_list),
- sizeof (localhost.sin_addr));
+ sizeof (localhost.sin_addr));
if (cf_file == NULL) {
(void) endhostent();
return;
@@ -1105,7 +1105,7 @@
(void) memcpy(&(ldp->host.sin_addr.s_addr), *(hp->h_addr_list),
sizeof (ldp->host.sin_addr));
DPF((stderr, "daemon: %s\t%s\n",
- inet_ntoa(ldp->host.sin_addr), hp->h_name));
+ inet_ntoa(ldp->host.sin_addr), hp->h_name));
if (islocalhost(&(ldp->host))) {
DPF((stderr, "is an alias for this host, skipping\n"));
continue;
@@ -1297,7 +1297,7 @@
continue; /* can't take lock, must be still alive */
}
cfg_writepid(i, 0);
- cfg_fileunlock(i);
+ (void) cfg_fileunlock(i);
}
tv.it_interval.tv_sec = TIMEOUT_SECS;
@@ -1326,7 +1326,7 @@
if (getsockname(lock_soc, (struct sockaddr *)&thishost, &len) < 0)
perror("getsockname");
send_aliveall();
- sigset(SIGALRM, keepalive);
+ (void) sigset(SIGALRM, keepalive);
(void) setitimer(ITIMER_REAL, &tv, NULL);
/*
* wait 2 time outs before allowing a lock to find if someone else
--- a/usr/src/cmd/avs/dsstat/common.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsstat/common.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -84,10 +84,10 @@
return (NULL);
rval = (kstat_t *)calloc(1, sizeof (*ksp));
- memcpy(rval, ksp, sizeof (*ksp));
+ (void) memcpy(rval, ksp, sizeof (*ksp));
rval->ks_data = (void *) calloc(1, ksp->ks_data_size);
- memcpy(rval->ks_data, ksp->ks_data,
+ (void) memcpy(rval->ks_data, ksp->ks_data,
sizeof (kstat_named_t) * ksp->ks_ndata);
/* special handling for variable length string KSTAT_DATA_STRING */
@@ -101,7 +101,7 @@
(void) sigaction(SIGSEGV, NULL, &segv_act);
(void) signal(SIGSEGV, sig_handler);
- strncpy(end, KSTAT_NAMED_STR_PTR(knp),
+ (void) strncpy(end, KSTAT_NAMED_STR_PTR(knp),
KSTAT_NAMED_STR_BUFLEN(knp));
KSTAT_NAMED_STR_PTR(knp) = end;
end += KSTAT_NAMED_STR_BUFLEN(knp);
--- a/usr/src/cmd/avs/dsstat/dsstat.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsstat/dsstat.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -311,15 +311,15 @@
newvol = (vslist_t *)calloc(1, sizeof (vslist_t));
newvol->volname = (char *)calloc((strlen(vn) + 1),
- sizeof (char));
- strcpy(newvol->volname, vn);
+ sizeof (char));
+ (void) strcpy(newvol->volname, vn);
if (vh == NULL)
goto save;
newvol->volhost = (char *)calloc((strlen(vh) + 1),
- sizeof (char));
- strcpy(newvol->volhost, vh);
+ sizeof (char));
+ (void) strcpy(newvol->volhost, vh);
save:
/* save record */
@@ -426,7 +426,7 @@
if ((user_rflags | SNDR_REP_MASK) != SNDR_REP_MASK) {
fail(DSSTAT_EINVAL,
gettext("Invalid report-flags for "
- "Remote Mirror\n"));
+ "Remote Mirror\n"));
}
}
@@ -455,13 +455,13 @@
if ((user_dflags | IIMG_DIS_MASK) != IIMG_DIS_MASK) {
fail(DSSTAT_EINVAL,
gettext("Invalid display-flags for "
- "Point-in-Time Copy\n"));
+ "Point-in-Time Copy\n"));
}
if ((user_rflags | IIMG_REP_MASK) != IIMG_REP_MASK) {
fail(DSSTAT_EINVAL,
gettext("Invalid report-flags for "
- "Point-in-Time Copy\n"));
+ "Point-in-Time Copy\n"));
}
}
--- a/usr/src/cmd/avs/dsstat/ii_stats.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsstat/ii_stats.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -243,7 +243,7 @@
/*
* Set kstat
*/
- strncpy(volname, cur->pre_set->ks_name, KSTAT_STRLEN);
+ (void) strncpy(volname, cur->pre_set->ks_name, KSTAT_STRLEN);
volname[KSTAT_STRLEN] = '\0';
ksp = kstat_lookup(kc, II_KSTAT_MODULE, -1, volname);
@@ -357,8 +357,8 @@
if (padsz) {
char fmt[20];
- sprintf(fmt, "%%%ds", padsz);
- sprintf(pad, fmt, "");
+ (void) sprintf(fmt, "%%%ds", padsz);
+ (void) sprintf(pad, fmt, "");
}
for (cur = ii_top; cur; /* CSTYLED */) {
@@ -374,21 +374,21 @@
/* notify user of set being disabled */
c = kstat_value(cur->pre_set, DSW_SKSTAT_SETA);
- strncpy(vol, c, NAMED_LEN);
+ (void) strncpy(vol, c, NAMED_LEN);
c = kstat_value(cur->pre_set, DSW_SKSTAT_SETB);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->pre_set, DSW_SKSTAT_SETC);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->pre_set, DSW_SKSTAT_SETD);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
offset = strlen(vol) - NAMED_LEN;
if (offset < 0)
offset = 0;
- printf(DATA_C16, vol + offset);
- printf(" %s\n", II_DISABLED);
+ (void) printf(DATA_C16, vol + offset);
+ (void) printf(" %s\n", II_DISABLED);
/* free memory and remove stat from list */
next = ii_del_stat(cur);
@@ -419,21 +419,21 @@
char vstat[STAT_HDR_SIZE];
if (*flags & DSW_GOLDEN)
- strcpy(c, II_INDEPENDENT);
+ (void) strcpy(c, II_INDEPENDENT);
else
- strcpy(c, II_DEPENDENT);
+ (void) strcpy(c, II_DEPENDENT);
- sprintf(vtype, DATA_C2, c);
- strcat(data, vtype);
+ (void) sprintf(vtype, DATA_C2, c);
+ (void) strcat(data, vtype);
if (*flags & DSW_COPYINGP)
- strcpy(c, II_COPYING);
+ (void) strcpy(c, II_COPYING);
else
- strcpy(c, NO_INFO);
+ (void) strcpy(c, NO_INFO);
- sprintf(vstat, DATA_C2, c);
- strcat(data, vstat);
+ (void) sprintf(vstat, DATA_C2, c);
+ (void) strcat(data, vstat);
}
/* Calculate sync needed precentage */
@@ -460,9 +460,9 @@
pct = ((float)*chkbits / *volsize) * 100.0;
- sprintf(snpct, DATA_F62, pct);
+ (void) sprintf(snpct, DATA_F62, pct);
- strcat(data, snpct);
+ (void) strcat(data, snpct);
}
/* Master statistics */
@@ -472,13 +472,13 @@
int offset;
c = kstat_value(cur->cur_set, DSW_SKSTAT_MSTA);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_MSTB);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_MSTC);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_MSTD);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
offset = strlen(vol) - NAMED_LEN;
@@ -486,22 +486,22 @@
offset = 0;
header();
- printf(DATA_C16, vol + offset);
- printf("%s", data);
- printf(ROLE_INF_FMT, II_MASTER);
+ (void) printf(DATA_C16, vol + offset);
+ (void) printf("%s", data);
+ (void) printf(ROLE_INF_FMT, II_MASTER);
if (*flags & DSW_MSTOFFLINE) {
- printf(" <<offline>>");
+ (void) printf(" <<offline>>");
linesout++;
} else {
io_report(cur->cur_mst, cur->pre_mst,
sdbc_getstat(vol + offset));
}
- printf("\n");
+ (void) printf("\n");
if (first) {
- strcpy(data, strlen(pad) > 0 ? pad : "");
+ (void) strcpy(data, strlen(pad) > 0 ? pad : "");
first = 0;
}
}
@@ -513,13 +513,13 @@
int offset;
c = kstat_value(cur->cur_set, DSW_SKSTAT_SETA);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_SETB);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_SETC);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_SETD);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
offset = strlen(vol) - NAMED_LEN;
@@ -527,22 +527,22 @@
offset = 0;
header();
- printf(DATA_C16, vol + offset);
- printf("%s", data);
- printf(ROLE_INF_FMT, II_SHADOW);
+ (void) printf(DATA_C16, vol + offset);
+ (void) printf("%s", data);
+ (void) printf(ROLE_INF_FMT, II_SHADOW);
if (*flags & DSW_SHDOFFLINE) {
- printf(" <<offline>>");
+ (void) printf(" <<offline>>");
linesout++;
} else {
io_report(cur->cur_shd, cur->pre_shd,
sdbc_getstat(vol + offset));
}
- printf("\n");
+ (void) printf("\n");
if (first) {
- strcpy(data, strlen(pad) > 0 ? pad : "");
+ (void) strcpy(data, strlen(pad) > 0 ? pad : "");
first = 0;
}
}
@@ -554,13 +554,13 @@
int offset;
c = kstat_value(cur->cur_set, DSW_SKSTAT_BMPA);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_BMPB);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_BMPC);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_BMPD);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
offset = strlen(vol) - NAMED_LEN;
@@ -568,21 +568,21 @@
offset = 0;
header();
- printf(DATA_C16, vol + offset);
- printf("%s", data);
- printf(ROLE_INF_FMT, II_BITMAP);
+ (void) printf(DATA_C16, vol + offset);
+ (void) printf("%s", data);
+ (void) printf(ROLE_INF_FMT, II_BITMAP);
if (*flags & DSW_BMPOFFLINE) {
- printf(" <<offline>>");
+ (void) printf(" <<offline>>");
linesout++;
} else {
io_report(cur->cur_bmp, cur->pre_bmp,
sdbc_getstat(vol + offset));
}
- printf("\n");
+ (void) printf("\n");
if (first) {
- strcpy(data, strlen(pad) > 0 ? pad : "");
+ (void) strcpy(data, strlen(pad) > 0 ? pad : "");
first = 0;
}
}
@@ -595,19 +595,19 @@
int offset;
if (cur->cur_ovr == NULL && cur->pre_ovr != NULL)
- strcpy(msg, " <<attached>>");
+ (void) strcpy(msg, " <<attached>>");
if (! (cur->collected & GOT_OVRSTAT))
- strcpy(msg, " <<not attached>>");
+ (void) strcpy(msg, " <<not attached>>");
c = kstat_value(cur->cur_set, DSW_SKSTAT_OVRA);
- strncpy(vol, c, NAMED_LEN);
+ (void) strncpy(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_OVRB);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_OVRC);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
c = kstat_value(cur->cur_set, DSW_SKSTAT_OVRD);
- strncat(vol, c, NAMED_LEN);
+ (void) strncat(vol, c, NAMED_LEN);
offset = strlen(vol) - NAMED_LEN;
@@ -615,28 +615,28 @@
offset = 0;
header();
- printf(DATA_C16, vol + offset);
- printf("%s", data);
- printf(ROLE_INF_FMT, II_OVERFLOW);
+ (void) printf(DATA_C16, vol + offset);
+ (void) printf("%s", data);
+ (void) printf(ROLE_INF_FMT, II_OVERFLOW);
if (strlen(msg)) {
- printf("%s\n", msg);
+ (void) printf("%s\n", msg);
linesout++;
goto next;
}
if (*flags & DSW_OVROFFLINE) {
- printf(" <<offline>>");
+ (void) printf(" <<offline>>");
linesout++;
} else {
io_report(cur->cur_ovr, cur->pre_ovr,
sdbc_getstat(vol + offset));
}
- printf("\n");
+ (void) printf("\n");
if (first) {
- strcpy(data, strlen(pad) > 0 ? pad : "");
+ (void) strcpy(data, strlen(pad) > 0 ? pad : "");
first = 0;
}
}
--- a/usr/src/cmd/avs/dsstat/report.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsstat/report.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -190,17 +190,19 @@
if (dflags & SUMMARY) {
if ((mode & MULTI) && (mode & SDBC)) {
if (sdbcstat) {
- printf(KPS_INF_FMT, (float)vals.total_cache);
- printf(KPS_INF_FMT, (float)vals.total_disk);
+ (void) printf(KPS_INF_FMT,
+ (float)vals.total_cache);
+ (void) printf(KPS_INF_FMT,
+ (float)vals.total_disk);
} else {
- printf(DATA_C6, NO_INFO);
- printf(KPS_INF_FMT, rd_kb + wr_kb);
+ (void) printf(DATA_C6, NO_INFO);
+ (void) printf(KPS_INF_FMT, rd_kb + wr_kb);
}
} else
- printf(KPS_INF_FMT, rd_kb + wr_kb);
+ (void) printf(KPS_INF_FMT, rd_kb + wr_kb);
- printf(TPS_INF_FMT, (uint32_t)(rd_cnt + wr_cnt));
- printf(SVT_INF_FMT, rtm);
+ (void) printf(TPS_INF_FMT, (uint32_t)(rd_cnt + wr_cnt));
+ (void) printf(SVT_INF_FMT, rtm);
goto done;
}
@@ -208,37 +210,41 @@
if (dflags & READ) {
if ((mode & MULTI) && (mode & SDBC)) {
if (sdbcstat) {
- printf(KPS_INF_FMT, (float)vals.cache_read);
- printf(KPS_INF_FMT, (float)vals.disk_read);
+ (void) printf(KPS_INF_FMT,
+ (float)vals.cache_read);
+ (void) printf(KPS_INF_FMT,
+ (float)vals.disk_read);
} else {
- printf(DATA_C6, NO_INFO);
- printf(KPS_INF_FMT, rd_kb);
+ (void) printf(DATA_C6, NO_INFO);
+ (void) printf(KPS_INF_FMT, rd_kb);
}
} else
- printf(KPS_INF_FMT, rd_kb);
+ (void) printf(KPS_INF_FMT, rd_kb);
- printf(TPS_INF_FMT, (uint32_t)rd_cnt);
+ (void) printf(TPS_INF_FMT, (uint32_t)rd_cnt);
}
if (dflags & WRITE) {
if ((mode & MULTI) && (mode & SDBC)) {
if (sdbcstat) {
- printf(KPS_INF_FMT, (float)vals.cache_write);
- printf(KPS_INF_FMT, (float)vals.disk_write);
+ (void) printf(KPS_INF_FMT,
+ (float)vals.cache_write);
+ (void) printf(KPS_INF_FMT,
+ (float)vals.disk_write);
} else {
- printf(DATA_C6, NO_INFO);
- printf(KPS_INF_FMT, wr_kb);
+ (void) printf(DATA_C6, NO_INFO);
+ (void) printf(KPS_INF_FMT, wr_kb);
}
} else
- printf(KPS_INF_FMT, wr_kb);
+ (void) printf(KPS_INF_FMT, wr_kb);
- printf(TPS_INF_FMT, (uint32_t)wr_cnt);
+ (void) printf(TPS_INF_FMT, (uint32_t)wr_cnt);
}
if (dflags & TIMING) {
- printf(SVT_INF_FMT, rtm);
+ (void) printf(SVT_INF_FMT, rtm);
}
done:
@@ -275,41 +281,41 @@
/* Output */
if (rflags & MULTI) {
- printf(VOL_HDR_FMT, "");
+ (void) printf(VOL_HDR_FMT, "");
if (dflags & FLAGS) {
- printf(STAT_HDR_FMT, "");
- printf(STAT_HDR_FMT, "");
+ (void) printf(STAT_HDR_FMT, "");
+ (void) printf(STAT_HDR_FMT, "");
}
if (dflags & PCTS)
- printf(PCT_HDR_FMT, "");
+ (void) printf(PCT_HDR_FMT, "");
if (dflags & SUMMARY) {
- printf(KPS_INF_FMT, (float)vals.total_cache);
- printf(DATA_C4, NO_INFO);
- printf(DATA_C4, NO_INFO);
- printf("\n");
+ (void) printf(KPS_INF_FMT, (float)vals.total_cache);
+ (void) printf(DATA_C4, NO_INFO);
+ (void) printf(DATA_C4, NO_INFO);
+ (void) printf("\n");
linesout++;
return;
}
if (dflags & READ) {
- printf(KPS_INF_FMT, (float)vals.cache_read);
- printf(DATA_C4, NO_INFO);
+ (void) printf(KPS_INF_FMT, (float)vals.cache_read);
+ (void) printf(DATA_C4, NO_INFO);
}
if (dflags & WRITE) {
- printf(KPS_INF_FMT, (float)vals.cache_write);
- printf(DATA_C4, NO_INFO);
+ (void) printf(KPS_INF_FMT, (float)vals.cache_write);
+ (void) printf(DATA_C4, NO_INFO);
}
if (dflags & TIMING) {
- printf(DATA_C4, NO_INFO);
+ (void) printf(DATA_C4, NO_INFO);
}
linesout++;
- printf("\n");
+ (void) printf("\n");
return;
}
@@ -319,7 +325,7 @@
(void) printf(HIT_INF_FMT, vals.cache_hit);
linesout++;
- printf("\n");
+ (void) printf("\n");
return;
}
@@ -342,7 +348,7 @@
(void) printf(DATA_I32, vals.write_cancellations);
linesout++;
- printf("\n");
+ (void) printf("\n");
}
/*
@@ -370,64 +376,64 @@
if (linesout)
(void) printf("\n");
- printf(VOL_HDR_FMT, SET_HDR_TXT);
+ (void) printf(VOL_HDR_FMT, SET_HDR_TXT);
if (dflags & FLAGS) {
- printf(STAT_HDR_FMT, TYPE_HDR_TXT);
- printf(STAT_HDR_FMT, STAT_HDR_TXT);
+ (void) printf(STAT_HDR_FMT, TYPE_HDR_TXT);
+ (void) printf(STAT_HDR_FMT, STAT_HDR_TXT);
}
if (dflags & ASYNC_QUEUE)
- printf(STAT_HDR_FMT, QUEUE_HDR_TXT);
+ (void) printf(STAT_HDR_FMT, QUEUE_HDR_TXT);
if (dflags & PCTS)
- printf(PCT_HDR_FMT, PCT_HDR_TXT);
+ (void) printf(PCT_HDR_FMT, PCT_HDR_TXT);
- printf(ROLE_HDR_FMT, ROLE_HDR_TXT);
+ (void) printf(ROLE_HDR_FMT, ROLE_HDR_TXT);
if (dflags & ASYNC_QUEUE) {
- printf(TPS_HDR_FMT, QUEUE_ITEMS_TXT);
- printf(KPS_HDR_FMT, QUEUE_KBYTES_TXT);
- printf(TPS_HDR_FMT, QUEUE_ITEMS_HW_TXT);
- printf(KPS_HDR_FMT, QUEUE_KBYTES_HW_TXT);
+ (void) printf(TPS_HDR_FMT, QUEUE_ITEMS_TXT);
+ (void) printf(KPS_HDR_FMT, QUEUE_KBYTES_TXT);
+ (void) printf(TPS_HDR_FMT, QUEUE_ITEMS_HW_TXT);
+ (void) printf(KPS_HDR_FMT, QUEUE_KBYTES_HW_TXT);
}
if (dflags & SUMMARY) {
if ((mode & MULTI) && (mode & SDBC)) {
- printf(KPS_HDR_FMT, CKPS_HDR_TXT);
- printf(KPS_HDR_FMT, DKPS_HDR_TXT);
+ (void) printf(KPS_HDR_FMT, CKPS_HDR_TXT);
+ (void) printf(KPS_HDR_FMT, DKPS_HDR_TXT);
} else
- printf(KPS_HDR_FMT, KPS_HDR_TXT);
- printf(TPS_HDR_FMT, TPS_HDR_TXT);
- printf(SVT_HDR_FMT, SVT_HDR_TXT);
+ (void) printf(KPS_HDR_FMT, KPS_HDR_TXT);
+ (void) printf(TPS_HDR_FMT, TPS_HDR_TXT);
+ (void) printf(SVT_HDR_FMT, SVT_HDR_TXT);
- printf("\n");
+ (void) printf("\n");
return;
}
if (dflags & READ) {
if ((mode & MULTI) && (mode & SDBC)) {
- printf(KPS_HDR_FMT, CRKPS_HDR_TXT);
- printf(KPS_HDR_FMT, DRKPS_HDR_TXT);
+ (void) printf(KPS_HDR_FMT, CRKPS_HDR_TXT);
+ (void) printf(KPS_HDR_FMT, DRKPS_HDR_TXT);
} else
- printf(KPS_HDR_FMT, RKPS_HDR_TXT);
+ (void) printf(KPS_HDR_FMT, RKPS_HDR_TXT);
- printf(TPS_HDR_FMT, RTPS_HDR_TXT);
+ (void) printf(TPS_HDR_FMT, RTPS_HDR_TXT);
}
if (dflags & WRITE) {
if ((mode & MULTI) && (mode & SDBC)) {
- printf(KPS_HDR_FMT, CWKPS_HDR_TXT);
- printf(KPS_HDR_FMT, DWKPS_HDR_TXT);
+ (void) printf(KPS_HDR_FMT, CWKPS_HDR_TXT);
+ (void) printf(KPS_HDR_FMT, DWKPS_HDR_TXT);
} else
- printf(KPS_HDR_FMT, WKPS_HDR_TXT);
+ (void) printf(KPS_HDR_FMT, WKPS_HDR_TXT);
- printf(TPS_HDR_FMT, WTPS_HDR_TXT);
+ (void) printf(TPS_HDR_FMT, WTPS_HDR_TXT);
}
if (dflags & TIMING)
- printf(SVT_HDR_FMT, SVT_HDR_TXT);
+ (void) printf(SVT_HDR_FMT, SVT_HDR_TXT);
(void) printf("\n");
}
--- a/usr/src/cmd/avs/dsstat/sdbc_stats.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsstat/sdbc_stats.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -126,7 +126,7 @@
/*
* I/O kstat
*/
- sprintf(kname, "%s%d", SDBC_IOKSTAT_CDSTATS, kinst);
+ (void) sprintf(kname, "%s%d", SDBC_IOKSTAT_CDSTATS, kinst);
io_ksp = kstat_lookup(kc, SDBC_KSTAT_MODULE, kinst, kname);
sdbcstat->pre_io = kstat_retrieve(kc, io_ksp);
@@ -259,7 +259,7 @@
char wmode[STAT_HDR_SIZE];
/* Parse volume name */
- strncpy(volname, kstat_value(cur->pre_set,
+ (void) strncpy(volname, kstat_value(cur->pre_set,
SDBC_CDKSTAT_VOL_NAME), NAMED_LEN);
volname[NAMED_LEN] = '\0';
@@ -366,7 +366,7 @@
hflags |= HEADERS_OUT;
if (linesout)
- printf("\n");
+ (void) printf("\n");
/* first line header */
if (! (dflags & SUMMARY) && dflags != FLAGS) {
@@ -683,7 +683,7 @@
vals->total_writes = vals->cache_write + vals->disk_write;
vals->destaged =
- FBA_SIZE(sdbc_getdelta(sdbcstat, SDBC_CDKSTAT_DESTAGED));
+ FBA_SIZE(sdbc_getdelta(sdbcstat, SDBC_CDKSTAT_DESTAGED));
if (vals->cache_write == 0)
vals->write_hit = 0.0;
--- a/usr/src/cmd/avs/dsstat/sndr_stats.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsstat/sndr_stats.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -261,7 +261,7 @@
/*
* Set kstat
*/
- strncpy(kname, cur->pre_set->ks_name, KSTAT_STRLEN);
+ (void) strncpy(kname, cur->pre_set->ks_name, KSTAT_STRLEN);
kname[KSTAT_STRLEN] = '\0';
kinst = cur->pre_set->ks_instance;
@@ -348,8 +348,8 @@
if (padsz) {
char fmt[20];
- sprintf(fmt, "%%%ds", padsz);
- sprintf(pad, fmt, " ");
+ (void) sprintf(fmt, "%%%ds", padsz);
+ (void) sprintf(pad, fmt, " ");
}
for (cur = sndr_top; cur != NULL; ) { /*CSTYLED */
@@ -364,11 +364,11 @@
/* notify user of set being disabled */
c = kstat_value(cur->pre_set, RDC_IKSTAT_SECFILE);
- strncpy(vn, c, NSC_MAXPATH);
+ (void) strncpy(vn, c, NSC_MAXPATH);
vn[NSC_MAXPATH] = '\0';
- printf(DATA_C16, vn);
- printf(" %s\n", RDC_DISABLED);
+ (void) printf(DATA_C16, vn);
+ (void) printf(" %s\n", RDC_DISABLED);
next = sndr_del_stat(cur);
@@ -396,12 +396,12 @@
char vstat[STAT_HDR_SIZE];
getType(cur->cur_set, &c[0]);
- sprintf(vtype, DATA_C2, c);
- strcat(data, vtype);
+ (void) sprintf(vtype, DATA_C2, c);
+ (void) strcat(data, vtype);
getStat(cur->cur_set, &c[0]);
- sprintf(vstat, DATA_C2, c);
- strcat(data, vstat);
+ (void) sprintf(vstat, DATA_C2, c);
+ (void) strcat(data, vstat);
}
/* Async. queue statistics */
@@ -410,16 +410,17 @@
char qtype[STAT_HDR_SIZE];
getQueue(cur->cur_set, &c[0]);
- sprintf(qtype, DATA_C2, c);
- strcat(data, qtype);
+ (void) sprintf(qtype, DATA_C2, c);
+ (void) strcat(data, qtype);
}
/* Calculate sync needed percentages */
if (dflags & PCTS) {
char snpct[10];
- sprintf(snpct, DATA_F62, getSyncNeeded(cur->cur_set));
- strcat(data, snpct);
+ (void) sprintf(snpct, DATA_F62,
+ getSyncNeeded(cur->cur_set));
+ (void) strcat(data, snpct);
}
/* Output */
@@ -442,13 +443,13 @@
if (strlen(c) >= NAMED_LEN) {
c += strlen(c) - NAMED_LEN;
}
- strncpy(vn, c, NAMED_LEN);
+ (void) strncpy(vn, c, NAMED_LEN);
vn[NAMED_LEN] = '\0';
header();
- printf(DATA_C16, vn);
- printf("%s", data);
- printf(ROLE_INF_FMT, RDC_SECONDARY);
+ (void) printf(DATA_C16, vn);
+ (void) printf("%s", data);
+ (void) printf(ROLE_INF_FMT, RDC_SECONDARY);
/* Async. queue statistics */
if (dflags & ASYNC_QUEUE)
@@ -456,10 +457,10 @@
io_report(cur->cur_sec, cur->pre_sec,
sdbc_getstat(vn));
- printf("\n");
+ (void) printf("\n");
if (first) {
- strcpy(data, strlen(pad) > 0 ? pad : "");
+ (void) strcpy(data, strlen(pad) > 0 ? pad : "");
first = 0;
}
}
@@ -474,13 +475,13 @@
if (strlen(c) >= NAMED_LEN) {
c += strlen(c) - NAMED_LEN;
}
- strncpy(vn, c, NAMED_LEN);
+ (void) strncpy(vn, c, NAMED_LEN);
vn[NAMED_LEN] = '\0';
header();
- printf(DATA_C16, vn);
- printf("%s", data);
- printf(ROLE_INF_FMT, RDC_BITMAP);
+ (void) printf(DATA_C16, vn);
+ (void) printf("%s", data);
+ (void) printf(ROLE_INF_FMT, RDC_BITMAP);
/* Async. queue statistics */
if (dflags & ASYNC_QUEUE)
@@ -488,10 +489,10 @@
io_report(cur->cur_bmp, cur->pre_bmp,
sdbc_getstat(vn));
- printf("\n");
+ (void) printf("\n");
if (first) {
- strcpy(data, strlen(pad) > 0 ? pad : "");
+ (void) strcpy(data, strlen(pad) > 0 ? pad : "");
first = 0;
}
}
@@ -829,23 +830,23 @@
if (! first) {
/* Filler for async. queue fields */
- printf(TPS_HDR_FMT, NO_INFO);
- printf(KPS_HDR_FMT, NO_INFO);
- printf(TPS_HDR_FMT, NO_INFO);
- printf(KPS_HDR_FMT, NO_INFO);
+ (void) printf(TPS_HDR_FMT, NO_INFO);
+ (void) printf(KPS_HDR_FMT, NO_INFO);
+ (void) printf(TPS_HDR_FMT, NO_INFO);
+ (void) printf(KPS_HDR_FMT, NO_INFO);
return;
}
val = (uint32_t *)kstat_value(cur_set, RDC_IKSTAT_ASYNC_ITEMS);
- printf(TPS_INF_FMT, *val);
+ (void) printf(TPS_INF_FMT, *val);
val = (uint32_t *)kstat_value(cur_set, RDC_IKSTAT_ASYNC_BLOCKS);
- printf(KPS_INF_FMT, (float)(*val / 2));
+ (void) printf(KPS_INF_FMT, (float)(*val / 2));
val = (uint32_t *)kstat_value(cur_set, RDC_IKSTAT_ASYNC_ITEM_HWM);
- printf(TPS_INF_FMT, *val);
+ (void) printf(TPS_INF_FMT, *val);
val = (uint32_t *)kstat_value(cur_set, RDC_IKSTAT_ASYNC_BLOCK_HWM);
- printf(KPS_INF_FMT, (float)(*val / 2));
+ (void) printf(KPS_INF_FMT, (float)(*val / 2));
}
--- a/usr/src/cmd/avs/dsw/iiadm.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsw/iiadm.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -248,7 +248,7 @@
InitEnv();
- memset(av, 0, sizeof (av));
+ (void) memset(av, 0, sizeof (av));
cmdnam = argv[0];
while ((c = getopt(argc, argv, opt_list)) != EOF)
switch (c) {
@@ -724,7 +724,7 @@
break;
default:
- fprintf(stderr,
+ (void) fprintf(stderr,
"cfg locking needs to be set for %08x\n", cmd);
exit(1);
break;
@@ -744,16 +744,16 @@
rc = ioctl(fd, cmd, arg);
save_errno = errno;
if (config_locked && unlocked) {
- cfg_lock(cfg, last_lock);
+ (void) cfg_lock(cfg, last_lock);
}
if (unlocked) {
/* reload vol hashes */
if (reload_vols & LD_SVOLS)
- cfg_load_svols(cfg);
+ (void) cfg_load_svols(cfg);
if (reload_vols & LD_DSVOLS)
- cfg_load_dsvols(cfg);
+ (void) cfg_load_dsvols(cfg);
if (reload_vols & LD_SHADOWS)
- cfg_load_shadows(cfg);
+ (void) cfg_load_shadows(cfg);
if (reload_vols & LD_II)
load_ii_vols(cfg);
}
@@ -919,7 +919,7 @@
conf = &config;
(void) get_dsw_config(setnumber, conf);
if (io) {
- strncpy(io->shadow_vol, conf->shadow_vol, DSW_NAMELEN);
+ (void) strncpy(io->shadow_vol, conf->shadow_vol, DSW_NAMELEN);
io->shadow_vol[DSW_NAMELEN] = '\0';
}
return (1);
@@ -967,8 +967,8 @@
}
if (io) {
- strncpy(io->shadow_vol, c->shadow_vol,
- DSW_NAMELEN);
+ (void) strncpy(io->shadow_vol, c->shadow_vol,
+ DSW_NAMELEN);
io->shadow_vol[DSW_NAMELEN] = '\0';
}
return (1);
@@ -1235,7 +1235,7 @@
#ifdef DEBUG
char *override = getenv("II_CLUSTER_TAG");
if (override) {
- strcpy(result, override);
+ (void) strcpy(result, override);
return (1);
}
#endif
@@ -1258,7 +1258,7 @@
/*
* Copy dgname into result
*/
- strcpy(result, dgname);
+ (void) strcpy(result, dgname);
return (1);
}
@@ -1296,19 +1296,19 @@
(void) textdomain(DSW_TEXT_DOMAIN);
#ifndef DEBUG
- sigset(SIGHUP, sigterm);
- sigset(SIGINT, sigterm);
- sigset(SIGQUIT, sigterm);
- sigset(SIGILL, sigterm);
- sigset(SIGEMT, sigterm);
- sigset(SIGABRT, sigterm);
- sigset(SIGFPE, sigterm);
- sigset(SIGBUS, sigterm);
- sigset(SIGSEGV, sigterm);
- sigset(SIGTERM, sigterm);
- sigset(SIGPWR, sigterm);
- sigset(SIGSTOP, sigterm);
- sigset(SIGTSTP, sigterm);
+ (void) sigset(SIGHUP, sigterm);
+ (void) sigset(SIGINT, sigterm);
+ (void) sigset(SIGQUIT, sigterm);
+ (void) sigset(SIGILL, sigterm);
+ (void) sigset(SIGEMT, sigterm);
+ (void) sigset(SIGABRT, sigterm);
+ (void) sigset(SIGFPE, sigterm);
+ (void) sigset(SIGBUS, sigterm);
+ (void) sigset(SIGSEGV, sigterm);
+ (void) sigset(SIGTERM, sigterm);
+ (void) sigset(SIGPWR, sigterm);
+ (void) sigset(SIGSTOP, sigterm);
+ (void) sigset(SIGTSTP, sigterm);
#endif
dsw_fd = open(DSWDEV, O_RDONLY);
@@ -1317,7 +1317,7 @@
exit(1);
}
- setsid();
+ (void) setsid();
}
/*
@@ -1365,7 +1365,7 @@
{
dsw_bitmap_t parms;
- strncpy(parms.shadow_vol, master_volume, DSW_NAMELEN);
+ (void) strncpy(parms.shadow_vol, master_volume, DSW_NAMELEN);
parms.shadow_vol[DSW_NAMELEN-1] = '\0';
parms.shd_bitmap = shd_bitmap;
parms.shd_size = size;
@@ -1386,7 +1386,7 @@
dsw_stat_t args;
int stat_flags;
- strncpy(args.shadow_vol, shadow_volume, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, shadow_volume, DSW_NAMELEN);
args.shadow_vol[DSW_NAMELEN-1] = '\0';
args.status = spcs_s_ucreate();
@@ -1416,8 +1416,8 @@
return (NULL);
}
- memset(shd_bitmap, 0, bm_size);
- memset(copy_bitmap, 0, bm_size);
+ (void) memset(shd_bitmap, 0, bm_size);
+ (void) memset(copy_bitmap, 0, bm_size);
if (get_bitmap(shadow_volume, shd_bitmap, copy_bitmap, bm_size) < 0) {
free(copy_bitmap);
@@ -1711,8 +1711,8 @@
if (nflg || !isatty(fileno(stdin)))
return;
- strncpy(yeschr, nl_langinfo(YESSTR), MAX_LINE_SIZE + 1);
- strncpy(nochr, nl_langinfo(NOSTR), MAX_LINE_SIZE + 1);
+ (void) strncpy(yeschr, nl_langinfo(YESSTR), MAX_LINE_SIZE + 1);
+ (void) strncpy(nochr, nl_langinfo(NOSTR), MAX_LINE_SIZE + 1);
/*CONSTCOND*/
while (1) {
@@ -1742,10 +1742,10 @@
dsw_stat_t args;
int rc;
- strncpy(args.shadow_vol, volume, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, volume, DSW_NAMELEN);
args.shadow_vol[DSW_NAMELEN-1] = '\0';
- for (; dead_child != child; sleep(1)) {
+ for (; dead_child != child; (void) sleep(1)) {
/* poll shadow group with a status ioctl() */
args.status = spcs_s_ucreate();
@@ -1949,7 +1949,7 @@
/*
* Copy cluster name into config
*/
- strncpy(parms.cluster_tag, cfg_cluster_tag, DSW_NAMELEN);
+ (void) strncpy(parms.cluster_tag, cfg_cluster_tag, DSW_NAMELEN);
break;
case II_CLUSTER_LCL:
@@ -1972,7 +1972,7 @@
* If we've got a group name, add it into the config
*/
if (group_name) {
- strncpy(parms.group_name, group_name, DSW_NAMELEN);
+ (void) strncpy(parms.group_name, group_name, DSW_NAMELEN);
}
/*
@@ -2020,9 +2020,9 @@
}
}
- strncpy(parms.master_vol, master_volume, DSW_NAMELEN);
- strncpy(parms.shadow_vol, shadow_volume, DSW_NAMELEN);
- strncpy(parms.bitmap_vol, bitmap_volume, DSW_NAMELEN);
+ (void) strncpy(parms.master_vol, master_volume, DSW_NAMELEN);
+ (void) strncpy(parms.shadow_vol, shadow_volume, DSW_NAMELEN);
+ (void) strncpy(parms.bitmap_vol, bitmap_volume, DSW_NAMELEN);
errno = 0;
parms.status = spcs_s_ucreate();
@@ -2109,7 +2109,7 @@
cfg_unlock(cfg);
config_locked = 0;
- sigset(SIGCHLD, sigchild);
+ (void) sigset(SIGCHLD, sigchild);
switch (child = fork()) {
case (pid_t)-1:
@@ -2190,7 +2190,7 @@
unlocked = 1;
spcs_log("ii", NULL, gettext("Start reset %s"), volume);
- strncpy(prev_stat.shadow_vol, volume, DSW_NAMELEN);
+ (void) strncpy(prev_stat.shadow_vol, volume, DSW_NAMELEN);
prev_stat.shadow_vol[DSW_NAMELEN - 1] = '\0';
prev_stat.status = spcs_s_ucreate();
if (do_ioctl(dsw_fd, DSWIOC_STAT, &prev_stat) == -1) {
@@ -2198,7 +2198,8 @@
do_enable = 1;
/* first check to see whether the set was offline */
- snprintf(key, CFG_MAX_KEY, "ii.set%d.options", setnumber);
+ (void) snprintf(key, CFG_MAX_KEY, "ii.set%d.options",
+ setnumber);
if (!ii_lock(cfg, CFG_RDLOCK)) {
dsw_error(gettext("Unable to set locking on the "
"configuration"), NULL);
@@ -2212,7 +2213,7 @@
cfg_unlock(cfg);
config_locked = 0;
unlocked = 1;
- sscanf(optval, "%x", &flags);
+ (void) sscanf(optval, "%x", &flags);
if ((flags & DSW_OFFLINE) == 0) {
/* set wasn't offline - don't reset */
dsw_error(gettext("Set not offline, will not reset"),
@@ -2229,7 +2230,7 @@
spcs_s_ufree(&prev_stat.status);
if (wait_action == WaitForStart)
- sigset(SIGCHLD, sigchild);
+ (void) sigset(SIGCHLD, sigchild);
switch (child = fork()) {
@@ -2251,7 +2252,8 @@
if (strlen(last_overflow) > 0 &&
(stat_flags & (DSW_SHDOFFLINE | DSW_BMPOFFLINE)) != 0) {
/* reattach it */
- strncpy(parms.bitmap_vol, last_overflow, DSW_NAMELEN);
+ (void) strncpy(parms.bitmap_vol, last_overflow,
+ DSW_NAMELEN);
do_attach(&parms);
}
spcs_log("ii", stat, gettext("Finish reset %s"), volume);
@@ -2264,7 +2266,7 @@
rc = child_wait(child, CopyStart, args.shadow_vol);
} else { /* wait_action == WaitForEnd */
wait_loc = 0;
- wait(&wait_loc);
+ (void) wait(&wait_loc);
if (WIFEXITED(wait_loc) && (WEXITSTATUS(wait_loc) == 0))
rc = 0;
else
@@ -2283,12 +2285,13 @@
dsw_error(gettext("Volume is not in a Point-in-Time "
"Copy group"), NULL);
}
- snprintf(key, CFG_MAX_KEY, "ii.set%d.options", setnumber);
+ (void) snprintf(key, CFG_MAX_KEY, "ii.set%d.options",
+ setnumber);
if (cfg_del_option(cfg, CFG_SEC_CONF, key, NSKERN_II_BMP_OPTION)
< 0) {
dsw_error(gettext("Update of config failed"), NULL);
}
- cfg_commit(cfg);
+ (void) cfg_commit(cfg);
cfg_unlock(cfg);
config_locked = 0;
}
@@ -2308,7 +2311,7 @@
dsw_error(gettext("Volume is part of a Point-in-Time Copy "
"group"), NULL);
args.status = spcs_s_ucreate();
- strncpy(args.shadow_vol, volume, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, volume, DSW_NAMELEN);
rc = do_ioctl(dsw_fd, DSWIOC_OCREAT, &args);
if (rc == -1) {
spcs_log("ii", &args.status,
@@ -2419,7 +2422,7 @@
group_list->count = count;
group_list->flags = 0;
group_list->status = spcs_s_ucreate();
- strncpy(group_list->shadow_vol, group, DSW_NAMELEN);
+ (void) strncpy(group_list->shadow_vol, group, DSW_NAMELEN);
rc = do_ioctl(dsw_fd, DSWIOC_GLIST, group_list);
if (rc < 0)
@@ -2500,7 +2503,7 @@
ppid = getenv("IIADM_PPID");
if (ppid) {
acopy_args->pid = atoi(ppid);
- fprintf(stderr, "(using %s for ppid)\n", ppid);
+ (void) fprintf(stderr, "(using %s for ppid)\n", ppid);
} else {
acopy_args->pid = getppid();
}
@@ -2525,7 +2528,8 @@
"unmount it first"), NULL);
}
- strncpy(stat_s.shadow_vol, parms.shadow_vol, DSW_NAMELEN);
+ (void) strncpy(stat_s.shadow_vol, parms.shadow_vol,
+ DSW_NAMELEN);
stat_s.shadow_vol[DSW_NAMELEN-1] = '\0';
stat_s.status = spcs_s_ucreate();
rc = do_ioctl(dsw_fd, DSWIOC_STAT, &stat_s);
@@ -2555,9 +2559,9 @@
if (group_name == NULL || *group_name == NULL) {
sp = acopy_args->shadow_vol;
for (i = 0; i < n_vols; i++, sp += DSW_NAMELEN)
- strncpy(sp, vol_list[i], DSW_NAMELEN);
+ (void) strncpy(sp, vol_list[i], DSW_NAMELEN);
} else {
- strncpy(acopy_args->shadow_vol, group_name, DSW_NAMELEN);
+ (void) strncpy(acopy_args->shadow_vol, group_name, DSW_NAMELEN);
acopy_args->flags |= CV_IS_GROUP;
}
rc = do_ioctl(dsw_fd, DSWIOC_ACOPY, acopy_args);
@@ -2618,7 +2622,7 @@
ppid = getenv("IIADM_PPID");
if (ppid) {
copy_args.pid = atoi(ppid);
- fprintf(stderr, "(using %s for ppid)\n", ppid);
+ (void) fprintf(stderr, "(using %s for ppid)\n", ppid);
} else {
copy_args.pid = getppid();
}
@@ -2633,7 +2637,7 @@
"unmount it first"), NULL);
}
- strncpy(stat_s.shadow_vol, copy_args.shadow_vol, DSW_NAMELEN);
+ (void) strncpy(stat_s.shadow_vol, copy_args.shadow_vol, DSW_NAMELEN);
stat_s.shadow_vol[DSW_NAMELEN-1] = '\0';
stat_s.status = spcs_s_ucreate();
rc = do_ioctl(dsw_fd, DSWIOC_STAT, &stat_s);
@@ -2656,7 +2660,7 @@
gettext("to shadow"));
if (wait_action == WaitForStart)
- sigset(SIGCHLD, sigchild);
+ (void) sigset(SIGCHLD, sigchild);
switch (child = fork()) {
case (pid_t)-1:
@@ -2691,7 +2695,7 @@
rc = child_wait(child, CopyStart, copy_args.shadow_vol);
} else { /* wait_action == WaitForEnd */
wait_loc = 0;
- wait(&wait_loc);
+ (void) wait(&wait_loc);
if (WIFEXITED(wait_loc) && (WEXITSTATUS(wait_loc) == 0))
rc = 0;
else
@@ -2713,7 +2717,7 @@
if (need_sep++ > 0)
(void) printf("--------------------------------------"
"----------------------------------------\n");
- strncpy(args.shadow_vol, conf->shadow_vol, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, conf->shadow_vol, DSW_NAMELEN);
args.shadow_vol[DSW_NAMELEN-1] = '\0';
if (in_config) {
(void) printf("%s: %s\n",
@@ -2986,7 +2990,7 @@
ppid = getenv("IIADM_PPID");
if (ppid) {
parms.pid = atoi(ppid);
- fprintf(stderr, "(using %s for ppid)\n", ppid);
+ (void) fprintf(stderr, "(using %s for ppid)\n", ppid);
} else {
parms.pid = (nflg) ? -1 : getppid();
}
@@ -3039,7 +3043,7 @@
if (cfg_vol_disable(cfg, volume, cfg_cluster_tag, "ii") < 0) {
dsw_error(gettext("SV-disable failed"), NULL);
}
- cfg_commit(cfg);
+ (void) cfg_commit(cfg);
}
/* restore old cluster tag, if changed */
@@ -3083,7 +3087,7 @@
dsw_stat_t args;
if (mounted(vol)) {
- strncpy(args.shadow_vol, vol, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, vol, DSW_NAMELEN);
args.shadow_vol[DSW_NAMELEN - 1] = '\0';
args.status = spcs_s_ucreate();
if (do_ioctl(dsw_fd, DSWIOC_STAT, &args) != -1 &&
@@ -3103,7 +3107,7 @@
dsw_stat_t args;
for (p = group_volumes; *p; p++) {
- strncpy(args.shadow_vol, *p, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, *p, DSW_NAMELEN);
args.shadow_vol[DSW_NAMELEN - 1] = '\0';
args.status = spcs_s_ucreate();
if (do_ioctl(dsw_fd, DSWIOC_STAT, &args) == -1) {
@@ -3139,7 +3143,7 @@
can_disable(*p);
}
- strncpy(parms.shadow_vol, group_name, DSW_NAMELEN);
+ (void) strncpy(parms.shadow_vol, group_name, DSW_NAMELEN);
if (*group_name)
flags = CV_IS_GROUP;
} else {
@@ -3157,7 +3161,7 @@
for (p = group_volumes; *p; p++) {
parms.status = spcs_s_ucreate();
parms.flags = flags;
- strncpy(parms.shadow_vol, *p, DSW_NAMELEN);
+ (void) strncpy(parms.shadow_vol, *p, DSW_NAMELEN);
rc = do_ioctl(dsw_fd, DSWIOC_DISABLE, &parms);
if (rc == -1 && errno != DSW_ENOTFOUND)
dsw_error(gettext("Disable failed"),
@@ -3203,7 +3207,8 @@
for (p = group_volumes; *p; p++) {
if (!find_shadow_config(*p, NULL, NULL)) {
/* argh! */
- fprintf(stderr, gettext("Volume '%s' is not "
+ (void) fprintf(stderr,
+ gettext("Volume '%s' is not "
"in a Point-in-Time Copy group"), *p);
} else {
remove_iiset(setnumber, *p, 0);
@@ -3262,7 +3267,7 @@
acopy_args->flags = 0;
acopy_args->status = spcs_s_ucreate();
if (cluster)
- strncpy(acopy_args->shadow_vol, cluster, DSW_NAMELEN);
+ (void) strncpy(acopy_args->shadow_vol, cluster, DSW_NAMELEN);
rc = do_ioctl(dsw_fd, DSWIOC_CLIST, acopy_args);
if (rc == -1)
@@ -3272,14 +3277,15 @@
acopy_args->shadow_vol[DSW_NAMELEN*acopy_args->count] = NULL;
if (cluster) {
- printf(gettext("Sets in cluster resource group %s:\n"),
+ (void) printf(gettext("Sets in cluster resource group %s:\n"),
cluster);
} else {
- printf(gettext("Currently configured resource groups\n"));
+ (void) printf(
+ gettext("Currently configured resource groups\n"));
}
for (i = 0, ptr = acopy_args->shadow_vol; *ptr &&
i < acopy_args->count; i++, ptr += DSW_NAMELEN) {
- printf(" %-64.64s\n", ptr);
+ (void) printf(" %-64.64s\n", ptr);
}
}
@@ -3415,7 +3421,7 @@
(void) printf(gettext(
"Volume is not in configuration file\n"), NULL);
(void) fflush(stdout);
- strncpy(parms.shadow_vol, argv[1], DSW_NAMELEN);
+ (void) strncpy(parms.shadow_vol, argv[1], DSW_NAMELEN);
parms.shadow_vol[DSW_NAMELEN] = '\0';
}
print_status(&parms, in_config);
@@ -3465,7 +3471,7 @@
(void) printf(gettext(
"Volume is not in configuration file\n"), NULL);
(void) fflush(stdout);
- strncpy(parms.master_vol, argv[1], DSW_NAMELEN);
+ (void) strncpy(parms.master_vol, argv[1], DSW_NAMELEN);
parms.master_vol[DSW_NAMELEN] = '\0';
}
@@ -3581,10 +3587,10 @@
reload_vols = LD_DSVOLS | LD_SHADOWS;
conform_name(&shadow_volume);
- strcpy(parms.master_vol, II_IMPORTED_SHADOW);
- strncpy(parms.shadow_vol, shadow_volume, DSW_NAMELEN);
+ (void) strcpy(parms.master_vol, II_IMPORTED_SHADOW);
+ (void) strncpy(parms.shadow_vol, shadow_volume, DSW_NAMELEN);
parms.shadow_vol[DSW_NAMELEN-1] = '\0';
- strncpy(parms.bitmap_vol, bitmap_volume, DSW_NAMELEN);
+ (void) strncpy(parms.bitmap_vol, bitmap_volume, DSW_NAMELEN);
parms.bitmap_vol[DSW_NAMELEN-1] = '\0';
parms.flag = DSW_GOLDEN;
@@ -3692,7 +3698,7 @@
(void) fclose(bmpfp);
- strncpy(parms.shadow_vol, shadow_volume, DSW_NAMELEN);
+ (void) strncpy(parms.shadow_vol, shadow_volume, DSW_NAMELEN);
parms.shadow_vol[DSW_NAMELEN-1] = '\0';
parms.shd_bitmap = shd_bitmap;
parms.shd_size = size;
@@ -3713,7 +3719,7 @@
if (rc < 0) {
dsw_error(gettext("SV-enable failed"), NULL);
}
- cfg_commit(cfg);
+ (void) cfg_commit(cfg);
}
spcs_s_ufree(&parms.status);
}
@@ -3729,7 +3735,7 @@
int new_delay;
int new_unit;
- strncpy(parms.shadow_vol, shadow_volume, DSW_NAMELEN);
+ (void) strncpy(parms.shadow_vol, shadow_volume, DSW_NAMELEN);
parms.shadow_vol[DSW_NAMELEN-1] = '\0';
if (delay == NULL || unit == NULL) {
get = 1;
@@ -3783,7 +3789,7 @@
dsw_error(
gettext("Volume is not in a Point-in-Time Copy "
"group"), NULL);
- strncpy(io.bitmap_vol, parms->bitmap_vol, DSW_NAMELEN);
+ (void) strncpy(io.bitmap_vol, parms->bitmap_vol, DSW_NAMELEN);
io.bitmap_vol[DSW_NAMELEN-1] = '\0';
io.status = spcs_s_ucreate();
if (do_ioctl(dsw_fd, DSWIOC_OATTACH, &io) == -1) {
@@ -3842,7 +3848,7 @@
"group"), NULL);
/* can only attach an overflow volume to dependent, compact shadow */
- strncpy(args.shadow_vol, shadow_volume, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, shadow_volume, DSW_NAMELEN);
args.shadow_vol[DSW_NAMELEN-1] = '\0';
args.status = spcs_s_ucreate();
@@ -3851,7 +3857,7 @@
dsw_error(gettext("Not a compact dependent shadow"), NULL);
/* bitmap_vol is overloaded */
- strncpy(parms.bitmap_vol, overflow_file, DSW_NAMELEN);
+ (void) strncpy(parms.bitmap_vol, overflow_file, DSW_NAMELEN);
parms.bitmap_vol[DSW_NAMELEN-1] = '\0';
do_attach(&parms);
@@ -3941,7 +3947,7 @@
/* make copy of string */
vol[ i ] = (char *)malloc(DSW_NAMELEN + 1);
- strncpy(vol[ i ], sp, DSW_NAMELEN);
+ (void) strncpy(vol[ i ], sp, DSW_NAMELEN);
vol[ i ][ DSW_NAMELEN ] = '\0';
item.key = vol[ i ];
@@ -3996,7 +4002,7 @@
if (argc != 2)
usage(gettext("Incorrect number of arguments"));
- strncpy(args.overflow_vol, argv[1], DSW_NAMELEN);
+ (void) strncpy(args.overflow_vol, argv[1], DSW_NAMELEN);
args.overflow_vol[DSW_NAMELEN-1] = '\0';
args.status = spcs_s_ucreate();
@@ -4036,7 +4042,7 @@
int waserr = 0;
/* handle move to NULL group, or group of all spaces or tabs */
- strncpy(movegrp.new_group, group_name, DSW_NAMELEN);
+ (void) strncpy(movegrp.new_group, group_name, DSW_NAMELEN);
if ((strlen(group_name) == 0) || (strcspn(group_name, " \t") == 0)) {
group_name = "-";
bzero(movegrp.new_group, DSW_NAMELEN);
@@ -4067,7 +4073,8 @@
}
/* move the set in the kernel */
- strncpy(movegrp.shadow_vol, parms.shadow_vol, DSW_NAMELEN);
+ (void) strncpy(movegrp.shadow_vol, parms.shadow_vol,
+ DSW_NAMELEN);
if (do_ioctl(dsw_fd, DSWIOC_MOVEGRP, &movegrp) < 0)
dsw_error(gettext("Failed to move group in kernel"),
NULL);
@@ -4189,7 +4196,7 @@
/* grab shadow volume name */
sdata = (shdvol_t *)malloc(sizeof (shdvol_t));
- strncpy(sdata->master, mst, DSW_NAMELEN);
+ (void) strncpy(sdata->master, mst, DSW_NAMELEN);
(void) nsc_insert_node(volhash, sdata, shd);
/* No need to continue if no groups or ctags */
@@ -4204,7 +4211,8 @@
if (*ctag &&
(strncmp(ctag, gdata->ctag, DSW_NAMELEN) != 0)) {
if (!whinged) {
- printf(gettext("Warning: multiple "
+ (void) printf(gettext(
+ "Warning: multiple "
"cluster resource groups "
"defined within a single "
"I/O group\n"));
@@ -4213,7 +4221,7 @@
}
} else {
gdata = (grptag_t *)malloc(sizeof (grptag_t));
- strncpy(gdata->ctag, ctag, DSW_NAMELEN);
+ (void) strncpy(gdata->ctag, ctag, DSW_NAMELEN);
(void) nsc_insert_node(volhash, gdata, group);
}
@@ -4276,7 +4284,7 @@
dsw_stat_t args;
int rc;
- strncpy(args.shadow_vol, set, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, set, DSW_NAMELEN);
args.shadow_vol[DSW_NAMELEN-1] = '\0';
args.status = spcs_s_ucreate();
@@ -4301,7 +4309,7 @@
dsw_error(gettext("Unable to parse config file"), NULL);
}
if (rc) {
- printf(" '%s'\n%s\n '%s'\n", *path,
+ (void) printf(" '%s'\n%s\n '%s'\n", *path,
gettext("is currently configured as"), cfgname);
check_action(gettext("Perform operation with indicated volume"
" name?"));
--- a/usr/src/cmd/avs/dsw/iiboot.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsw/iiboot.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -114,7 +114,7 @@
{
int wait_loc = 0;
- wait(&wait_loc);
+ (void) wait(&wait_loc);
if (WIFEXITED(wait_loc) && (WEXITSTATUS(wait_loc) == 0)) {
;
/*EMPTY*/
@@ -186,7 +186,8 @@
bzero(&ii_suspend, sizeof (dsw_ioctl_t));
ii_suspend.status = spcs_s_ucreate();
ii_suspend.flags = CV_IS_CLUSTER;
- strncpy(ii_suspend.shadow_vol, cfg_cluster_tag, DSW_NAMELEN);
+ (void) strncpy(ii_suspend.shadow_vol, cfg_cluster_tag,
+ DSW_NAMELEN);
rc = ioctl(ioctl_fd, flag, &ii_suspend);
if ((rc) && (errno != DSW_ECNOTFOUND)) {
spcs_log("ii", &ii_suspend.status,
@@ -242,12 +243,12 @@
}
if (i != pairs)
continue;
- memmove(lp, lp + 1, j * sizeof (dsw_config_t));
+ (void) memmove(lp, lp + 1, j * sizeof (dsw_config_t));
args.list_used--;
}
}
- sigset(SIGCHLD, sigchld);
+ (void) sigset(SIGCHLD, sigchld);
fork_cnt = fork_rc = 0;
for (i = 0; i < pairs; i++) {
ustatus = spcs_s_ucreate();
@@ -265,7 +266,7 @@
/* back off on the max processes and try again */
--max_processes;
if (fork_cnt > 0) {
- pause();
+ (void) pause();
}
pid = fork();
}
@@ -273,7 +274,7 @@
if (pid > 0) { /* this is parent process */
++fork_cnt;
while (fork_cnt > MAX_PROCESSES) {
- pause();
+ (void) pause();
}
continue;
}
@@ -301,10 +302,10 @@
* Set rc for success
*/
while (fork_cnt > 0) {
- alarm(60); /* wake up in 60 secs just in case */
- pause();
+ (void) alarm(60); /* wake up in 60 secs just in case */
+ (void) pause();
}
- alarm(0);
+ (void) alarm(0);
/* Disable duplicate shadows that were part of the implicit join */
if ((j = args.list_used) != 0) {
@@ -335,9 +336,9 @@
/* Sooner or later, this lock will be free */
while (!cfg_lock(cfg, CFG_WRLOCK))
- sleep(2);
+ (void) sleep(2);
- snprintf(key, CFG_MAX_KEY, "ii.set%d", setno);
+ (void) snprintf(key, CFG_MAX_KEY, "ii.set%d", setno);
if (cfg_get_cstring(cfg, key, buf, CFG_MAX_BUF) < 0) {
cfg_close(cfg);
break;
@@ -394,7 +395,7 @@
/*
* Commit the delete
*/
- cfg_commit(cfg);
+ (void) cfg_commit(cfg);
cfg_close(cfg);
/*
@@ -407,16 +408,16 @@
/* Sooner or later, this lock will be free */
while (!cfg_lock(cfg, CFG_WRLOCK))
- sleep(2);
+ (void) sleep(2);
/* Set cluster tag for Shadow volume */
- cfg_vol_enable(cfg, shd, ctag, "ii");
+ (void) cfg_vol_enable(cfg, shd, ctag, "ii");
/*
* Commit the delete
*/
- cfg_commit(cfg);
+ (void) cfg_commit(cfg);
cfg_close(cfg);
}
}
@@ -516,11 +517,11 @@
continue;
}
- strncpy(p->master_vol, mst, DSW_NAMELEN);
- strncpy(p->shadow_vol, shd, DSW_NAMELEN);
- strncpy(p->bitmap_vol, bmp, DSW_NAMELEN);
+ (void) strncpy(p->master_vol, mst, DSW_NAMELEN);
+ (void) strncpy(p->shadow_vol, shd, DSW_NAMELEN);
+ (void) strncpy(p->bitmap_vol, bmp, DSW_NAMELEN);
if (ctag)
- strncpy(p->cluster_tag, ctag, DSW_NAMELEN);
+ (void) strncpy(p->cluster_tag, ctag, DSW_NAMELEN);
free(buf);
++p;
++valid_sets;
--- a/usr/src/cmd/avs/dsw/iicpbmp.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsw/iicpbmp.c Fri Jan 22 21:39:01 2010 -0800
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -90,14 +90,16 @@
if (update_cfg) {
if ((cfg = cfg_open(NULL)) == NULL) {
- fprintf(stderr, gettext("Error opening config\n"));
+ (void) fprintf(stderr,
+ gettext("Error opening config\n"));
exit(1);
}
if (!cfg_lock(cfg, CFG_WRLOCK)) {
spcs_log("ii", NULL,
- "iicpbmp CFG_WRLOCK failed, errno %d", errno);
- fprintf(stderr, gettext("Error locking config\n"));
+ "iicpbmp CFG_WRLOCK failed, errno %d", errno);
+ (void) fprintf(stderr,
+ gettext("Error locking config\n"));
exit(1);
}
}
@@ -113,8 +115,9 @@
void
iicpbmp_usage()
{
- fprintf(stderr, gettext("Usage:\n"));
- fprintf(stderr, gettext("\tiicpbmp [-c] old_bitmap new_bitmap\n"));
+ (void) fprintf(stderr, gettext("Usage:\n"));
+ (void) fprintf(stderr,
+ gettext("\tiicpbmp [-c] old_bitmap new_bitmap\n"));
exit(1);
}
@@ -134,98 +137,101 @@
exit(1);
}
if (*old_bitmap != '/' || *new_bitmap != '/') {
- fprintf(stderr, gettext(
- "Both old and new bitmap file names must begin with a /.\n"));
+ (void) fprintf(stderr, gettext("Both old and new bitmap "
+ "file names must begin with a /.\n"));
exit(1);
}
if (strlen(new_bitmap) > DSW_NAMELEN) {
- fprintf(stderr, gettext("New bitmap name is to long.\n"));
+ (void) fprintf(stderr,
+ gettext("New bitmap name is too long.\n"));
exit(1);
}
if (update_cfg && find_bitmap_cfg(old_bitmap) == 0) {
perror(old_bitmap);
- fprintf(stderr, gettext("Old bitmap not in existing cfg\n"));
+ (void) fprintf(stderr,
+ gettext("Old bitmap not in existing cfg\n"));
exit(1);
}
- strncpy(args.shadow_vol, shadow, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, shadow, DSW_NAMELEN);
args.shadow_vol[DSW_NAMELEN-1] = '\0';
args.status = spcs_s_ucreate();
if (ioctl(dsw_fd, DSWIOC_STAT, &args) != -1) {
- fprintf(stderr, gettext("Suspend the Point-in-Time Copy "
+ (void) fprintf(stderr, gettext("Suspend the Point-in-Time Copy "
"set first\n"));
- close(dsw_fd);
+ (void) close(dsw_fd);
exit(1);
}
if ((ifp = fopen(old_bitmap, "r")) == NULL) {
perror(old_bitmap);
- fprintf(stderr, gettext("Can't open old bitmap file\n"));
+ (void) fprintf(stderr, gettext("Can't open old bitmap file\n"));
exit(1);
}
/* Check old header looks like an Point-in-Time Copy bitmap header */
if (fread(&header, sizeof (header), 1, ifp) != 1) {
- fprintf(stderr, gettext("Can't read old bitmap file\n"));
+ (void) fprintf(stderr, gettext("Can't read old bitmap file\n"));
exit(1);
}
if (header.ii_magic != DSW_CLEAN && header.ii_magic != DSW_DIRTY) {
- fprintf(stderr, gettext("%s is not a Point-in-Time Copy "
- "bitmap.\n"), old_bitmap);
+ (void) fprintf(stderr, gettext("%s is not a Point-in-Time Copy "
+ "bitmap.\n"), old_bitmap);
exit(1);
}
if (strncmp(header.bitmap_vol, old_bitmap, DSW_NAMELEN) != 0) {
- fprintf(stderr, gettext(
- "%s has Point-in-Time Copy bitmap magic number,\n"
- "but does not contain correct data.\n"), old_bitmap);
+ (void) fprintf(stderr, gettext(
+ "%s has Point-in-Time Copy bitmap magic number,\n"
+ "but does not contain correct data.\n"), old_bitmap);
exit(1);
}
if ((ofp = fopen(new_bitmap, "w")) == NULL) {
perror(new_bitmap);
- fprintf(stderr, gettext("Can't open new bitmap file\n"));
+ (void) fprintf(stderr, gettext("Can't open new bitmap file\n"));
exit(1);
}
/* Set up new header */
- memset(header.bitmap_vol, 0, DSW_NAMELEN);
- strncpy(header.bitmap_vol, new_bitmap, DSW_NAMELEN);
+ (void) memset(header.bitmap_vol, 0, DSW_NAMELEN);
+ (void) strncpy(header.bitmap_vol, new_bitmap, DSW_NAMELEN);
if (fwrite(&header, sizeof (header), 1, ofp) != 1) {
perror(new_bitmap);
- fprintf(stderr, gettext("Can't write new bitmap header\n"));
+ (void) fprintf(stderr,
+ gettext("Can't write new bitmap header\n"));
exit(1);
}
/* Copy the bitmap itself */
while ((i = fread(cp_buffer, sizeof (char), sizeof (cp_buffer), ifp))
- > 0) {
+ > 0) {
if (fwrite(cp_buffer, sizeof (char), i, ofp) != i) {
perror(gettext("Write new bitmap failed"));
break;
}
}
- fclose(ofp);
- fclose(ifp);
- close(dsw_fd);
+ (void) fclose(ofp);
+ (void) fclose(ifp);
+ (void) close(dsw_fd);
if (update_cfg) {
- sprintf(key, "ii.set%d.bitmap", setnumber);
+ (void) sprintf(key, "ii.set%d.bitmap", setnumber);
if (cfg_put_cstring(cfg, key, new_bitmap, strlen(new_bitmap))
- < 0) {
+ < 0) {
perror("cfg_put_cstring");
}
- cfg_commit(cfg);
+ (void) cfg_commit(cfg);
spcs_log("ii", NULL,
- "iicpbmp copy bit map for %s from %s to %s",
- shadow, old_bitmap, new_bitmap);
+ "iicpbmp copy bit map for %s from %s to %s",
+ shadow, old_bitmap, new_bitmap);
}
}
@@ -239,13 +245,15 @@
{
for (setnumber = 1; ; setnumber++) {
bzero(buf, CFG_MAX_BUF);
- snprintf(key, sizeof (key), "ii.set%d.bitmap", setnumber);
+ (void) snprintf(key, sizeof (key), "ii.set%d.bitmap",
+ setnumber);
+
if (cfg_get_cstring(cfg, key, buf, DSW_NAMELEN) < 0)
return (0);
if (strcmp(buf, bitmap) == 0) {
- snprintf(key, sizeof (key), "ii.set%d.shadow",
- setnumber);
- cfg_get_cstring(cfg, key, shadow, DSW_NAMELEN);
+ (void) snprintf(key, sizeof (key), "ii.set%d.shadow",
+ setnumber);
+ (void) cfg_get_cstring(cfg, key, shadow, DSW_NAMELEN);
return (setnumber);
}
}
--- a/usr/src/cmd/avs/dsw/iicpshd.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/dsw/iicpshd.c Fri Jan 22 21:39:01 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.
*/
@@ -96,7 +96,7 @@
/* open dscfg anyway */
if ((cfg = cfg_open(NULL)) == NULL) {
- fprintf(stderr, gettext("Error opening config\n"));
+ (void) fprintf(stderr, gettext("Error opening config\n"));
exit(1);
}
@@ -112,8 +112,9 @@
void
iicpshd_usage()
{
- fprintf(stderr, gettext("Usage:\n"));
- fprintf(stderr, gettext("\tiicpshd [-s] old_shadow new_shadow\n"));
+ (void) fprintf(stderr, gettext("Usage:\n"));
+ (void) fprintf(stderr,
+ gettext("\tiicpshd [-s] old_shadow new_shadow\n"));
exit(1);
}
@@ -135,51 +136,55 @@
exit(1);
}
if (*old_vol != '/' || *new_vol != '/') {
- fprintf(stderr, gettext(
- "Both old and new shadow file names must begin with a /.\n"));
+ (void) fprintf(stderr, gettext("Both old and new shadow "
+ "file names must begin with a /.\n"));
exit(1);
}
if (strlen(new_vol) > DSW_NAMELEN) {
- fprintf(stderr, gettext("New shadow name is to long.\n"));
+ (void) fprintf(stderr,
+ gettext("New shadow name is to long.\n"));
exit(1);
}
/* check old shadow is in dscfg */
if (find_cfg_info(old_vol, SHADOW_TOKEN) == 0) {
- fprintf(stderr, gettext("Old shadow not in existing cfg\n"));
+ (void) fprintf(stderr,
+ gettext("Old shadow not in existing cfg\n"));
exit(1);
}
/* check ii set status, suspend if need */
- strncpy(args.shadow_vol, old_vol, DSW_NAMELEN);
+ (void) strncpy(args.shadow_vol, old_vol, DSW_NAMELEN);
args.shadow_vol[DSW_NAMELEN-1] = '\0';
args.status = spcs_s_ucreate();
if (ioctl(dsw_fd, DSWIOC_STAT, &args) != -1) {
- fprintf(stderr, gettext("Suspend the Point-in-Time Copy "
+ (void) fprintf(stderr, gettext("Suspend the Point-in-Time Copy "
"set first\n"));
- close(dsw_fd);
+ (void) close(dsw_fd);
exit(1);
}
if (copy_shadow) {
if (copy_shadow_vol(old_vol, new_vol) == 0) {
perror(gettext("Write new shadow failed"));
- close(dsw_fd);
+ (void) close(dsw_fd);
exit(1);
}
}
if (find_cfg_info(old_vol, SV_TOKEN) == 0) {
- fprintf(stderr, gettext("Old shadow not in existing cfg\n"));
+ (void) fprintf(stderr,
+ gettext("Old shadow not in existing cfg\n"));
exit(1);
}
if (find_cfg_info(old_vol, DSVOL_TOKEN) == 0) {
- fprintf(stderr, gettext("Old shadow not in existing cfg\n"));
+ (void) fprintf(stderr,
+ gettext("Old shadow not in existing cfg\n"));
exit(1);
}
if (strstr(real_bitmap, "/rdsk/") == NULL) {
- fprintf(stderr,
- gettext("%s is not a character device\n"), real_bitmap);
+ (void) fprintf(stderr,
+ gettext("%s is not a character device\n"), real_bitmap);
exit(1);
}
@@ -188,48 +193,50 @@
/* open bitmap by using update mode */
if ((ifp = fopen(real_bitmap, "r+")) == NULL) {
- fprintf(stderr, gettext("Can't open bitmap file\n"));
+ (void) fprintf(stderr, gettext("Can't open bitmap file\n"));
exit(1);
}
/* Check old header looks like an II bitmap header */
if (fread(&header, DSW_CBLK_FBA, FBA_SIZE(1), ifp) != FBA_SIZE(1)) {
- fprintf(stderr, gettext("Can't read bitmap file\n"));
+ (void) fprintf(stderr, gettext("Can't read bitmap file\n"));
exit(1);
}
if (hp->ii_magic != DSW_CLEAN && hp->ii_magic != DSW_DIRTY) {
- fprintf(stderr, gettext("%s is not an Point-in-Time Copy "
+ (void) fprintf(stderr,
+ gettext("%s is not a Point-in-Time Copy "
"shadow.\n"), old_vol);
exit(1);
}
if (strncmp(hp->shadow_vol, old_vol, DSW_NAMELEN) != 0) {
- fprintf(stderr, gettext(
- "%s has Point-in-Time Copy shadow magic number,\n"
- "but does not contain correct data.\n"), old_vol);
+ (void) fprintf(stderr, gettext("%s has Point-in-Time Copy "
+ "shadow magic number,\n"
+ "but does not contain correct data.\n"), old_vol);
exit(1);
}
- memset(hp->shadow_vol, 0, DSW_NAMELEN);
- strncpy(hp->shadow_vol, new_vol, DSW_NAMELEN);
+ (void) memset(hp->shadow_vol, 0, DSW_NAMELEN);
+ (void) strncpy(hp->shadow_vol, new_vol, DSW_NAMELEN);
/* reset the pointer position */
rewind(ifp);
if (fwrite(&header, DSW_CBLK_FBA, FBA_SIZE(1), ifp) != FBA_SIZE(1)) {
perror(new_vol);
- fprintf(stderr, gettext("Can't write new bitmap header\n"));
+ (void) fprintf(stderr,
+ gettext("Can't write new bitmap header\n"));
exit(1);
}
- fclose(ifp);
- close(dsw_fd);
+ (void) fclose(ifp);
+ (void) close(dsw_fd);
if (update_dscfg(new_vol) == 0) {
- fprintf(stderr, gettext("Failed to update dscfg.\n"));
+ (void) fprintf(stderr, gettext("Failed to update dscfg.\n"));
exit(1);
} else {
spcs_log("ii", NULL,
- "iicpshd copy shadow from %s to %s",
- old_vol, new_vol);
+ "iicpshd copy shadow from %s to %s",
+ old_vol, new_vol);
}
}
@@ -245,22 +252,23 @@
/* get read lock */
if (!cfg_lock(cfg, CFG_RDLOCK)) {
spcs_log("ii", NULL,
- "iicpbmp CFG_RDLOCK failed, errno %d", errno);
- fprintf(stderr, gettext("Error locking config\n"));
+ "iicpbmp CFG_RDLOCK failed, errno %d", errno);
+ (void) fprintf(stderr, gettext("Error locking config\n"));
exit(1);
}
for (i = 1; ; i++) {
bzero(buf, CFG_MAX_BUF);
- snprintf(key, sizeof (key), token, i);
+ (void) snprintf(key, sizeof (key), token, i);
if (cfg_get_cstring(cfg, key, buf, DSW_NAMELEN) < 0) {
cfg_unlock(cfg);
return (0);
}
if (strcmp(buf, volume) == 0) {
if (strcmp(token, SHADOW_TOKEN) == 0) {
- snprintf(key, sizeof (key), BITMAP_TOKEN, i);
- cfg_get_cstring
- (cfg, key, real_bitmap, DSW_NAMELEN);
+ (void) snprintf(key, sizeof (key),
+ BITMAP_TOKEN, i);
+ (void) cfg_get_cstring(cfg, key,
+ real_bitmap, DSW_NAMELEN);
set_number = i;
} else if (strcmp(token, SV_TOKEN) == 0) {
sv_number = i;
@@ -280,11 +288,11 @@
char cp_buffer[256];
FILE *ishdfp, *oshdfp;
if ((ishdfp = fopen(old_shadow, "r")) == NULL) {
- fprintf(stderr, gettext("Can't open old shadow file\n"));
+ (void) fprintf(stderr, gettext("Can't open old shadow file\n"));
return (0);
}
if ((oshdfp = fopen(new_shadow, "w")) == NULL) {
- fprintf(stderr, gettext("Can't open new shadow file\n"));
+ (void) fprintf(stderr, gettext("Can't open new shadow file\n"));
return (0);
}
@@ -292,13 +300,13 @@
while ((i = fread(cp_buffer, sizeof (char), sizeof (cp_buffer), ishdfp))
> 0) {
if (fwrite(cp_buffer, sizeof (char), i, oshdfp) != i) {
- fclose(ishdfp);
- fclose(oshdfp);
+ (void) fclose(ishdfp);
+ (void) fclose(oshdfp);
return (0);
}
}
- fclose(ishdfp);
- fclose(oshdfp);
+ (void) fclose(ishdfp);
+ (void) fclose(oshdfp);
return (1);
}
@@ -309,26 +317,26 @@
/* get write lock */
if (!cfg_lock(cfg, CFG_WRLOCK)) {
spcs_log("ii", NULL,
- "iicpbmp CFG_WRLOCK failed, errno %d", errno);
- fprintf(stderr, gettext("Error locking config\n"));
+ "iicpbmp CFG_WRLOCK failed, errno %d", errno);
+ (void) fprintf(stderr, gettext("Error locking config\n"));
return (0);
}
- sprintf(key, SHADOW_TOKEN, set_number);
+ (void) sprintf(key, SHADOW_TOKEN, set_number);
if (cfg_put_cstring(cfg, key, new_shadow, len) < 0) {
perror("cfg_put_cstring");
return (0);
}
- sprintf(key, SV_TOKEN, sv_number);
+ (void) sprintf(key, SV_TOKEN, sv_number);
if (cfg_put_cstring(cfg, key, new_shadow, len) < 0) {
perror("cfg_put_cstring");
return (0);
}
- sprintf(key, DSVOL_TOKEN, dsvol_number);
+ (void) sprintf(key, DSVOL_TOKEN, dsvol_number);
if (cfg_put_cstring(cfg, key, new_shadow, len) < 0) {
perror("cfg_put_cstring");
return (0);
}
- cfg_commit(cfg);
+ (void) cfg_commit(cfg);
cfg_unlock(cfg);
return (1);
}
@@ -345,6 +353,6 @@
}
i++;
}
- strcpy(real_bitmap, temp_string);
+ (void) strcpy(real_bitmap, temp_string);
free(temp_string);
}
--- a/usr/src/cmd/avs/nsctl/nscadm.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/nsctl/nscadm.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -55,11 +56,11 @@
static void
usage(void)
{
- fprintf(stderr, gettext("usage: nscadm [-h] command\n"));
- fprintf(stderr, gettext("valid commands:\n"));
- fprintf(stderr, gettext(" freeze <device>\n"));
- fprintf(stderr, gettext(" unfreeze <device>\n"));
- fprintf(stderr, gettext(" isfrozen <device>\n"));
+ (void) fprintf(stderr, gettext("usage: nscadm [-h] command\n"));
+ (void) fprintf(stderr, gettext("valid commands:\n"));
+ (void) fprintf(stderr, gettext(" freeze <device>\n"));
+ (void) fprintf(stderr, gettext(" unfreeze <device>\n"));
+ (void) fprintf(stderr, gettext(" isfrozen <device>\n"));
}
static void
@@ -67,12 +68,12 @@
{
struct stat sbuf;
if (stat(dev, &sbuf) < 0) {
- fprintf(stderr, gettext("nscadm: "));
+ (void) fprintf(stderr, gettext("nscadm: "));
perror(op);
exit(255);
}
if (!S_ISCHR(sbuf.st_mode)) {
- fprintf(stderr, gettext("nscadm: %s: not a valid device "
+ (void) fprintf(stderr, gettext("nscadm: %s: not a valid device "
"<%s>\n"), op, dev);
exit(255);
}
@@ -109,7 +110,7 @@
}
if (strcoll(argv[optind], gettext("freeze")) == 0 ||
- strcmp(argv[optind], "freeze") == 0) {
+ strcmp(argv[optind], "freeze") == 0) {
if (argc - optind != 2) {
usage();
exit(255);
@@ -127,14 +128,15 @@
exit(255);
}
} else {
- fprintf(stderr, gettext("nscadm: device <%s> is "
+ (void) fprintf(stderr, gettext("nscadm: device <%s> is "
"already frozen\n"), argv[optind+1]);
exit(255);
}
- printf(gettext("nscadm: device <%s> frozen\n"), argv[optind+1]);
+ (void) printf(gettext("nscadm: device <%s> frozen\n"),
+ argv[optind+1]);
} else if (strcoll(argv[optind], gettext("unfreeze")) == 0 ||
- strcmp(argv[optind], "unfreeze") == 0) {
+ strcmp(argv[optind], "unfreeze") == 0) {
if (argc - optind != 2) {
usage();
exit(255);
@@ -152,15 +154,16 @@
exit(255);
}
} else {
- fprintf(stderr, gettext("nscadm: device <%s> is not "
+ (void) fprintf(stderr,
+ gettext("nscadm: device <%s> is not "
"frozen\n"), argv[optind+1]);
exit(255);
}
- printf(gettext("nscadm: device <%s> unfrozen\n"),
- argv[optind+1]);
+ (void) printf(gettext("nscadm: device <%s> unfrozen\n"),
+ argv[optind+1]);
} else if (strcoll(argv[optind], gettext("isfrozen")) == 0 ||
- strcmp(argv[optind], "isfrozen") == 0) {
+ strcmp(argv[optind], "isfrozen") == 0) {
if (argc - optind != 2) {
usage();
exit(255);
@@ -173,18 +176,18 @@
exit(255);
}
- printf(gettext("nscadm: device <%s> is %sfrozen\n"),
- argv[optind+1], rc ? gettext("not ") : "");
+ (void) printf(gettext("nscadm: device <%s> is %sfrozen\n"),
+ argv[optind+1], rc ? gettext("not ") : "");
#ifdef DEBUG
} else if (strcoll(argv[optind], gettext("nvclean")) == 0 ||
- strcmp(argv[optind], "nvclean") == 0) {
+ strcmp(argv[optind], "nvclean") == 0) {
rc = nsc_nvclean(0);
if (rc < 0) {
perror(gettext("nscadm: nvclean"));
exit(255);
}
} else if (strcoll(argv[optind], gettext("nvclean_force")) == 0 ||
- strcmp(argv[optind], "nvclean_force") == 0) {
+ strcmp(argv[optind], "nvclean_force") == 0) {
rc = nsc_nvclean(1);
if (rc < 0) {
perror(gettext("nscadm: nvclean_force"));
@@ -192,7 +195,7 @@
}
#endif /* DEBUG */
} else if (strcoll(argv[optind], gettext("gmem")) == 0 ||
- strcmp(argv[optind], "gmem") == 0) {
+ strcmp(argv[optind], "gmem") == 0) {
rc = _nsc_gmem();
if (rc < 0) {
perror(gettext("nscadm: gmem"));
@@ -219,7 +222,7 @@
if (rc < 0)
return (rc);
- printf(gettext("size %d\n"), size);
+ (void) printf(gettext("size %d\n"), size);
if ((addr = (char *)malloc(size * 2)) == NULL) {
errno = ENOMEM;
@@ -233,10 +236,10 @@
return (rc);
}
- printf(gettext("Global map entries:\n"));
+ (void) printf(gettext("Global map entries:\n"));
show_maps(addr, size);
- printf(gettext("\nGlobal NVMEM map entries:\n"));
+ (void) printf(gettext("\nGlobal NVMEM map entries:\n"));
show_maps(addr + size, size);
free(addr);
@@ -253,7 +256,8 @@
char tname[_NSC_MAXNAME + 1];
int i;
- printf(gettext("magic 0x%x ver %d size %d dirty (nvmem systems): %d\n"),
+ (void) printf(
+ gettext("magic 0x%x ver %d size %d dirty (nvmem systems): %d\n"),
rhp->magic, rhp->ver, rhp->size, rhp->rh_dirty);
for (i = 0, rmap = rhp->map;
@@ -261,10 +265,10 @@
rmap < (nsc_rmmap_t *)(addr + len); ++i, ++rmap) {
if (!rmap->name[0])
continue;
- strncpy(tname, rmap->name, _NSC_MAXNAME);
- strcpy(&tname[strlen(tname)], " ");
+ (void) strncpy(tname, rmap->name, _NSC_MAXNAME);
+ (void) strcpy(&tname[strlen(tname)], " ");
tname[_NSC_MAXNAME] = '\0';
- printf(gettext(
+ (void) printf(gettext(
"%d:\tname %s\toffset 0x%x size 0x%x inuse 0x%x\n"),
i, tname, rmap->offset, rmap->size, rmap->inuse);
}
--- a/usr/src/cmd/avs/nsctl/nskernd.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/nsctl/nskernd.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -91,7 +92,7 @@
static void
usage(void)
{
- fprintf(stderr, gettext("usage: nskernd\n"));
+ (void) fprintf(stderr, gettext("usage: nskernd\n"));
exit(255);
}
@@ -111,14 +112,14 @@
int
nthread_inc(void)
{
- mutex_lock(&thr_mutex);
+ (void) mutex_lock(&thr_mutex);
if (exiting) {
/* cannot enter kernel as nskernd is being shutdown - exit */
- mutex_unlock(&thr_mutex);
+ (void) mutex_unlock(&thr_mutex);
return (0);
}
nthreads++;
- mutex_unlock(&thr_mutex);
+ (void) mutex_unlock(&thr_mutex);
return (1);
}
@@ -126,9 +127,9 @@
void
nthread_dec(void)
{
- mutex_lock(&thr_mutex);
+ (void) mutex_lock(&thr_mutex);
nthreads--;
- mutex_unlock(&thr_mutex);
+ (void) mutex_unlock(&thr_mutex);
}
@@ -141,19 +142,19 @@
int rc = 1;
time_t start_delay;
- mutex_lock(&thr_mutex);
+ (void) mutex_lock(&thr_mutex);
if (nthreads > 0) {
if (display_msg) {
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: unable to shutdown: "
"%d kernel threads in use\n"), nthreads);
}
start_delay = time(0);
while (nthreads > 0 && (time(0) - start_delay) < delay_time) {
- mutex_unlock(&thr_mutex);
- sleep(1);
- mutex_lock(&thr_mutex);
- fprintf(stderr,
+ (void) mutex_unlock(&thr_mutex);
+ (void) sleep(1);
+ (void) mutex_lock(&thr_mutex);
+ (void) fprintf(stderr,
gettext("nskernd: delay shutdown: "
"%d kernel threads in use\n"), nthreads);
}
@@ -166,7 +167,7 @@
/* flag shutdown in progress */
exiting = 1;
}
- mutex_unlock(&thr_mutex);
+ (void) mutex_unlock(&thr_mutex);
return (rc);
}
@@ -194,7 +195,7 @@
rc = ioctl(nsctl_fd, NSCIOC_NSKERND, &data);
if (rc < 0) {
if (errno != EINTR || !sigterm) {
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: NSKERND_STOP failed\n"));
}
}
@@ -224,13 +225,13 @@
/* increase the scheduling priority of this LWP */
bzero(&pcinfo, sizeof (pcinfo));
- strcpy(pcinfo.pc_clname, allow_rt ? "RT" : "TS");
+ (void) strcpy(pcinfo.pc_clname, allow_rt ? "RT" : "TS");
if (priocntl(0, 0, PC_GETCID, (char *)&pcinfo) < 0) {
- fprintf(stderr,
- gettext(
- "nskernd: priocntl(PC_GETCID) failed: %s\n"),
- strerror(errno));
+ (void) fprintf(stderr,
+ gettext(
+ "nskernd: priocntl(PC_GETCID) failed: %s\n"),
+ strerror(errno));
goto pri_done;
}
@@ -253,10 +254,10 @@
if (priocntl(P_LWPID, P_MYID,
PC_SETPARMS, (char *)&pcparms) < 0) {
- fprintf(stderr,
- gettext(
- "nskernd: priocntl(PC_SETPARMS) failed: %s\n"),
- strerror(errno));
+ (void) fprintf(stderr,
+ gettext(
+ "nskernd: priocntl(PC_SETPARMS) failed: %s\n"),
+ strerror(errno));
}
}
@@ -284,8 +285,8 @@
nskp = malloc(sizeof (*nskp));
if (!nskp) {
#ifdef DEBUG
- fprintf(stderr, gettext("nskernd: malloc(%d) failed\n"),
- sizeof (*nskp));
+ (void) fprintf(stderr, gettext("nskernd: malloc(%d) failed\n"),
+ sizeof (*nskp));
#endif
req->data1 = (uint64_t)ENOMEM;
return;
@@ -300,8 +301,9 @@
if (rc != 0) {
/* thr_create failed */
#ifdef DEBUG
- fprintf(stderr, gettext("nskernd: thr_create failed: %s\n"),
- strerror(errno));
+ (void) fprintf(stderr,
+ gettext("nskernd: thr_create failed: %s\n"),
+ strerror(errno));
#endif
req->data1 = (uint64_t)errno;
free(nskp);
@@ -331,47 +333,47 @@
return (EINVAL);
}
- mutex_lock(&cfg_mutex);
+ (void) mutex_lock(&cfg_mutex);
cfg = cfg_open("");
if (!cfg) {
- mutex_unlock(&cfg_mutex);
+ (void) mutex_unlock(&cfg_mutex);
return (ENXIO);
}
if (!cfg_lock(cfg, CFG_WRLOCK)) {
- mutex_unlock(&cfg_mutex);
+ (void) mutex_unlock(&cfg_mutex);
cfg_close(cfg);
pid = fork();
if (pid == -1) {
- fprintf(stderr, gettext(
+ (void) fprintf(stderr, gettext(
"nskernd: Error forking\n"));
return (errno);
} else if (pid > 0) {
- fprintf(stdout, gettext(
+ (void) fprintf(stdout, gettext(
"nskernd: Attempting deferred bitmap error\n"));
return (0);
}
- mutex_lock(&cfg_mutex);
+ (void) mutex_lock(&cfg_mutex);
cfg = cfg_open("");
if (!cfg) {
- mutex_unlock(&cfg_mutex);
- fprintf(stderr, gettext(
+ (void) mutex_unlock(&cfg_mutex);
+ (void) fprintf(stderr, gettext(
"nskernd: Failed cfg_open, deferred bitmap\n"));
return (ENXIO);
}
/* Sooner or later, this lock will be free */
while (!cfg_lock(cfg, CFG_WRLOCK))
- sleep(2);
+ (void) sleep(2);
}
/* find the proper set number */
for (setno = 1; !found; setno++) {
- snprintf(key, CFG_MAX_KEY, "ii.set%d", setno);
+ (void) snprintf(key, CFG_MAX_KEY, "ii.set%d", setno);
if (cfg_get_cstring(cfg, key, buf, CFG_MAX_BUF) < 0) {
break;
}
@@ -393,7 +395,7 @@
if (found) {
/* were there flags in the options field already? */
- snprintf(newflags, CFG_MAX_BUF, "%s=0x%x",
+ (void) snprintf(newflags, CFG_MAX_BUF, "%s=0x%x",
NSKERN_II_BMP_OPTION, flags);
if (opt && strcmp(opt, "-") != 0) {
bzero(newflags, CFG_MAX_BUF);
@@ -401,29 +403,29 @@
while (opt) {
if (strncmp(opt, NSKERN_II_BMP_OPTION,
strlen(NSKERN_II_BMP_OPTION)) != 0) {
- strcat(newflags, ";");
- strcat(newflags, opt);
+ (void) strcat(newflags, ";");
+ (void) strcat(newflags, opt);
}
}
}
- snprintf(key, CFG_MAX_KEY, "ii.set%d", setno);
- snprintf(outbuf, CFG_MAX_BUF, "%s %s %s %s %s %s %s %s",
- mst, shd, bmp, mode, ovr, cnode, newflags, grp);
+ (void) snprintf(key, CFG_MAX_KEY, "ii.set%d", setno);
+ (void) snprintf(outbuf, CFG_MAX_BUF, "%s %s %s %s %s %s %s %s",
+ mst, shd, bmp, mode, ovr, cnode, newflags, grp);
if (cfg_put_cstring(cfg, key, outbuf, CFG_MAX_BUF) < 0) {
- printf("Failed to put [%s]\n", outbuf);
+ (void) printf("Failed to put [%s]\n", outbuf);
rc = ENXIO;
} else {
- cfg_commit(cfg);
+ (void) cfg_commit(cfg);
rc = 0;
}
} else {
- fprintf(stderr, gettext(
- "nskernd: Failed deferred bitmap [%s]\n"), set);
+ (void) fprintf(stderr, gettext(
+ "nskernd: Failed deferred bitmap [%s]\n"), set);
rc = EINVAL;
}
cfg_unlock(cfg);
cfg_close(cfg);
- mutex_unlock(&cfg_mutex);
+ (void) mutex_unlock(&cfg_mutex);
/*
* if we are the fork'ed client, just exit, if parent just return
@@ -463,11 +465,12 @@
bcopy(arg, &nsk, sizeof (nsk));
free(arg);
- mutex_lock(&cfg_mutex);
+ (void) mutex_lock(&cfg_mutex);
cfg = cfg_open("");
if (cfg == NULL) {
#ifdef DEBUG
- fprintf(stderr, gettext("nskernd: cfg_open failed: %s\n"),
+ (void) fprintf(stderr,
+ gettext("nskernd: cfg_open failed: %s\n"),
strerror(errno));
#endif
rc = ENXIO;
@@ -485,7 +488,7 @@
locked = 1;
} else {
#ifdef DEBUG
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: cfg_lock failed: %s\n"),
strerror(errno));
#endif
@@ -512,7 +515,7 @@
cfg_close(cfg);
cfg = NULL;
}
- mutex_unlock(&cfg_mutex);
+ (void) mutex_unlock(&cfg_mutex);
return (NULL);
}
@@ -535,7 +538,8 @@
nskp = malloc(sizeof (*nskp));
if (!nskp) {
#ifdef DEBUG
- fprintf(stderr, gettext("nskernd:dolock: malloc(%d) failed\n"),
+ (void) fprintf(stderr,
+ gettext("nskernd:dolock: malloc(%d) failed\n"),
sizeof (*nskp));
#endif
req->data1 = (uint64_t)ENOMEM;
@@ -551,7 +555,8 @@
if (rc != 0) {
/* thr_create failed */
#ifdef DEBUG
- fprintf(stderr, gettext("nskernd: thr_create failed: %s\n"),
+ (void) fprintf(stderr,
+ gettext("nskernd: thr_create failed: %s\n"),
strerror(errno));
#endif
req->data1 = (uint64_t)errno;
@@ -655,11 +660,11 @@
#endif /* DKIOCPARTITION */
}
- close(fd);
+ (void) close(fd);
return;
}
- close(fd);
+ (void) close(fd);
*partitionp = (int)dki_info.dki_partition;
@@ -689,7 +694,7 @@
return (FALSE);
}
- fprintf(stderr, "%s\n",
+ (void) fprintf(stderr, "%s\n",
gettext("nskernd: unable to ascertain environment"));
exit(1);
/* NOTREACHED */
@@ -728,12 +733,12 @@
rc = nsc_check_release(BUILD_REV_STR, nskernd_rel_map, &reqd);
if (rc < 0) {
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: unable to determine the current "
"Solaris release: %s\n"), strerror(errno));
exit(1);
} else if (rc == FALSE) {
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: incorrect Solaris release "
"(requires %s)\n"), reqd);
exit(1);
@@ -767,14 +772,14 @@
}
if (chroot(dir) < 0) {
- fprintf(stderr, gettext("nskernd: chroot failed: %s\n"),
- strerror(errno));
+ (void) fprintf(stderr, gettext("nskernd: chroot failed: %s\n"),
+ strerror(errno));
exit(1);
}
if (chdir(dir) < 0) {
- fprintf(stderr, gettext("nskernd: chdir failed: %s\n"),
- strerror(errno));
+ (void) fprintf(stderr, gettext("nskernd: chdir failed: %s\n"),
+ strerror(errno));
exit(1);
}
@@ -788,7 +793,8 @@
* child just before it enters its service loop.
*/
if (pipe(syncpipe) < 0) {
- fprintf(stderr, gettext("nskernd: cannot create pipe: %s\n"),
+ (void) fprintf(stderr,
+ gettext("nskernd: cannot create pipe: %s\n"),
strerror(errno));
exit(1);
}
@@ -810,8 +816,8 @@
n = read(syncpipe[0], &c, 1);
exit((n <= 0) ? 1 : 0);
} else if (rc < 0) {
- fprintf(stderr, gettext("nskernd: cannot fork: %s\n"),
- strerror(errno));
+ (void) fprintf(stderr, gettext("nskernd: cannot fork: %s\n"),
+ strerror(errno));
exit(1);
}
@@ -830,7 +836,7 @@
(void) dup(0);
(void) close(0);
- setpgrp();
+ (void) setpgrp();
/*
* Ignore all signals apart from SIGTERM.
@@ -848,10 +854,10 @@
rl.rlim_cur = RLIM_INFINITY;
rl.rlim_max = RLIM_INFINITY;
if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: could not increase RLIMIT_NOFILE: %s\n"),
strerror(errno));
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: the maximum number of nsctl open "
"devices may be reduced\n"));
}
@@ -862,7 +868,8 @@
nsctl_fd = open(rdev, O_RDONLY);
if (nsctl_fd < 0) {
- fprintf(stderr, gettext("nskernd: unable to open %s\n"), rdev);
+ (void) fprintf(stderr, gettext("nskernd: unable to open %s\n"),
+ rdev);
exit(1);
}
@@ -883,7 +890,7 @@
sigterm = 0;
}
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: NSCIOC_NSKERND failed: %s\n"),
strerror(errno));
continue;
@@ -922,11 +929,11 @@
switch (data.command) {
case NSKERND_START: /* (re)start completion */
if (rc == 1) {
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: already started\n"));
run = 0;
} else if (rc == 2) {
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: stopped by kernel\n"));
run = 0;
}
@@ -979,7 +986,7 @@
break;
default:
- fprintf(stderr,
+ (void) fprintf(stderr,
gettext("nskernd: unknown command %d"),
data.command);
data.command = NSKERND_WAIT;
--- a/usr/src/cmd/avs/rdc/sndradm.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/rdc/sndradm.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -306,9 +307,9 @@
continue;
if (pair.doasync == 0)
- strcpy(sync, "sync");
+ (void) strcpy(sync, "sync");
else
- strcpy(sync, "async");
+ (void) strcpy(sync, "async");
/* Got the matching entry */
@@ -406,9 +407,9 @@
int qflag = 0;
int j;
- strcpy(pair_list[i].ctag, "");
- strcpy(pair_list[i].group, "");
- strcpy(pair_list[i].diskqueue, "");
+ (void) strcpy(pair_list[i].ctag, "");
+ (void) strcpy(pair_list[i].group, "");
+ (void) strcpy(pair_list[i].diskqueue, "");
if (argc == 0)
return (0);
@@ -420,7 +421,8 @@
if (strcmp(args[j], "g") == 0) {
if (gflag)
return (-1);
- strncpy(pair_list[i].group, args[j + 1], NSC_MAXPATH);
+ (void) strncpy(pair_list[i].group, args[j + 1],
+ NSC_MAXPATH);
gflag = 1;
}
if (strcmp(args[j], "C") == 0) {
@@ -428,7 +430,7 @@
return (-1);
if (Cflag)
return (-1);
- strncpy(pair_list[i].ctag, args[j + 1],
+ (void) strncpy(pair_list[i].ctag, args[j + 1],
MAX_RDC_HOST_SIZE);
process_clocal(pair_list[i].ctag);
Cflag = 1;
@@ -436,7 +438,7 @@
if (strcmp(args[j], "q") == 0) {
if (qflag)
return (-1);
- strncpy(pair_list[i].diskqueue, args[j + 1],
+ (void) strncpy(pair_list[i].diskqueue, args[j + 1],
NSC_MAXPATH);
qflag = 1;
}
@@ -462,10 +464,10 @@
rdc_err(NULL, gettext("cfg input error"));
if (strcmp(pair->diskqueue, place_holder) == 0)
- strcpy(pair->diskqueue, "");
+ (void) strcpy(pair->diskqueue, "");
if (strcmp(pair->group, place_holder) == 0)
- strcpy(pair->group, "");
+ (void) strcpy(pair->group, "");
if (strcmp(sync, "sync") == 0)
pair->doasync = 0;
@@ -486,7 +488,7 @@
} else {
len = strlen(p);
}
- strncpy(lghn, p, len);
+ (void) strncpy(lghn, p, len);
lghn[len] = '\0';
} else if (lghn) {
*lghn = '\0';
@@ -514,9 +516,9 @@
return (0);
hp = gethost_byname(fromhost);
- strncpy(fromname, hp->h_name, MAXHOSTNAMELEN);
+ (void) strncpy(fromname, hp->h_name, MAXHOSTNAMELEN);
hp = gethost_byname(tohost);
- strncpy(toname, hp->h_name, MAXHOSTNAMELEN);
+ (void) strncpy(toname, hp->h_name, MAXHOSTNAMELEN);
if (!self_check(fromname) && !self_check(toname)) {
/*
* If we could get a list of logical hosts on this cluster
@@ -545,7 +547,7 @@
* Autogenerate a ctag, if not "-C local" or no "-C " specified
*/
if (!rdc_islocal && !strlen(ctag) && file_dgname && strlen(file_dgname))
- strncpy(ctag, file_dgname, MAX_RDC_HOST_SIZE);
+ (void) strncpy(ctag, file_dgname, MAX_RDC_HOST_SIZE);
/*
* making an exception here for users giving the "local"tag
@@ -712,7 +714,7 @@
}
if (*newq == '\0') {
if (diskqueue[0] != '\0')
- strncpy(newq, diskqueue, NSC_MAXPATH);
+ (void) strncpy(newq, diskqueue, NSC_MAXPATH);
if (open_cfg)
cfg_close(cfg);
return (DISKQ_OKAY); /* okay, */
@@ -755,7 +757,7 @@
if ((strcmp(pair_list[newpair].diskqueue, "") == 0) &&
pair_list[newpair].group[0] != '\0') {
- strncpy(pair_list[newpair].diskqueue,
+ (void) strncpy(pair_list[newpair].diskqueue,
pair_list[i].diskqueue, NSC_MAXPATH);
return (DISKQ_OKAY); /* changed to existing group que */
}
@@ -765,7 +767,7 @@
(strncmp(pair_list[j].group,
pair_list[newpair].group,
NSC_MAXPATH) == 0)) {
- strncpy(pair_list[j].diskqueue,
+ (void) strncpy(pair_list[j].diskqueue,
pair_list[newpair].diskqueue,
NSC_MAXPATH);
}
@@ -785,7 +787,7 @@
pair_list[newpair].group) != 0)
continue;
- strncpy(pair_list[i].diskqueue,
+ (void) strncpy(pair_list[i].diskqueue,
pair_list[newpair].diskqueue, NSC_MAXPATH);
}
}
@@ -1317,7 +1319,7 @@
if (strlen(group_arg) == 0) {
if (strcmp(tohost_arg, pair.thost) == 0 &&
strcmp(tofile_arg, pair.tfile) == 0) {
- strcpy(group_arg, pair.group);
+ (void) strcpy(group_arg, pair.group);
found = 1;
break;
}
@@ -1630,10 +1632,10 @@
/* set up parms structure */
parms.command = RDC_CMD_DISABLE;
- strncpy(parms.rdc_set->primary.intf, phost, MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->primary.file, pvol, NSC_MAXPATH);
- strncpy(parms.rdc_set->secondary.intf, shost, MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->secondary.file, svol, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->primary.intf, phost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(parms.rdc_set->primary.file, pvol, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->secondary.intf, shost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(parms.rdc_set->secondary.file, svol, NSC_MAXPATH);
ustatus = spcs_s_ucreate();
parms.options = RDC_OPT_FORCE_DISABLE;
@@ -1793,8 +1795,8 @@
rdc_err(NULL, gettext("unable to ascertain environment"));
}
- strcpy(ctag_arg, "");
- strcpy(group_arg, "");
+ (void) strcpy(ctag_arg, "");
+ (void) strcpy(group_arg, "");
bzero(ctag, MAX_RDC_HOST_SIZE);
bzero(reconfig_ctag, MAX_RDC_HOST_SIZE);
bzero(diskqueue, NSC_MAXPATH);
@@ -1910,7 +1912,8 @@
break;
case 'C':
if (clustered) {
- strncpy(ctag_arg, optarg, MAX_RDC_HOST_SIZE);
+ (void) strncpy(ctag_arg, optarg,
+ MAX_RDC_HOST_SIZE);
process_clocal(ctag_arg);
} else
inval = 1;
@@ -1919,7 +1922,7 @@
if (flag == RDC_CMD_ENABLE)
inval = 1;
geflag = 1;
- strncpy(group_arg, optarg, NSC_MAXPATH);
+ (void) strncpy(group_arg, optarg, NSC_MAXPATH);
verify_groupname(group_arg);
break;
case 'b':
@@ -1947,7 +1950,7 @@
break;
case 'f':
fflag = 1;
- strcpy(config_file, optarg);
+ (void) strcpy(config_file, optarg);
break;
case 'h':
usage();
@@ -2115,7 +2118,8 @@
/* pick out single set as shost:svol */
ptr = strtok(argv[qflag + offset], ":");
if (ptr)
- strncpy(tohost_arg, ptr, MAX_RDC_HOST_SIZE);
+ (void) strncpy(tohost_arg, ptr,
+ MAX_RDC_HOST_SIZE);
else {
rdc_warn(NULL, gettext("Bad host specified"));
q_usage(1);
@@ -2123,7 +2127,7 @@
}
ptr = strtok(NULL, ":");
if (ptr)
- strncpy(tofile_arg, ptr, NSC_MAXPATH);
+ (void) strncpy(tofile_arg, ptr, NSC_MAXPATH);
else {
rdc_warn(NULL, gettext("Bad set specified"));
q_usage(1);
@@ -2183,8 +2187,8 @@
break;
case 'C':
if (clustered) {
- strncpy(reconfig_ctag, argv[optind++],
- MAX_RDC_HOST_SIZE);
+ (void) strncpy(reconfig_ctag,
+ argv[optind++], MAX_RDC_HOST_SIZE);
process_clocal(reconfig_ctag);
} else {
usage();
@@ -2298,13 +2302,14 @@
}
ptr = strtok(argv[optind], ":");
if (ptr)
- strncpy(tohost_arg, ptr, MAX_RDC_HOST_SIZE);
+ (void) strncpy(tohost_arg, ptr,
+ MAX_RDC_HOST_SIZE);
else {
rdc_err(NULL, gettext("Bad host specified"));
}
ptr = strtok(NULL, ":");
if (ptr)
- strncpy(tofile_arg, ptr, NSC_MAXPATH);
+ (void) strncpy(tofile_arg, ptr, NSC_MAXPATH);
else {
rdc_err(NULL, gettext("Bad set specified"));
}
@@ -2374,7 +2379,7 @@
(void) cfg_get_cstring(cfg, key, directfile,
sizeof (directfile));
if (strcmp(directfile, "ip") == 0)
- strcpy(directfile, "");
+ (void) strcpy(directfile, "");
(void) snprintf(key, sizeof (key),
"sndr.set%d.mode", setnumber);
@@ -2417,12 +2422,14 @@
}
} else {
checksetfields = 1;
- strncpy(fromhost, argv[optind], MAX_RDC_HOST_SIZE);
- strncpy(fromfile, argv[optind+1], NSC_MAXPATH);
- strncpy(frombitmap, argv[optind+2], NSC_MAXPATH);
- strncpy(tohost, argv[optind+3], MAX_RDC_HOST_SIZE);
- strncpy(tofile, argv[optind+4], NSC_MAXPATH);
- strncpy(tobitmap, argv[optind+5], NSC_MAXPATH);
+ (void) strncpy(fromhost, argv[optind],
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(fromfile, argv[optind+1], NSC_MAXPATH);
+ (void) strncpy(frombitmap, argv[optind+2], NSC_MAXPATH);
+ (void) strncpy(tohost, argv[optind+3],
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(tofile, argv[optind+4], NSC_MAXPATH);
+ (void) strncpy(tobitmap, argv[optind+5], NSC_MAXPATH);
/* Check the length of entries from the command line */
if ((fromhost[MAX_RDC_HOST_SIZE - 1] != '\0') ||
@@ -2450,7 +2457,7 @@
#ifdef _RDC_CAMPUS
if (argv[optind+6][0] == '/') {
/* FCAL directio */
- strncpy(directfile, argv[optind+6],
+ (void) strncpy(directfile, argv[optind+6],
NSC_MAXPATH);
} else if (strcmp(argv[optind+6], "ip") != 0) {
#else
@@ -2459,7 +2466,7 @@
usage();
exit(1);
} else
- strcpy(directfile, "ip");
+ (void) strcpy(directfile, "ip");
if (strcmp(argv[optind+7], "sync") == 0)
doasync = 0;
@@ -2544,7 +2551,8 @@
for (i = (8 + optind); i < argc; i += 2) {
/* string case statement */
if (strcmp(argv[i], "g") == 0) {
- strncpy(group, argv[i + 1], NSC_MAXPATH);
+ (void) strncpy(group, argv[i + 1],
+ NSC_MAXPATH);
if (group[NSC_MAXPATH - 1] != '\0') {
rdc_err(NULL, gettext("group name is "
"longer than %d characters\n"),
@@ -2555,7 +2563,7 @@
usage();
exit(1);
}
- strncpy(ctag, argv[i + 1],
+ (void) strncpy(ctag, argv[i + 1],
MAX_RDC_HOST_SIZE);
if (ctag[MAX_RDC_HOST_SIZE - 1] != '\0') {
@@ -2582,7 +2590,7 @@
}
} else if (strcmp(argv[i], "q") == 0) {
- strncpy(diskqueue, argv[i + 1],
+ (void) strncpy(diskqueue, argv[i + 1],
NSC_MAXPATH);
if (diskqueue[NSC_MAXPATH - 1] != '\0') {
rdc_err(NULL, gettext("diskq name is "
@@ -2646,25 +2654,26 @@
if (flag == RDC_CMD_RECONFIG) {
if (reconfig_pbitmap) {
- strncpy(frombitmap, reconfig_pbitmap,
+ (void) strncpy(frombitmap, reconfig_pbitmap,
NSC_MAXPATH);
check_rdcbitmap(flag, fromhost, frombitmap);
}
if (reconfig_sbitmap) {
- strncpy(tobitmap, reconfig_sbitmap,
+ (void) strncpy(tobitmap, reconfig_sbitmap,
NSC_MAXPATH);
check_rdcbitmap(flag, tohost, tobitmap);
}
#ifdef _RDC_CAMPUS
if (reconfig_direct)
- strncpy(directfile, reconfig_direct,
+ (void) strncpy(directfile, reconfig_direct,
NSC_MAXPATH);
#endif
if (reconfig_group)
- strncpy(group, reconfig_group, NSC_MAXPATH);
+ (void) strncpy(group, reconfig_group,
+ NSC_MAXPATH);
if (strlen(reconfig_ctag) > 0)
- strncpy(ctag, reconfig_ctag,
+ (void) strncpy(ctag, reconfig_ctag,
MAX_RDC_HOST_SIZE);
if (reconfig_doasync != -1)
doasync = reconfig_doasync;
@@ -2697,27 +2706,31 @@
while (pairs--) {
if (cfgflag || fflag) {
- strncpy(fromfile, pair_list[pairs].ffile, NSC_MAXPATH);
- strncpy(tofile, pair_list[pairs].tfile, NSC_MAXPATH);
- strncpy(frombitmap, pair_list[pairs].fbitmap,
- NSC_MAXPATH);
- strncpy(fromhost,
- pair_list[pairs].fhost, MAX_RDC_HOST_SIZE);
- strncpy(tohost, pair_list[pairs].thost,
- MAX_RDC_HOST_SIZE);
- strncpy(tobitmap, pair_list[pairs].tbitmap,
- NSC_MAXPATH);
- strncpy(directfile, pair_list[pairs].directfile,
- NSC_MAXPATH);
- strncpy(group, pair_list[pairs].group, NSC_MAXPATH);
- strncpy(ctag, pair_list[pairs].ctag, MAX_RDC_HOST_SIZE);
- strncpy(diskqueue, pair_list[pairs].diskqueue,
+ (void) strncpy(fromfile, pair_list[pairs].ffile,
+ NSC_MAXPATH);
+ (void) strncpy(tofile, pair_list[pairs].tfile,
+ NSC_MAXPATH);
+ (void) strncpy(frombitmap, pair_list[pairs].fbitmap,
+ NSC_MAXPATH);
+ (void) strncpy(fromhost,
+ pair_list[pairs].fhost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(tohost, pair_list[pairs].thost,
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(tobitmap, pair_list[pairs].tbitmap,
+ NSC_MAXPATH);
+ (void) strncpy(directfile, pair_list[pairs].directfile,
+ NSC_MAXPATH);
+ (void) strncpy(group, pair_list[pairs].group,
+ NSC_MAXPATH);
+ (void) strncpy(ctag, pair_list[pairs].ctag,
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(diskqueue, pair_list[pairs].diskqueue,
NSC_MAXPATH);
bcopy(pair_list[pairs].fnetaddr, fromnetaddr,
- RDC_MAXADDR);
+ RDC_MAXADDR);
bcopy(pair_list[pairs].tnetaddr, tonetaddr,
- RDC_MAXADDR);
+ RDC_MAXADDR);
doasync = pair_list[pairs].doasync;
}
@@ -2763,13 +2776,13 @@
parms.command = RDC_CMD_STATUS;
parms.rdc_set->netconfig = NULL;
- strncpy(parms.rdc_set->primary.intf, fromhost,
+ (void) strncpy(parms.rdc_set->primary.intf, fromhost,
MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->secondary.intf, tohost,
+ (void) strncpy(parms.rdc_set->secondary.intf, tohost,
MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->primary.file, fromfile,
+ (void) strncpy(parms.rdc_set->primary.file, fromfile,
NSC_MAXPATH);
- strncpy(parms.rdc_set->secondary.file, tofile,
+ (void) strncpy(parms.rdc_set->secondary.file, tofile,
NSC_MAXPATH);
ustatus = spcs_s_ucreate();
ret = RDC_IOCTL(RDC_CONFIG, &parms,
@@ -2778,10 +2791,10 @@
rdc_err(NULL, gettext("unable to get set status"
" before reconfig operation"));
}
- strncpy(orig_fbmp, parms.rdc_set->primary.bitmap,
+ (void) strncpy(orig_fbmp, parms.rdc_set->primary.bitmap,
NSC_MAXPATH);
- strncpy(orig_tbmp, parms.rdc_set->secondary.bitmap,
- NSC_MAXPATH);
+ (void) strncpy(orig_tbmp,
+ parms.rdc_set->secondary.bitmap, NSC_MAXPATH);
if (strncmp(orig_fbmp, frombitmap, NSC_MAXPATH) != 0)
check_rdcbitmap(flag, fromhost, frombitmap);
@@ -3000,7 +3013,8 @@
CFG_MAX_BUF) < 0)
break;
if (strlen(buf) > 0) {
- strncpy(diskqueue, buf, NSC_MAXPATH);
+ (void) strncpy(diskqueue, buf,
+ NSC_MAXPATH);
} else {
*diskqueue = '\0';
}
@@ -3067,13 +3081,14 @@
CFG_MAX_BUF) < 0)
break;
if (reconfig_ctag[0] == '\0')
- strncpy(ctag, buf, sizeof (ctag));
+ (void) strncpy(ctag, buf,
+ sizeof (ctag));
if (doasync)
- strcpy(mode, "async");
+ (void) strcpy(mode, "async");
else
- strcpy(mode, "sync");
+ (void) strcpy(mode, "sync");
if (strcmp(directfile, "") == 0)
- strcpy(directfile, "ip");
+ (void) strcpy(directfile, "ip");
group_p = strlen(group) > 0 ? group :
place_holder;
@@ -3232,23 +3247,26 @@
bzero(tmphost, MAX_RDC_HOST_SIZE);
bzero(tmpfile, NSC_MAXPATH);
bzero(tmpbitmap, NSC_MAXPATH);
- strncpy(tmphost, fromhost,
- MAX_RDC_HOST_SIZE);
- strncpy(tmpfile, fromfile, NSC_MAXPATH);
- strncpy(tmpbitmap, frombitmap,
- NSC_MAXPATH);
-
- strncpy(fromhost, tohost,
+ (void) strncpy(tmphost, fromhost,
MAX_RDC_HOST_SIZE);
- strncpy(fromfile, tofile, NSC_MAXPATH);
- strncpy(frombitmap, tobitmap,
- NSC_MAXPATH);
-
- strncpy(tohost, tmphost,
- MAX_RDC_HOST_SIZE);
- strncpy(tofile, tmpfile, NSC_MAXPATH);
- strncpy(tobitmap, tmpbitmap,
- NSC_MAXPATH);
+ (void) strncpy(tmpfile, fromfile,
+ NSC_MAXPATH);
+ (void) strncpy(tmpbitmap, frombitmap,
+ NSC_MAXPATH);
+
+ (void) strncpy(fromhost, tohost,
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(fromfile, tofile,
+ NSC_MAXPATH);
+ (void) strncpy(frombitmap, tobitmap,
+ NSC_MAXPATH);
+
+ (void) strncpy(tohost, tmphost,
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(tofile, tmpfile,
+ NSC_MAXPATH);
+ (void) strncpy(tobitmap, tmpbitmap,
+ NSC_MAXPATH);
group_p = strlen(group) > 0 ? group :
place_holder;
diskqueue_p = strlen(diskqueue) > 0 ?
@@ -3347,7 +3365,7 @@
*/
if (ctag != NULL && strcmp(ctag, RDC_LOCAL_TAG) == 0) {
- strcpy(ctag, "-");
+ (void) strcpy(ctag, "-");
rdc_islocal = 1;
} else {
rdc_islocal = 0;
@@ -3519,8 +3537,8 @@
do {
/* if another tag/value exists, keep it */
if (strncmp(auto_tag, q, 4) != 0) {
- strcat(buf, q);
- strcat(buf, ";");
+ (void) strcat(buf, q);
+ (void) strcat(buf, ";");
need_to_clear_buf = 0;
}
} while (q = strtok(NULL, ";"));
@@ -3528,7 +3546,7 @@
/* if we were the only option, clear the field */
if (need_to_clear_buf) {
- strcat(buf, "-");
+ (void) strcat(buf, "-");
}
if (cfg_put_cstring(cfg, key, buf, CFG_MAX_BUF) < 0) {
@@ -3628,8 +3646,8 @@
* keep it
*/
if (strncmp(auto_tag, q, 4) != 0) {
- strcat(buf, q);
- strcat(buf, ";");
+ (void) strcat(buf, q);
+ (void) strcat(buf, ";");
need_to_clear_buf = 0;
}
} while (q = strtok(NULL, ";"));
@@ -3640,7 +3658,7 @@
* clear the field
*/
if (need_to_clear_buf) {
- strcat(buf, "-");
+ (void) strcat(buf, "-");
}
if (cfg_put_cstring(cfg, key, buf, CFG_MAX_BUF)
@@ -3749,12 +3767,12 @@
parms.command = RDC_CMD_TUNABLE;
p = &parms.rdc_set[0].primary;
- strncpy(p->intf, fhost, MAX_RDC_HOST_SIZE);
- strncpy(p->file, ffile, MAX_RDC_HOST_SIZE);
+ (void) strncpy(p->intf, fhost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(p->file, ffile, MAX_RDC_HOST_SIZE);
p = &parms.rdc_set[0].secondary;
- strncpy(p->intf, thost, NSC_MAXPATH);
- strncpy(p->file, tfile, NSC_MAXPATH);
+ (void) strncpy(p->intf, thost, NSC_MAXPATH);
+ (void) strncpy(p->file, tfile, NSC_MAXPATH);
parms.rdc_set[0].autosync = 1;
parms.rdc_set[0].maxqfbas = -1;
@@ -3796,9 +3814,9 @@
conf = &nconf;
hp = gethost_byname(fromhost);
- strncpy(fromname, hp->h_name, MAXHOSTNAMELEN);
+ (void) strncpy(fromname, hp->h_name, MAXHOSTNAMELEN);
hp = gethost_byname(tohost);
- strncpy(toname, hp->h_name, MAXHOSTNAMELEN);
+ (void) strncpy(toname, hp->h_name, MAXHOSTNAMELEN);
if (self_check(fromname) && self_check(toname)) {
rdc_err(NULL, gettext("both %s and %s are local"),
@@ -3810,13 +3828,13 @@
parms.command = RDC_CMD_STATUS;
parms.rdc_set->netconfig = NULL;
- strncpy(parms.rdc_set->primary.intf, fromhost,
+ (void) strncpy(parms.rdc_set->primary.intf, fromhost,
MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->secondary.intf, tohost,
+ (void) strncpy(parms.rdc_set->secondary.intf, tohost,
MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->primary.file, fromfile,
+ (void) strncpy(parms.rdc_set->primary.file, fromfile,
NSC_MAXPATH);
- strncpy(parms.rdc_set->secondary.file, tofile,
+ (void) strncpy(parms.rdc_set->secondary.file, tofile,
NSC_MAXPATH);
ustatus = spcs_s_ucreate();
ret = RDC_IOCTL(RDC_CONFIG, &parms,
@@ -3825,11 +3843,12 @@
rdc_err(NULL, gettext("unable to get set status"
" before reconfig operation"));
}
- strncpy(orig_fbmp, parms.rdc_set->primary.bitmap,
+ (void) strncpy(orig_fbmp, parms.rdc_set->primary.bitmap,
NSC_MAXPATH);
- strncpy(orig_tbmp, parms.rdc_set->secondary.bitmap,
+ (void) strncpy(orig_tbmp, parms.rdc_set->secondary.bitmap,
NSC_MAXPATH);
- strncpy(orig_diskq, parms.rdc_set->disk_queue, NSC_MAXPATH);
+ (void) strncpy(orig_diskq, parms.rdc_set->disk_queue,
+ NSC_MAXPATH);
}
/*
@@ -3934,18 +3953,20 @@
}
}
- strncpy(parms.rdc_set->primary.intf, fromhost, MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->primary.file, fromfile, NSC_MAXPATH);
- strncpy(parms.rdc_set->primary.bitmap, frombitmap, NSC_MAXPATH);
-
- strncpy(parms.rdc_set->secondary.intf, tohost, MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->secondary.file, tofile, NSC_MAXPATH);
- strncpy(parms.rdc_set->secondary.bitmap, tobitmap, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->primary.intf, fromhost,
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(parms.rdc_set->primary.file, fromfile, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->primary.bitmap, frombitmap, NSC_MAXPATH);
+
+ (void) strncpy(parms.rdc_set->secondary.intf, tohost,
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(parms.rdc_set->secondary.file, tofile, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->secondary.bitmap, tobitmap, NSC_MAXPATH);
if ((group == NULL) || ((strcmp(group, "-")) == 0))
parms.rdc_set->group_name[0] = 0;
else
- strncpy(parms.rdc_set->group_name, group, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->group_name, group, NSC_MAXPATH);
if (self_check(tohost) &&
(strlen(diskqueue) > 0) && (diskqueue[0] != '-'))
@@ -3957,7 +3978,8 @@
if ((diskqueue == NULL) || ((strcmp(diskqueue, "-")) == 0))
parms.rdc_set->disk_queue[0] = 0;
else
- strncpy(parms.rdc_set->disk_queue, diskqueue, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->disk_queue, diskqueue,
+ NSC_MAXPATH);
parms.rdc_set->maxqfbas = maxqfbas;
parms.rdc_set->maxqitems = maxqitems;
@@ -4030,7 +4052,7 @@
if (strcmp(directfile, "ip") == 0)
parms.rdc_set->direct_file[0] = 0; /* no directfile */
else
- strncpy(parms.rdc_set->direct_file, directfile,
+ (void) strncpy(parms.rdc_set->direct_file, directfile,
NSC_MAXPATH);
} else {
parms.options |= RDC_OPT_SECONDARY;
@@ -4276,8 +4298,8 @@
}
#ifdef _RDC_CAMPUS
if (*parms.rdc_set->direct_file) {
- strncpy(directfile, parms.rdc_set->direct_file,
- NSC_MAXPATH);
+ (void) strncpy(directfile,
+ parms.rdc_set->direct_file, NSC_MAXPATH);
bzero(key, sizeof (key));
(void) snprintf(key, sizeof (key),
"sndr.set%d.type", i);
@@ -4285,7 +4307,7 @@
strlen(directfile)) < 0)
cfgsuccess = 0;
} else {
- strncpy(directfile, "-", NSC_MAXPATH);
+ (void) strncpy(directfile, "-", NSC_MAXPATH);
bzero(key, sizeof (key));
(void) snprintf(key, sizeof (key),
"sndr.set%d.type", i);
@@ -4296,7 +4318,7 @@
#endif
if (*parms.rdc_set->group_name) {
- strncpy(group, parms.rdc_set->group_name,
+ (void) strncpy(group, parms.rdc_set->group_name,
NSC_MAXPATH);
bzero(key, sizeof (key));
(void) snprintf(key, sizeof (key),
@@ -4306,7 +4328,7 @@
cfgsuccess = 0;
} else {
- strncpy(group, "-", NSC_MAXPATH);
+ (void) strncpy(group, "-", NSC_MAXPATH);
bzero(key, sizeof (key));
(void) snprintf(key, sizeof (key),
"sndr.set%d.group", i);
@@ -4316,10 +4338,10 @@
}
if (*parms.rdc_set->disk_queue) {
- strncpy(diskqueue, parms.rdc_set->disk_queue,
- NSC_MAXPATH);
+ (void) strncpy(diskqueue,
+ parms.rdc_set->disk_queue, NSC_MAXPATH);
} else {
- strncpy(diskqueue, "-", NSC_MAXPATH);
+ (void) strncpy(diskqueue, "-", NSC_MAXPATH);
}
bzero(key, sizeof (key));
(void) snprintf(key, sizeof (key),
@@ -4328,8 +4350,8 @@
strlen(diskqueue)) < 0)
cfgsuccess = 0;
- strncpy(frombitmap, parms.rdc_set->primary.bitmap,
- NSC_MAXPATH);
+ (void) strncpy(frombitmap,
+ parms.rdc_set->primary.bitmap, NSC_MAXPATH);
bzero(key, sizeof (key));
(void) snprintf(key, sizeof (key),
"sndr.set%d.pbitmap", i);
@@ -4337,8 +4359,8 @@
strlen(frombitmap)) < 0)
cfgsuccess = 0;
- strncpy(tobitmap, parms.rdc_set->secondary.bitmap,
- NSC_MAXPATH);
+ (void) strncpy(tobitmap,
+ parms.rdc_set->secondary.bitmap, NSC_MAXPATH);
bzero(key, sizeof (key));
(void) snprintf(key, sizeof (key),
"sndr.set%d.sbitmap", i);
@@ -4862,7 +4884,7 @@
continue;
ret = 0;
- strcpy(tmp_line, line);
+ (void) strcpy(tmp_line, line);
if ((tmp = strtok(tmp_line, split_str)) != NULL) {
if (strlen(tmp) >= MAX_RDC_HOST_SIZE) {
@@ -4870,7 +4892,7 @@
"characters\n"), (MAX_RDC_HOST_SIZE - 1));
continue;
}
- strncpy(fromhost, tmp, (MAX_RDC_HOST_SIZE - 1));
+ (void) strncpy(fromhost, tmp, (MAX_RDC_HOST_SIZE - 1));
fromhost[(MAX_RDC_HOST_SIZE - 1)] = '\0';
ret++;
}
@@ -4881,7 +4903,7 @@
"characters\n"), (NSC_MAXPATH - 1));
continue;
}
- strncpy(fromfile, tmp, (NSC_MAXPATH - 1));
+ (void) strncpy(fromfile, tmp, (NSC_MAXPATH - 1));
fromfile[(NSC_MAXPATH - 1)] = '\0';
ret++;
}
@@ -4892,7 +4914,7 @@
"characters\n"), (NSC_MAXPATH - 1));
continue;
}
- strncpy(frombitmap, tmp, (NSC_MAXPATH - 1));
+ (void) strncpy(frombitmap, tmp, (NSC_MAXPATH - 1));
frombitmap[(NSC_MAXPATH - 1)] = '\0';
ret++;
}
@@ -4903,7 +4925,7 @@
"characters\n"), (MAX_RDC_HOST_SIZE - 1));
continue;
}
- strncpy(tohost, tmp, (MAX_RDC_HOST_SIZE - 1));
+ (void) strncpy(tohost, tmp, (MAX_RDC_HOST_SIZE - 1));
tohost[(MAX_RDC_HOST_SIZE - 1)] = '\0';
ret++;
}
@@ -4914,7 +4936,7 @@
"characters\n"), (NSC_MAXPATH - 1));
continue;
}
- strncpy(tofile, tmp, (NSC_MAXPATH - 1));
+ (void) strncpy(tofile, tmp, (NSC_MAXPATH - 1));
tofile[(NSC_MAXPATH - 1)] = '\0';
ret++;
}
@@ -4925,23 +4947,24 @@
"characters\n"), (NSC_MAXPATH - 1));
continue;
}
- strncpy(tobitmap, tmp, (NSC_MAXPATH - 1));
+ (void) strncpy(tobitmap, tmp, (NSC_MAXPATH - 1));
tobitmap[(NSC_MAXPATH - 1)] = '\0';
ret++;
}
if ((tmp = strtok(NULL, split_str)) != NULL) {
- strncpy(dsk_flagstr, tmp, 15);
+ (void) strncpy(dsk_flagstr, tmp, 15);
dsk_flagstr[15] = '\0';
ret++;
}
if ((tmp = strtok(NULL, split_str)) != NULL) {
- strncpy(sync, tmp, 15);
+ (void) strncpy(sync, tmp, 15);
sync[15] = '\0';
ret++;
}
for (j = 0; j < EXTRA_ARGS; j++) {
if ((tmp = strtok(NULL, split_str)) != NULL) {
- strncpy(extra_args[j], tmp, (NSC_MAXPATH - 1));
+ (void) strncpy(extra_args[j], tmp,
+ (NSC_MAXPATH - 1));
extra_args[j][(NSC_MAXPATH - 1)] = '\0';
ret++;
}
@@ -4967,7 +4990,7 @@
#ifdef _RDC_CAMPUS
if (dsk_flagstr[0] == '/') {
/* fcal directio */
- strncpy(directfile, dsk_flagstr, NSC_MAXPATH);
+ (void) strncpy(directfile, dsk_flagstr, NSC_MAXPATH);
} else if (strcmp(dsk_flagstr, "ip") != 0) {
#else
if (strcmp(dsk_flagstr, "ip") != 0) {
@@ -4980,7 +5003,7 @@
gettext("ip specification missing"));
#endif
} else
- strcpy(directfile, "ip");
+ (void) strcpy(directfile, "ip");
if (strcmp(sync, "sync") == 0)
doasync = 0;
@@ -4991,13 +5014,14 @@
rdc_err(NULL,
gettext("sync/async specification missing"));
}
- strncpy(pair_list[i].fhost, fromhost, MAX_RDC_HOST_SIZE);
- strncpy(pair_list[i].ffile, fromfile, NSC_MAXPATH);
- strncpy(pair_list[i].fbitmap, frombitmap, NSC_MAXPATH);
- strncpy(pair_list[i].thost, tohost, MAX_RDC_HOST_SIZE);
- strncpy(pair_list[i].tfile, tofile, NSC_MAXPATH);
- strncpy(pair_list[i].tbitmap, tobitmap, NSC_MAXPATH);
- strncpy(pair_list[i].directfile, directfile, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].fhost, fromhost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(pair_list[i].ffile, fromfile, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].fbitmap, frombitmap, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].thost, tohost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(pair_list[i].tfile, tofile, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].tbitmap, tobitmap, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].directfile, directfile,
+ NSC_MAXPATH);
pair_list[i].doasync = doasync;
if (gethost_netaddrs(fromhost, tohost,
@@ -5096,22 +5120,22 @@
if (flag == RDC_CMD_RECONFIG) {
if (reconfig_pbitmap)
- strncpy(pairp->fbitmap, reconfig_pbitmap,
+ (void) strncpy(pairp->fbitmap, reconfig_pbitmap,
NSC_MAXPATH);
if (reconfig_sbitmap)
- strncpy(pairp->tbitmap, reconfig_sbitmap,
+ (void) strncpy(pairp->tbitmap, reconfig_sbitmap,
NSC_MAXPATH);
#ifdef _RDC_CAMPUS
if (reconfig_direct)
- strncpy(directfile, reconfig_direct,
+ (void) strncpy(directfile, reconfig_direct,
NSC_MAXPATH);
#endif
if (reconfig_group)
- strncpy(pairp->group, reconfig_group,
+ (void) strncpy(pairp->group, reconfig_group,
NSC_MAXPATH);
if (strlen(reconfig_ctag) > 0)
- strncpy(pairp->ctag, reconfig_ctag,
+ (void) strncpy(pairp->ctag, reconfig_ctag,
MAX_RDC_HOST_SIZE);
if (reconfig_doasync != -1)
@@ -5598,7 +5622,7 @@
bitmap);
return (1);
}
- fstat(fd, &s);
+ (void) fstat(fd, &s);
if (S_ISREG(s.st_mode) == 0) {
rdc_warn(NULL, gettext("Bitmap %s is not a regular file"),
@@ -5634,8 +5658,8 @@
}
bmop.offset = offset;
bmop.op = op;
- strncpy(bmop.sechost, tohost, MAX_RDC_HOST_SIZE);
- strncpy(bmop.secfile, tofile, NSC_MAXPATH);
+ (void) strncpy(bmop.sechost, tohost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(bmop.secfile, tofile, NSC_MAXPATH);
bmop.len = buffersz;
bmop.addr = (unsigned long)buffer;
ret = rdc_ioctl_simple(RDC_BITMAPOP, &bmop);
--- a/usr/src/cmd/avs/rdc/sndrboot.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/rdc/sndrboot.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -212,26 +213,26 @@
* At this point, this is the child process. Do the operation
*/
- strncpy(fromfile,
- pair_list[pairs].ffile, NSC_MAXPATH);
- strncpy(tofile,
- pair_list[pairs].tfile, NSC_MAXPATH);
- strncpy(frombitmap,
- pair_list[pairs].fbitmap, NSC_MAXPATH);
- strncpy(fromhost,
- pair_list[pairs].fhost, MAX_RDC_HOST_SIZE);
- strncpy(tohost,
- pair_list[pairs].thost, MAX_RDC_HOST_SIZE);
- strncpy(tobitmap,
- pair_list[pairs].tbitmap, NSC_MAXPATH);
- strncpy(directfile,
- pair_list[pairs].directfile, NSC_MAXPATH);
- strncpy(diskqueue,
- pair_list[pairs].diskqueue, NSC_MAXPATH);
- strncpy(group,
- pair_list[pairs].group, NSC_MAXPATH);
- strncpy(lhost,
- pair_list[pairs].lhost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(fromfile,
+ pair_list[pairs].ffile, NSC_MAXPATH);
+ (void) strncpy(tofile,
+ pair_list[pairs].tfile, NSC_MAXPATH);
+ (void) strncpy(frombitmap,
+ pair_list[pairs].fbitmap, NSC_MAXPATH);
+ (void) strncpy(fromhost,
+ pair_list[pairs].fhost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(tohost,
+ pair_list[pairs].thost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(tobitmap,
+ pair_list[pairs].tbitmap, NSC_MAXPATH);
+ (void) strncpy(directfile,
+ pair_list[pairs].directfile, NSC_MAXPATH);
+ (void) strncpy(diskqueue,
+ pair_list[pairs].diskqueue, NSC_MAXPATH);
+ (void) strncpy(group,
+ pair_list[pairs].group, NSC_MAXPATH);
+ (void) strncpy(lhost,
+ pair_list[pairs].lhost, MAX_RDC_HOST_SIZE);
doasync = pair_list[pairs].doasync;
setid = pair_list[pairs].setid;
@@ -283,11 +284,12 @@
program, fromhost);
}
if (strcmp(hp->h_name, fromhost) == 0)
- strncpy(fromname, hp->h_name, MAXHOSTNAMELEN);
+ (void) strncpy(fromname, hp->h_name, MAXHOSTNAMELEN);
else {
for (i = 0; hp->h_aliases[i] != NULL; i++) {
if (strcmp(hp->h_aliases[i], fromhost) == 0)
- strncpy(fromname, hp->h_aliases[i], MAXHOSTNAMELEN);
+ (void) strncpy(fromname, hp->h_aliases[i],
+ MAXHOSTNAMELEN);
}
}
if (fromname[0] == '\0') {
@@ -304,11 +306,12 @@
program, tohost);
}
if (strcmp(hp->h_name, tohost) == 0)
- strncpy(toname, hp->h_name, MAXHOSTNAMELEN);
+ (void) strncpy(toname, hp->h_name, MAXHOSTNAMELEN);
else {
for (i = 0; hp->h_aliases[i] != NULL; i++) {
if (strcmp(hp->h_aliases[i], tohost) == 0)
- strncpy(toname, hp->h_aliases[i], MAXHOSTNAMELEN);
+ (void) strncpy(toname, hp->h_aliases[i],
+ MAXHOSTNAMELEN);
}
}
if (toname[0] == '\0') {
@@ -406,16 +409,18 @@
rdc_err(NULL, gettext("Neither %s nor %s is local"),
fromhost, tohost);
}
- strncpy(parms.rdc_set->primary.intf, fromhost, MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->primary.file, fromfile, NSC_MAXPATH);
- strncpy(parms.rdc_set->primary.bitmap, frombitmap, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->primary.intf, fromhost,
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(parms.rdc_set->primary.file, fromfile, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->primary.bitmap, frombitmap, NSC_MAXPATH);
- strncpy(parms.rdc_set->secondary.intf, tohost, MAX_RDC_HOST_SIZE);
- strncpy(parms.rdc_set->secondary.file, tofile, NSC_MAXPATH);
- strncpy(parms.rdc_set->secondary.bitmap, tobitmap, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->secondary.intf, tohost,
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(parms.rdc_set->secondary.file, tofile, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->secondary.bitmap, tobitmap, NSC_MAXPATH);
- strncpy(parms.rdc_set->group_name, group, NSC_MAXPATH);
- strncpy(parms.rdc_set->disk_queue, diskqueue, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->group_name, group, NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->disk_queue, diskqueue, NSC_MAXPATH);
parms.rdc_set->maxqfbas = maxqfbas;
parms.rdc_set->maxqitems = maxqitems;
@@ -448,8 +453,8 @@
if (strcmp(lhost, fromname) == 0) {
parms.options |= RDC_OPT_PRIMARY;
- strncpy(parms.rdc_set->direct_file, directfile,
- NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->direct_file, directfile,
+ NSC_MAXPATH);
} else {
parms.options |= RDC_OPT_SECONDARY;
@@ -465,8 +470,8 @@
if (self_check(fromname)) {
parms.options |= RDC_OPT_PRIMARY;
- strncpy(parms.rdc_set->direct_file, directfile,
- NSC_MAXPATH);
+ (void) strncpy(parms.rdc_set->direct_file, directfile,
+ NSC_MAXPATH);
} else {
parms.options |= RDC_OPT_SECONDARY;
parms.rdc_set->direct_file[0] = 0; /* no fcal direct */
@@ -720,20 +725,20 @@
rdc_err(NULL, gettext("cfg input error (%d)"), rc);
if (strcmp(directfile, "ip") == 0)
- strcpy(directfile, "");
+ (void) strcpy(directfile, "");
if (strcmp(group, "-") == 0)
- strcpy(group, "");
+ (void) strcpy(group, "");
if (strcmp(diskqueue, "-") == 0)
- strcpy(diskqueue, "");
+ (void) strcpy(diskqueue, "");
(void) snprintf(key, sizeof (key),
"sndr.set%d.options", setnumber);
if (cfg_get_single_option(cfg, CFG_SEC_CONF, key,
lghn, lhost, MAX_RDC_HOST_SIZE) < 0)
- strcpy(lhost,
+ (void) strcpy(lhost,
get_lghn(cfg, ctag, setnumber, flag));
if (strcmp(sync, "sync") == 0)
@@ -747,19 +752,19 @@
tohost, tofile);
}
- strncpy(pair_list[i].fhost, fromhost,
- MAX_RDC_HOST_SIZE);
- strncpy(pair_list[i].ffile, fromfile, NSC_MAXPATH);
- strncpy(pair_list[i].fbitmap, frombitmap, NSC_MAXPATH);
- strncpy(pair_list[i].thost, tohost, MAX_RDC_HOST_SIZE);
- strncpy(pair_list[i].tfile, tofile, NSC_MAXPATH);
- strncpy(pair_list[i].tbitmap, tobitmap, NSC_MAXPATH);
- strncpy(pair_list[i].directfile, directfile,
- NSC_MAXPATH);
- strncpy(pair_list[i].diskqueue, diskqueue,
- NSC_MAXPATH);
- strncpy(pair_list[i].group, group, NSC_MAXPATH);
- strncpy(pair_list[i].lhost, lhost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(pair_list[i].fhost, fromhost,
+ MAX_RDC_HOST_SIZE);
+ (void) strncpy(pair_list[i].ffile, fromfile, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].fbitmap, frombitmap, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].thost, tohost, MAX_RDC_HOST_SIZE);
+ (void) strncpy(pair_list[i].tfile, tofile, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].tbitmap, tobitmap, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].directfile, directfile,
+ NSC_MAXPATH);
+ (void) strncpy(pair_list[i].diskqueue, diskqueue,
+ NSC_MAXPATH);
+ (void) strncpy(pair_list[i].group, group, NSC_MAXPATH);
+ (void) strncpy(pair_list[i].lhost, lhost, MAX_RDC_HOST_SIZE);
pair_list[i].doasync = doasync;
if (cfg_get_single_option(cfg, CFG_SEC_CONF, key, "setid",
--- a/usr/src/cmd/avs/rdc/sndrd.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/rdc/sndrd.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -481,7 +482,7 @@
}
}
/* close defaults file */
- defopen(NULL);
+ (void) defopen(NULL);
}
}
#ifdef lint
@@ -1655,7 +1656,7 @@
nsa.fd = fd;
nsa.nthr = (max_conns_allowed < 0 ? 16 : max_conns_allowed);
- strncpy(nsa.netid, nconf->nc_netid, sizeof (nsa.netid));
+ (void) strncpy(nsa.netid, nconf->nc_netid, sizeof (nsa.netid));
nsa.addrmask.len = addrmask.len;
nsa.addrmask.maxlen = addrmask.maxlen;
nsa.addrmask.buf = addrmask.buf;
--- a/usr/src/cmd/avs/rdc/sndrsubr.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/rdc/sndrsubr.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -114,80 +115,80 @@
switch (flag) {
case (RDC_CMD_COPY):
if (options & RDC_OPT_FULL)
- strcpy(str, "-m");
+ (void) strcpy(str, "-m");
else
- strcpy(str, "-u");
+ (void) strcpy(str, "-u");
if (options & RDC_OPT_REVERSE)
- strcat(str, " -r");
+ (void) strcat(str, " -r");
break;
case (RDC_CMD_DISABLE):
- strcpy(str, "-d");
+ (void) strcpy(str, "-d");
break;
case (RDC_CMD_ENABLE):
if (options & RDC_OPT_SETBMP)
- strcpy(str, "-e");
+ (void) strcpy(str, "-e");
else
- strcpy(str, "-E");
+ (void) strcpy(str, "-E");
break;
case (RDC_CMD_LOG):
- strcpy(str, "-l");
+ (void) strcpy(str, "-l");
break;
case (RDC_CMD_HEALTH):
- strcpy(str, "-H");
+ (void) strcpy(str, "-H");
break;
case (RDC_CMD_WAIT):
- strcpy(str, "-w");
+ (void) strcpy(str, "-w");
break;
case (RDC_CMD_RECONFIG):
- strcpy(str, "-R ...");
+ (void) strcpy(str, "-R ...");
break;
case (RDC_CMD_TUNABLE):
- strcpy(str, "");
+ (void) strcpy(str, "");
if (maxqfbas != MAXQFBAS)
- strcat(str, " -F");
+ (void) strcat(str, " -F");
if (maxqitems != MAXQITEMS)
- strcat(str, " -W");
+ (void) strcat(str, " -W");
if (autosync != AUTOSYNC)
- strcat(str, " -a");
+ (void) strcat(str, " -a");
if (asyncthr != ASYNCTHR)
- strcat(str, " -A");
+ (void) strcat(str, " -A");
if (qblock != QBLOCK)
- strcat(str, " -D");
+ (void) strcat(str, " -D");
break;
case (RDC_CMD_SUSPEND):
- strcpy(str, "-s");
+ (void) strcpy(str, "-s");
break;
case (RDC_CMD_RESUME):
- strcpy(str, "-r");
+ (void) strcpy(str, "-r");
break;
case (RDC_CMD_RESET):
- strcpy(str, "-R");
+ (void) strcpy(str, "-R");
break;
case (RDC_CMD_ADDQ):
- strcpy(str, "-q a");
+ (void) strcpy(str, "-q a");
break;
case (RDC_CMD_REMQ):
- strcpy(str, "-q d");
+ (void) strcpy(str, "-q d");
break;
case (RDC_CMD_REPQ):
- strcpy(str, "-q r");
+ (void) strcpy(str, "-q r");
break;
default:
- strcpy(str, gettext("unknown"));
+ (void) strcpy(str, gettext("unknown"));
break;
}
@@ -448,7 +449,7 @@
{
sigset_t allsigs;
- sigfillset(&allsigs);
+ (void) sigfillset(&allsigs);
if (sigprocmask(SIG_BLOCK, &allsigs, &origmask) < 0)
rdc_warn(NULL, gettext("Unable to block signals"));
}
--- a/usr/src/cmd/avs/rdc/sndrsyncd.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/rdc/sndrsyncd.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -305,7 +306,7 @@
spcs_s_info_t ustatus;
if (host)
- strncpy(tmphost, host, MAX_RDC_HOST_SIZE);
+ (void) strncpy(tmphost, host, MAX_RDC_HOST_SIZE);
ustatus = spcs_s_ucreate();
@@ -432,7 +433,8 @@
continue;
numfound++;
- strncpy(rdc_set[sets].secondary.intf, buf, MAX_RDC_HOST_SIZE);
+ (void) strncpy(rdc_set[sets].secondary.intf, buf,
+ MAX_RDC_HOST_SIZE);
/* Got a matching entry */
@@ -440,19 +442,20 @@
setnumber);
if (cfg_get_cstring(cfg, key, buf, CFG_MAX_BUF) < 0)
break;
- strncpy(rdc_set[sets].primary.intf, buf, MAX_RDC_HOST_SIZE);
+ (void) strncpy(rdc_set[sets].primary.intf, buf,
+ MAX_RDC_HOST_SIZE);
(void) snprintf(key, sizeof (key), "sndr.set%d.primary",
setnumber);
if (cfg_get_cstring(cfg, key, buf, CFG_MAX_BUF) < 0)
break;
- strncpy(rdc_set[sets].primary.file, buf, NSC_MAXPATH);
+ (void) strncpy(rdc_set[sets].primary.file, buf, NSC_MAXPATH);
(void) snprintf(key, sizeof (key), "sndr.set%d.secondary",
setnumber);
if (cfg_get_cstring(cfg, key, buf, CFG_MAX_BUF) < 0)
break;
- strncpy(rdc_set[sets].secondary.file, buf, NSC_MAXPATH);
+ (void) strncpy(rdc_set[sets].secondary.file, buf, NSC_MAXPATH);
parms.command = RDC_CMD_STATUS;
bcopy((void *)(&rdc_set[sets]), (void *)(&parms.rdc_set[0]),
@@ -822,13 +825,13 @@
setnumber);
if (cfg_get_cstring(cfg, key, buf, CFG_MAX_BUF) < 0)
break;
- strncpy(shadow, buf, NSC_MAXPATH);
+ (void) strncpy(shadow, buf, NSC_MAXPATH);
(void) snprintf(key, sizeof (key), "ndr_ii.set%d.bitmap",
setnumber);
if (cfg_get_cstring(cfg, key, buf, CFG_MAX_BUF) < 0)
break;
- strncpy(bitmap, buf, NSC_MAXPATH);
+ (void) strncpy(bitmap, buf, NSC_MAXPATH);
(void) snprintf(key, sizeof (key), "ndr_ii.set%d.state",
setnumber);
@@ -1229,26 +1232,26 @@
"sndr.set%d.primary", setnumber);
if (cfg_get_cstring(cfg, key, primary, sizeof (primary)) < 0)
break;
- strcpy(parms.rdc_set->primary.file, primary);
+ (void) strcpy(parms.rdc_set->primary.file, primary);
(void) snprintf(key, sizeof (key),
"sndr.set%d.phost", setnumber);
if (cfg_get_cstring(cfg, key, phost, sizeof (phost)) < 0)
break;
- strcpy(parms.rdc_set->primary.intf, phost);
+ (void) strcpy(parms.rdc_set->primary.intf, phost);
(void) snprintf(key, sizeof (key),
"sndr.set%d.secondary", setnumber);
if (cfg_get_cstring(cfg, key, secondary,
sizeof (secondary)) < 0)
break;
- strcpy(parms.rdc_set->secondary.file, secondary);
+ (void) strcpy(parms.rdc_set->secondary.file, secondary);
(void) snprintf(key, sizeof (key),
"sndr.set%d.shost", setnumber);
if (cfg_get_cstring(cfg, key, shost, sizeof (shost)) < 0)
break;
- strcpy(parms.rdc_set->secondary.intf, shost);
+ (void) strcpy(parms.rdc_set->secondary.intf, shost);
parms.command = RDC_CMD_STATUS;
if (RDC_IOCTL(RDC_CONFIG, &parms, NULL, 0, 0, 0, ustatus) < 0) {
--- a/usr/src/cmd/avs/sdbc/scmadm.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/sdbc/scmadm.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -200,7 +201,7 @@
#ifdef DEBUG
(void) printf(gettext("%s: installing default config entry '%s'\n"),
- progname, default_cfg);
+ progname, default_cfg);
#endif
if (mode != CFG_WRLOCK) {
cfg_unlock(cfg);
@@ -255,8 +256,8 @@
} else if (rc > 0) {
return (TRUE);
} else {
- (void) fprintf(stderr, "%s\n",
- (gettext("%s: unable to ascertain environment"), progname));
+ (void) fprintf(stderr,
+ gettext("%s: unable to ascertain environment\n"), progname);
exit(1);
}
@@ -556,7 +557,7 @@
if (cfg_get_cstring(cfg, key, buf, sizeof (buf)) < 0) {
if (errno == ESRCH) {
/* not found */
- strcpy(buf, "");
+ (void) strcpy(buf, "");
} else {
(void) fprintf(stderr,
gettext("%s: error reading "
@@ -583,18 +584,19 @@
convert_config(cfg, CFG_WRLOCK);
for (/*CSTYLED*/; optind < argc; optind++) {
- strncpy(option, argv[optind], sizeof (option));
+ (void) strncpy(option, argv[optind], sizeof (option));
option[sizeof (option) - 1] = '\0'; /* terminate */
cp = strchr(option, '=');
if (cp != NULL) {
*cp = '\0'; /* terminate option */
cp++;
- strncpy(value, cp, sizeof (value));
+ (void) strncpy(value, cp, sizeof (value));
value[sizeof (value) - 1] = '\0';
if (*value == '\0')
- strncpy(value, "-", sizeof (value));
+ (void) strncpy(value, "-",
+ sizeof (value));
}
found = 0;
@@ -625,7 +627,7 @@
}
if (*buf == '\0')
- strncpy(buf, "<default>", sizeof (buf));
+ (void) strncpy(buf, "<default>", sizeof (buf));
if (cp != NULL) {
char *tmp;
@@ -638,8 +640,8 @@
if (strcmp(value, tmp) == 0) {
(void) fprintf(stderr,
gettext(
- "%s: bad value (%s) "
- "for option %s\n"),
+ "%s: bad value (%s) "
+ "for option %s\n"),
progname, value, option);
error = 1;
goto out;
@@ -867,9 +869,9 @@
}
if (cd == -1)
- strcpy(device, "system");
+ (void) strcpy(device, "system");
else
- strncpy(device, cd_to_device(cd), NSC_MAXPATH);
+ (void) strncpy(device, cd_to_device(cd), NSC_MAXPATH);
found = 0;
for (setnumber = 1; /*CONSTCOND*/ TRUE; setnumber++) {
@@ -898,13 +900,13 @@
else
rc = cfg_put_cstring(cfg, key, "1", 1);
} else {
- strncpy(buf, device, CFG_MAX_BUF);
+ (void) strncpy(buf, device, CFG_MAX_BUF);
if (flag == 0)
- strncat(buf, " 0 0", CFG_MAX_BUF);
+ (void) strncat(buf, " 0 0", CFG_MAX_BUF);
else if (hint == NSC_WRTHRU)
- strncat(buf, " 1 0", CFG_MAX_BUF);
+ (void) strncat(buf, " 1 0", CFG_MAX_BUF);
else /* NSC_NOCACHE */
- strncat(buf, " 0 1", CFG_MAX_BUF);
+ (void) strncat(buf, " 0 1", CFG_MAX_BUF);
rc = cfg_put_cstring(cfg, "cache_hint", buf, sizeof (buf));
}
@@ -1014,7 +1016,7 @@
break;
#endif
case 'a':
- strcpy(alert_file, optarg);
+ (void) strcpy(alert_file, optarg);
break;
case 'q':
qflag++;
@@ -1360,7 +1362,7 @@
#define addusage(f__) \
- strncat(scmadmUsage, f__, sizeof (scmadmUsage));
+ (void) strncat(scmadmUsage, f__, sizeof (scmadmUsage));
#define addusage1(f__, a__) \
(void) snprintf(fmt, sizeof (fmt), "%s%s", scmadmUsage, f__); \
@@ -1720,7 +1722,7 @@
cd = SDT_ANY_CD; /* any device */
flag = SD_ALERT_WAIT; /* block for alert */
if ((count = SDBC_IOCTL(SDBC_ADUMP, cd, &tt, buf, size,
- flag, &ustats)) == SPCS_S_ERROR) {
+ flag, &ustats)) == SPCS_S_ERROR) {
(void) fprintf(stderr, gettext("%s: sd_adump\n"), progname);
sdbc_report_error(&ustats);
if (errno == EIDRM) {
@@ -1832,12 +1834,12 @@
if ((len =
strlen(cs_cur->st_shared[cd].sh_filename))
> 23) {
- strcpy(fn, "...");
- strcat(fn,
+ (void) strcpy(fn, "...");
+ (void) strcat(fn,
cs_cur->st_shared[cd].sh_filename +
len - 20);
} else {
- strcpy(fn,
+ (void) strcpy(fn,
cs_cur->st_shared[cd].sh_filename);
}
@@ -1890,12 +1892,12 @@
if (cs_cur->st_shared[cd].sh_alloc) {
if ((len = strlen(
cs_cur->st_shared[cd].sh_filename)) > 15) {
- strcpy(fn, "...");
- strcat(fn,
+ (void) strcpy(fn, "...");
+ (void) strcat(fn,
cs_cur->st_shared[cd].sh_filename +
len - 12);
} else {
- strcpy(fn,
+ (void) strcpy(fn,
cs_cur->st_shared[cd].sh_filename);
}
(void) printf(gettext("\t%d\t%s\n"),
--- a/usr/src/cmd/avs/sdbc/sd_diag.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/sdbc/sd_diag.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -155,7 +156,7 @@
switch (c) {
case 'f':
/* printf("\n%s", optarg); */
- strcpy(config_file, optarg);
+ (void) strcpy(config_file, optarg);
break;
case 'b':
/* bufsize between 1*512 and 512*512 */
@@ -753,13 +754,13 @@
name[h], err);
for (i = 0; i < readercount; i++)
- wait(0);
+ (void) wait(0);
/* No lock needed here - everybody's finished */
err += ERR;
(void) mutex_destroy(&ERRMUTEX);
- shmctl(shmid, IPC_RMID, 0);
+ (void) shmctl(shmid, IPC_RMID, 0);
return (err);
}
@@ -1014,7 +1015,7 @@
print_usage();
exit(0);
}
- strcpy(config_file, DISKLIST);
+ (void) strcpy(config_file, DISKLIST);
parse_opts(argc, argv);
_nsc_nocheck();
@@ -1084,7 +1085,7 @@
continue;
} /* for */
for (i = 0; i < h; i++)
- wait(0);
+ (void) wait(0);
} else {
for (h = 0; h < procs; h++) {
@@ -1161,7 +1162,7 @@
continue;
}
for (i = 0; i < h; i++)
- wait(0);
+ (void) wait(0);
}
return (0);
--- a/usr/src/cmd/avs/sdbc/sd_stats.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/sdbc/sd_stats.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -286,11 +287,11 @@
/*
* Set signal handle
*/
- sigset(SIGPIPE, leave);
- sigset(SIGINT, leave);
- sigset(SIGQUIT, leave);
- signal(SIGFPE, leave);
- signal(SIGSEGV, leave);
+ (void) sigset(SIGPIPE, leave);
+ (void) sigset(SIGINT, leave);
+ (void) sigset(SIGQUIT, leave);
+ (void) signal(SIGFPE, leave);
+ (void) signal(SIGSEGV, leave);
USEC_INIT();
currtime = USEC_READ();
@@ -435,7 +436,7 @@
case 'z':
if (SDBC_IOCTL(SDBC_ZAP_STATS, 0, 0, 0, 0, 0,
- &ustats) == SPCS_S_ERROR) {
+ &ustats) == SPCS_S_ERROR) {
if (ustats) {
spcs_s_report(ustats, stderr);
spcs_s_ufree(&ustats);
@@ -472,8 +473,8 @@
void
leave(int status)
{
- sigignore(SIGPIPE);
- sigignore(SIGALRM);
+ (void) sigignore(SIGPIPE);
+ (void) sigignore(SIGALRM);
/* clear(); */
(void) move(LINES, 0);
(void) refresh();
--- a/usr/src/cmd/avs/sdbc/sd_trace.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/cmd/avs/sdbc/sd_trace.c Fri Jan 22 21:39:01 2010 -0800
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -395,11 +396,13 @@
status_bit = ' ';
if ((len = strlen(cs_cur->st_shared[i].sh_filename))
> 15) {
- strcpy(fn, "...");
- strcat(fn, cs_cur->st_shared[i].sh_filename +
+ (void) strcpy(fn, "...");
+ (void) strcat(fn,
+ cs_cur->st_shared[i].sh_filename +
len - 12);
} else
- strcpy(fn, cs_cur->st_shared[i].sh_filename);
+ (void) strcpy(fn,
+ cs_cur->st_shared[i].sh_filename);
if (on_off[i]) {
(void) mvprintw(4 + j, 1,
"%3d %-15s%c %6d %6d %6d %6d %6d %6d %6d",
@@ -493,17 +496,17 @@
#define IND_BITMAP_FAILED 8
#define IND_FULL_SYNC_NEEDED 9
#define IND_FCAL_FAILED 10
- strcpy(status[IND_ENABLED], "replicating");
- strcpy(status[IND_RESYNC], "sync");
- strcpy(status[IND_RESYNC_REVERSE], "rev sync");
- strcpy(status[IND_VOLUME_DOWN], "volume down");
- strcpy(status[IND_MIRROR_DOWN], "mirror down");
- strcpy(status[IND_LOGGING], "logging");
- strcpy(status[IND_RESYNC_NEEDED], "need sync");
- strcpy(status[IND_REV_RESYNC_NEEDED], "need rev sync");
- strcpy(status[IND_BITMAP_FAILED], "bitmap failed");
- strcpy(status[IND_FULL_SYNC_NEEDED], "full sync needed");
- strcpy(status[IND_FCAL_FAILED], "fcal failed");
+ (void) strcpy(status[IND_ENABLED], "replicating");
+ (void) strcpy(status[IND_RESYNC], "sync");
+ (void) strcpy(status[IND_RESYNC_REVERSE], "rev sync");
+ (void) strcpy(status[IND_VOLUME_DOWN], "volume down");
+ (void) strcpy(status[IND_MIRROR_DOWN], "mirror down");
+ (void) strcpy(status[IND_LOGGING], "logging");
+ (void) strcpy(status[IND_RESYNC_NEEDED], "need sync");
+ (void) strcpy(status[IND_REV_RESYNC_NEEDED], "need rev sync");
+ (void) strcpy(status[IND_BITMAP_FAILED], "bitmap failed");
+ (void) strcpy(status[IND_FULL_SYNC_NEEDED], "full sync needed");
+ (void) strcpy(status[IND_FCAL_FAILED], "fcal failed");
dual_initted = 1;
}
@@ -712,11 +715,11 @@
len = strlen(rdc_info[rdcindex].secondary.file);
if (len > 15) {
- strcpy(fn, "...");
- strcat(fn,
+ (void) strcpy(fn, "...");
+ (void) strcat(fn,
rdc_info[rdcindex].secondary.file + len - 12);
} else
- strcpy(fn, rdc_info[rdcindex].secondary.file);
+ (void) strcpy(fn, rdc_info[rdcindex].secondary.file);
(void) mvprintw(k, 0, "%-15s", fn);
segs = FBA_TO_LOG_LEN(rdc_info[rdcindex].volume_size);
@@ -892,11 +895,13 @@
status_bit = ' ';
if ((len =
strlen(cs_cur->st_shared[i].sh_filename)) > 15) {
- strcpy(fn, "...");
- strcat(fn, cs_cur->st_shared[i].sh_filename +
+ (void) strcpy(fn, "...");
+ (void) strcat(fn,
+ cs_cur->st_shared[i].sh_filename +
len - 12);
} else
- strcpy(fn, cs_cur->st_shared[i].sh_filename);
+ (void) strcpy(fn,
+ cs_cur->st_shared[i].sh_filename);
if (on_off[i]) {
(void) mvprintw(4 + j, 1,
--- a/usr/src/uts/common/fs/zfs/zfs_vnops.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/uts/common/fs/zfs/zfs_vnops.c Fri Jan 22 21:39:01 2010 -0800
@@ -522,7 +522,7 @@
ASSERT(offset + n <= blksz);
nblk = 1;
}
- dmu_xuio_init(xuio, nblk);
+ (void) dmu_xuio_init(xuio, nblk);
if (vn_has_cached_data(vp)) {
/*
@@ -530,7 +530,7 @@
* even if we only expect to read a portion of a block.
*/
while (--nblk >= 0) {
- dmu_xuio_add(xuio,
+ (void) dmu_xuio_add(xuio,
dmu_request_arcbuf(zp->z_dbuf, blksz),
0, blksz);
}
@@ -4701,7 +4701,7 @@
size -= postamble;
fullblk = size / blksz;
- dmu_xuio_init(xuio,
+ (void) dmu_xuio_init(xuio,
(preamble != 0) + fullblk + (postamble != 0));
DTRACE_PROBE3(zfs_reqzcbuf_align, int, preamble,
int, postamble, int,
@@ -4715,20 +4715,21 @@
/* data begins in the middle of the arc_buf */
abuf = dmu_request_arcbuf(zp->z_dbuf, blksz);
ASSERT(abuf);
- dmu_xuio_add(xuio, abuf, blksz - preamble, preamble);
+ (void) dmu_xuio_add(xuio, abuf,
+ blksz - preamble, preamble);
}
for (i = 0; i < fullblk; i++) {
abuf = dmu_request_arcbuf(zp->z_dbuf, blksz);
ASSERT(abuf);
- dmu_xuio_add(xuio, abuf, 0, blksz);
+ (void) dmu_xuio_add(xuio, abuf, 0, blksz);
}
if (postamble) {
/* data ends in the middle of the arc_buf */
abuf = dmu_request_arcbuf(zp->z_dbuf, blksz);
ASSERT(abuf);
- dmu_xuio_add(xuio, abuf, 0, postamble);
+ (void) dmu_xuio_add(xuio, abuf, 0, postamble);
}
break;
case UIO_READ:
--- a/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c Fri Jan 22 15:23:05 2010 -0800
+++ b/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c Fri Jan 22 21:39:01 2010 -0800
@@ -22,7 +22,7 @@
/* Copyright 2010 QLogic Corporation */
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -1455,8 +1455,8 @@
if (ha->fw_module != NULL) {
(void) ddi_modclose(ha->fw_module);
}
- ql_el_trace_desc_dtor(ha);
- ql_nvram_cache_desc_dtor(ha);
+ (void) ql_el_trace_desc_dtor(ha);
+ (void) ql_nvram_cache_desc_dtor(ha);
ddi_soft_state_free(ql_state, instance);
progress &= ~QL_SOFT_STATE_ALLOCED;