Module Name: othersrc
Committed By: riz
Date: Mon Aug 15 17:46:37 UTC 2011
Modified Files:
othersrc/external/bsd/iscsi/sbin/iscsictl: iscsic_daemonif.c
iscsic_driverif.c
Log Message:
Don't bother casting the unused return of snprintf()/memset() to (void).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_daemonif.c \
othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_driverif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_daemonif.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_daemonif.c:1.2 othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_daemonif.c:1.3
--- othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_daemonif.c:1.2 Mon Aug 8 02:24:33 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_daemonif.c Mon Aug 15 17:46:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsic_daemonif.c,v 1.2 2011/08/08 02:24:33 agc Exp $ */
+/* $NetBSD: iscsic_daemonif.c,v 1.3 2011/08/15 17:46:36 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -518,7 +518,7 @@
iscsid_add_isns_server_rsp_t *res;
iscsid_response_t *rsp;
- (void) memset(&arg, 0x0, sizeof(arg));
+ memset(&arg, 0x0, sizeof(arg));
if (!(cl_get_isns(&arg, argc, argv))) {
arg_missing("Server Address");
}
@@ -621,7 +621,7 @@
iscsid_sym_id_t req;
unsigned i;
- (void) memset(&req, 0x0, sizeof(req));
+ memset(&req, 0x0, sizeof(req));
check_extra_args(argc, argv);
/* get the list of servers */
@@ -682,7 +682,7 @@
iscsid_add_initiator_rsp_t *res;
iscsid_response_t *rsp;
- (void) memset(&req, 0x0, sizeof(req));
+ memset(&req, 0x0, sizeof(req));
if (!cl_get_string('a', (char *)req.address, argc, argv)) {
arg_missing("Interface Address");
}
@@ -717,7 +717,7 @@
iscsid_sym_id_t req;
iscsid_response_t *rsp;
- (void) memset(&req, 0x0, sizeof(req));
+ memset(&req, 0x0, sizeof(req));
if (!cl_get_id('I', &req, argc, argv)) {
arg_missing("Initiator Portal ID");
}
@@ -753,7 +753,7 @@
iscsid_sym_id_t req;
unsigned i;
- (void) memset(&req, 0x0, sizeof(req));
+ memset(&req, 0x0, sizeof(req));
check_extra_args(argc, argv);
/* get the list of servers */
@@ -894,7 +894,7 @@
iscsid_login_rsp_t *res;
iscsid_response_t *rsp;
- (void) memset(&loginp, 0x0, sizeof(loginp));
+ memset(&loginp, 0x0, sizeof(loginp));
loginp.login_type = (cl_get_opt('m', argc, argv))
? ISCSI_LOGINTYPE_NOMAP : ISCSI_LOGINTYPE_MAP;
@@ -962,7 +962,7 @@
iscsid_login_req_t loginp;
iscsid_response_t *rsp;
- (void) memset(&loginp, 0x0, sizeof(loginp));
+ memset(&loginp, 0x0, sizeof(loginp));
loginp.login_type = ISCSI_LOGINTYPE_MAP;
cl_get_id('I', &loginp.session_id, argc, argv);
@@ -1043,8 +1043,8 @@
unsigned j;
int lconn;
- (void) memset(&creq, 0x0, sizeof(creq));
- (void) memset(&clreq, 0x0, sizeof(clreq));
+ memset(&creq, 0x0, sizeof(creq));
+ memset(&clreq, 0x0, sizeof(clreq));
lconn = cl_get_opt('c', argc, argv);
check_extra_args(argc, argv);
@@ -1117,7 +1117,7 @@
iscsid_response_t *rsp;
uint64_t isid;
- (void) memset(&req, 0x0, sizeof(req));
+ memset(&req, 0x0, sizeof(req));
if (!cl_get_string('n', (char *)req.InitiatorName, argc, argv)) {
arg_missing("Initiator Name");
}
Index: othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_driverif.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_driverif.c:1.2 othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_driverif.c:1.3
--- othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_driverif.c:1.2 Mon Aug 8 02:24:33 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_driverif.c Mon Aug 15 17:46:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsic_driverif.c,v 1.2 2011/08/08 02:24:33 agc Exp $ */
+/* $NetBSD: iscsic_driverif.c,v 1.3 2011/08/15 17:46:36 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -336,7 +336,7 @@
for (pt = asctab; pt->key != NULL && asc >= pt->asc; pt++) {
if (asc == pt->asc && ascq == pt->ascq) {
bp = (char *)&buf[1024];
- (void) snprintf(bp, sizeof(buf) - 1024, "%s: %s",
+ snprintf(bp, sizeof(buf) - 1024, "%s: %s",
str, pt->key);
return bp;
}
@@ -373,38 +373,38 @@
if (io->req.senselen_used) {
switch (io->req.sense[2] & 0x0f) {
case 0x01:
- (void) snprintf(esp = es, sizeof(es), "Recovered Error");
+ snprintf(esp = es, sizeof(es), "Recovered Error");
break;
case 0x02:
- (void) snprintf(esp = es, sizeof(es), "Not Ready");
+ snprintf(esp = es, sizeof(es), "Not Ready");
break;
case 0x03:
- (void) snprintf(esp = es, sizeof(es), "Medium Error");
+ snprintf(esp = es, sizeof(es), "Medium Error");
break;
case 0x04:
- (void) snprintf(esp = es, sizeof(es), "Hardware Error");
+ snprintf(esp = es, sizeof(es), "Hardware Error");
break;
case 0x05:
- (void) snprintf(esp = es, sizeof(es), "Illegal Request");
+ snprintf(esp = es, sizeof(es), "Illegal Request");
break;
case 0x06:
- (void) snprintf(esp = es, sizeof(es), "Unit Attention");
+ snprintf(esp = es, sizeof(es), "Unit Attention");
break;
case 0x07:
- (void) snprintf(esp = es, sizeof(es), "Data Protect");
+ snprintf(esp = es, sizeof(es), "Data Protect");
break;
case 0x08:
- (void) snprintf(esp = es, sizeof(es), "Blank Check");
+ snprintf(esp = es, sizeof(es), "Blank Check");
break;
default:
- (void) snprintf(esp = (char *)&buf[256], sizeof(buf) - 256, "Sense key 0x%x",
+ snprintf(esp = (char *)&buf[256], sizeof(buf) - 256, "Sense key 0x%x",
io->req.sense[2] & 0x0f);
break;
}
if (io->req.senselen_used >= 14) {
add_asc_info(esp, io->req.sense[12], io->req.sense[13]);
}
- (void) snprintf((char *)buf, sizeof(buf), "Sense Data (%s):", esp);
+ snprintf((char *)buf, sizeof(buf), "Sense Data (%s):", esp);
dump_data((char *)buf, io->req.sense, io->req.senselen_used);
return io->req.retsts;
}
