Module Name: othersrc
Committed By: agc
Date: Tue Jul 26 05:51:58 UTC 2011
Modified Files:
othersrc/external/bsd/iscsi/sbin/iscsid: iscsid_discover.c
iscsid_driverif.c iscsid_lists.c iscsid_main.c iscsid_targets.c
Log Message:
adapt this code to WARNS=4
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_discover.c \
othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_lists.c
cvs rdiff -u -r1.2 -r1.3 \
othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_driverif.c \
othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_main.c \
othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.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/iscsid/iscsid_discover.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_discover.c:1.1.1.1 othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_discover.c:1.2
--- othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_discover.c:1.1.1.1 Mon May 2 07:01:06 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_discover.c Tue Jul 26 05:51:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_discover.c,v 1.1.1.1 2011/05/02 07:01:06 agc Exp $ */
+/* $NetBSD: iscsid_discover.c,v 1.2 2011/07/26 05:51:57 agc Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -75,13 +75,13 @@
for (i = 0; i < 5 && !wdt[i]; i++) {
}
if (i == 5 && wdt[5] == 0xffff) {
- snprintf(dest, size, "%d.%d.%d.%d",
+ snprintf((char *)dest, size, "%d.%d.%d.%d",
data[12], data[13], data[14], data[15]);
} else {
for (cc = 0, i = 0; i < 7; i++) {
- cc += snprintf(&dest[cc], size - cc, "%x:", wdt[i]);
+ cc += snprintf((char *)&dest[cc], size - cc, "%x:", wdt[i]);
}
- snprintf(&dest[cc], size - cc, "%x", wdt[7]);
+ snprintf((char *)&dest[cc], size - cc, "%x", wdt[7]);
}
}
@@ -102,7 +102,7 @@
int retval;
ISNS_TRANS t;
uint32_t tag;
- uint32_t data_len;
+ int32_t data_len;
void *data_p;
uint32_t u32;
struct timespec tout = { 5, 0 };
@@ -117,8 +117,8 @@
DEBOUT(("get_targets iscsi_new_trans failed\n"));
return ISCSID_STATUS_NO_RESOURCES;
}
- isns_add_string(t, isnst_iSCSIName, isns->reg_iscsi_name);
- isns_add_string(t, isnst_iSCSIName, TargetName);
+ isns_add_string(t, isnst_iSCSIName, (char *)isns->reg_iscsi_name);
+ isns_add_string(t, isnst_iSCSIName, (char *)TargetName);
isns_add_tlv(t, isnst_Delimiter, 0, NULL);
@@ -200,8 +200,8 @@
DEBOUT(("get_targets iscsi_new_trans failed\n"));
return ISCSID_STATUS_NO_RESOURCES;
}
- isns_add_string(t, isnst_iSCSIName, isns->reg_iscsi_name);
- isns_add_string(t, isnst_iSCSIName, TargetName);
+ isns_add_string(t, isnst_iSCSIName, (char *)isns->reg_iscsi_name);
+ isns_add_string(t, isnst_iSCSIName, (char *)TargetName);
isns_add_tlv(t, isnst_Delimiter, 0, NULL);
@@ -293,14 +293,14 @@
DEB(1, ("Adding <%s>, IP <%s>, Port %d, Tag %d\n",
name, addr.address, addr.port, addr.group_tag));
- if ((targ = add_discovered_target(name, &addr, PORTAL_TYPE_ISNS,
- isns->entry.sid.id)) == NULL) {
+ if ((targ = add_discovered_target((unsigned char *)name, &addr, PORTAL_TYPE_ISNS,
+ isns->entry.sid.id)) == NULL) {
isns_free_trans(t);
return ISCSID_STATUS_NO_RESOURCES;
}
if (alias[0]) {
- strlcpy(targ->TargetAlias, alias,
+ strlcpy((char *)targ->TargetAlias, alias,
sizeof(targ->TargetAlias));
}
}
@@ -337,14 +337,14 @@
return ISCSID_STATUS_NO_RESOURCES;
}
- isns_add_string(t, isnst_iSCSIName, isns->reg_iscsi_name);
+ isns_add_string(t, isnst_iSCSIName, (char *)isns->reg_iscsi_name);
isns_add_tlv(t, isnst_Delimiter, 0, NULL);
- isns_add_string(t, isnst_EID, isns->reg_entity_id);
+ isns_add_string(t, isnst_EID, (char *)isns->reg_entity_id);
isns_add_tlv(t, isnst_PortalIPAddr, sizeof(isns->reg_ip_addr),
isns->reg_ip_addr);
isns_add_tlv(t, isnst_PortalPort, sizeof(isns->reg_ip_port),
&isns->reg_ip_port);
- isns_add_string(t, isnst_iSCSIName, isns->reg_iscsi_name);
+ isns_add_string(t, isnst_iSCSIName, (char *)isns->reg_iscsi_name);
retval = isns_send_trans(t, &tout, &status);
DEB(9, ("DevAttrReg request returns %d, status %d\n", retval, status));
@@ -377,16 +377,16 @@
return ISCSID_STATUS_NO_RESOURCES;
}
- isns_add_string(t, isnst_iSCSIName, isns->reg_iscsi_name); /*tag=32 */
+ isns_add_string(t, isnst_iSCSIName, (char *)isns->reg_iscsi_name); /*tag=32 */
isns_add_tlv(t, isnst_Delimiter, 0, NULL);
- isns_add_string(t, isnst_EID, isns->reg_entity_id);
+ isns_add_string(t, isnst_EID, (char *)isns->reg_entity_id);
u32 = htonl(2);
isns_add_tlv(t, isnst_EntProtocol, sizeof(u32), &u32);
isns_add_tlv(t, isnst_PortalIPAddr, sizeof(isns->reg_ip_addr),
isns->reg_ip_addr);
isns_add_tlv(t, isnst_PortalPort, sizeof(isns->reg_ip_port),
&isns->reg_ip_port);
- isns_add_string(t, isnst_iSCSIName, isns->reg_iscsi_name); /*tag=32 */
+ isns_add_string(t, isnst_iSCSIName, (char *)isns->reg_iscsi_name); /*tag=32 */
u32 = htonl(2);
isns_add_tlv(t, isnst_iSCSINodeType, sizeof(u32), &u32);
/*tag=33 (node type = intiator) */
@@ -415,11 +415,11 @@
get_registration_info(isns_t * isns)
{
struct sockaddr_storage sa;
- int n;
+ unsigned n;
- strlcpy(isns->reg_iscsi_name, node_name.InitiatorName,
+ strlcpy((char *)isns->reg_iscsi_name, (char *)node_name.InitiatorName,
sizeof(isns->reg_iscsi_name));
- strlcpy(isns->reg_entity_id, node_name.InitiatorAlias,
+ strlcpy((char *)isns->reg_entity_id, (char *)node_name.InitiatorAlias,
sizeof(isns->reg_entity_id));
/*Get our source IP and port numbers */
@@ -501,7 +501,7 @@
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
- retval = getaddrinfo(isns->address, port, &hints, &ai);
+ retval = getaddrinfo((char *)isns->address, port, &hints, &ai);
if (retval) {
DEBOUT(("getaddrinfo failed with code %d (%s)\n",
retval, gai_strerror(retval)));
@@ -568,7 +568,7 @@
int retval;
ISNS_TRANS t;
uint32_t tag;
- uint32_t data_len;
+ int32_t data_len;
void *data_p;
uint32_t u32;
struct timespec tout = { 5, 0 };
@@ -593,10 +593,10 @@
return ISCSID_STATUS_NO_RESOURCES;
}
- isns_add_string(t, isnst_iSCSIName, node_name.InitiatorName);
+ isns_add_string(t, isnst_iSCSIName, (char *)node_name.InitiatorName);
if (TargetName[0])
- isns_add_string(t, isnst_iSCSIName, TargetName);
+ isns_add_string(t, isnst_iSCSIName, (char *)TargetName);
else
isns_add_tlv(t, isnst_iSCSIName, 0, NULL);
@@ -628,7 +628,7 @@
isns_free_trans(t);
break;
}
- strlcpy(TargetName, (char *) data_p, sizeof(TargetName));
+ strlcpy((char *)TargetName, (char *) data_p, sizeof(TargetName));
/* We must get at least the node type, and it must be a target */
if (isns_get_tlv(t, ISNS_TLV_NEXT, &tag, &data_len, &data_p)) {
@@ -687,8 +687,8 @@
isns_id++;
isns->entry.sid.id = isns_id;
- strlcpy(isns->entry.sid.name, req->name, sizeof(isns->entry.sid.name));
- strlcpy(isns->address, req->address, sizeof(isns->address));
+ strlcpy((char *)isns->entry.sid.name, (char *)req->name, sizeof(isns->entry.sid.name));
+ strlcpy((char *)isns->address, (char *)req->address, sizeof(isns->address));
isns->port = req->port;
isns->sock = -1;
@@ -796,7 +796,7 @@
}
res = (iscsid_get_isns_server_rsp_t *) rsp->parameter;
- strlcpy(res->address, isns->address, sizeof(res->address));
+ strlcpy((char *)res->address, (char *)isns->address, sizeof(res->address));
res->port = isns->port;
res->server_id = isns->entry.sid;
DEB(9, ("OUT get_isns_server: id = %d, address = %s\n",
Index: othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_lists.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_lists.c:1.1.1.1 othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_lists.c:1.2
--- othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_lists.c:1.1.1.1 Mon May 2 07:01:07 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_lists.c Tue Jul 26 05:51:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_lists.c,v 1.1.1.1 2011/05/02 07:01:07 agc Exp $ */
+/* $NetBSD: iscsid_lists.c,v 1.2 2011/07/26 05:51:58 agc Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -110,8 +110,8 @@
return NULL;
TAILQ_FOREACH(curr, head, link)
- if (curr->sid.id == id)
- break;
+ if (curr->sid.id == (int)id)
+ break;
return curr;
}
@@ -134,8 +134,8 @@
return NULL;
TAILQ_FOREACH(curr, head, link)
- if (!strcmp(curr->sid.name, name))
- break;
+ if (strcmp((char *)curr->sid.name, (char *)name) == 0)
+ break;
return curr;
}
@@ -227,8 +227,8 @@
lst = TARGET_LIST;
TAILQ_FOREACH(curr, &list[lst].list, link)
- if (!strcmp(((target_t *) curr)->TargetName, name))
- break;
+ if (strcmp((char *)((target_t *) curr)->TargetName, (char *)name) == 0)
+ break;
DEB(10, ("Find_TagetName returns %x\n", (int) curr));
@@ -256,7 +256,7 @@
((portal_t *) curr)->addr.port,
(int) ((portal_t *) curr)->target));
- if (!strcmp(((portal_t *) curr)->addr.address, addr->address) &&
+ if (strcmp((char *)((portal_t *) curr)->addr.address, (char *)addr->address) == 0 &&
(!addr->port || ((portal_t *) curr)->addr.port == addr->port) &&
((portal_t *) curr)->target == target)
break;
@@ -282,7 +282,7 @@
generic_entry_t *curr;
TAILQ_FOREACH(curr, &list[SEND_TARGETS_LIST].list, link) {
- if (!strcmp(((send_target_t *) curr)->addr.address, addr->address) &&
+ if (strcmp((char *)((send_target_t *) curr)->addr.address, (char *)addr->address) == 0 &&
(!addr->port || ((send_target_t *) curr)->addr.port == addr->port))
break;
}
@@ -317,7 +317,7 @@
if (par->list_kind == SESSION_LIST)
LOCK_SESSIONS;
- else if (par->list_kind < 0 || par->list_kind >= NUM_DAEMON_LISTS) {
+ else if (par->list_kind >= NUM_DAEMON_LISTS) {
rsp->status = ISCSID_STATUS_INVALID_PARAMETER;
return;
}
@@ -377,7 +377,7 @@
if (par->list_kind == SESSION_LIST)
LOCK_SESSIONS;
- else if (par->list_kind < 0 || par->list_kind >= NUM_DAEMON_LISTS) {
+ else if (par->list_kind >= NUM_DAEMON_LISTS) {
rsp->status = ISCSID_STATUS_INVALID_PARAMETER;
return;
}
@@ -409,9 +409,9 @@
case SESSION_LIST:
TAILQ_FOREACH(elem, &list[SESSION_LIST].list, link)
- if (!strcmp(((session_t *) elem)->target.TargetName,
- par->strval))
- break;
+ if (strcmp((char *)((session_t *) elem)->target.TargetName,
+ (char *)par->strval) == 0)
+ break;
break;
default:
@@ -424,7 +424,7 @@
switch (par->list_kind) {
case PORTAL_LIST:
TAILQ_FOREACH(elem, &list[PORTAL_LIST].list, link) {
- if (!strcmp(((portal_t *) elem)->addr.address, par->strval) &&
+ if (strcmp((char *)((portal_t *) elem)->addr.address, (char *)par->strval) == 0 &&
(!par->intval ||
((portal_t *) elem)->addr.port == par->intval))
break;
@@ -433,8 +433,8 @@
case SEND_TARGETS_LIST:
TAILQ_FOREACH(elem, &list[SEND_TARGETS_LIST].list, link) {
- if (!strcmp(((send_target_t *) elem)->addr.address,
- par->strval) &&
+ if (strcmp((char *)((send_target_t *) elem)->addr.address,
+ (char *)par->strval) == 0 &&
(!par->intval ||
((send_target_t *) elem)->addr.port == par->intval))
break;
@@ -443,7 +443,7 @@
case ISNS_LIST:
TAILQ_FOREACH(elem, &list[ISNS_LIST].list, link) {
- if (!strcmp(((isns_t *) elem)->address, par->strval) &&
+ if (strcmp((char *)((isns_t *) elem)->address, (char *)par->strval) == 0 &&
(!par->intval || ((isns_t *) elem)->port == par->intval))
break;
}
@@ -650,13 +650,13 @@
res->connection_id = conn->entry.sid;
res->target_portal_id = conn->portal.sid;
res->target_portal = conn->portal.addr;
- strlcpy(res->TargetName, conn->target.TargetName,
+ strlcpy((char *)res->TargetName, (char *)conn->target.TargetName,
sizeof(res->TargetName));
- strlcpy(res->TargetAlias, conn->target.TargetAlias,
+ strlcpy((char *)res->TargetAlias, (char *)conn->target.TargetAlias,
sizeof(res->TargetAlias));
if (init != NULL) {
res->initiator_id = init->entry.sid;
- strlcpy(res->initiator_address, init->address,
+ strlcpy((char *)res->initiator_address, (char *)init->address,
sizeof(res->initiator_address));
}
UNLOCK_SESSIONS;
@@ -679,8 +679,8 @@
generic_entry_t *curr;
TAILQ_FOREACH(curr, &list[INITIATOR_LIST].list, link)
- if (!strcmp(((initiator_t *) curr)->address, addr))
- break;
+ if (strcmp((char *)((initiator_t *) curr)->address, (char *)addr) == 0)
+ break;
DEB(9, ("Find_initiator_by_addr returns %x\n", (int) curr));
return (initiator_t *) curr;
@@ -730,8 +730,8 @@
initiator_id++;
init->entry.sid.id = initiator_id;
- strlcpy(init->entry.sid.name, par->name, sizeof(init->entry.sid.name));
- strlcpy(init->address, par->address, sizeof(init->address));
+ strlcpy((char *)init->entry.sid.name, (char *)par->name, sizeof(init->entry.sid.name));
+ strlcpy((char *)init->address, (char *)par->address, sizeof(init->address));
rsp = make_rsp(sizeof(iscsid_add_initiator_rsp_t), prsp, prsp_temp);
if (rsp == NULL)
@@ -811,7 +811,7 @@
res = (iscsid_get_initiator_rsp_t *) rsp->parameter;
res->portal_id = init->entry.sid;
- strlcpy(res->address, init->address, sizeof(res->address));
+ strlcpy((char *)res->address, (char *)init->address, sizeof(res->address));
}
Index: othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_driverif.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_driverif.c:1.2 othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_driverif.c:1.3
--- othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_driverif.c:1.2 Fri Jun 10 18:48:51 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_driverif.c Tue Jul 26 05:51:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_driverif.c,v 1.2 2011/06/10 18:48:51 riz Exp $ */
+/* $NetBSD: iscsid_driverif.c,v 1.3 2011/07/26 05:51:58 agc Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
/* Global node name (Initiator Name and Alias) */
-iscsid_set_node_name_req_t node_name = { {0} };
+iscsid_set_node_name_req_t node_name;
/* -------------------------------------------------------------------------- */
@@ -55,18 +55,19 @@
uint32_t
set_node_name(iscsid_set_node_name_req_t * par)
{
- iscsi_set_node_name_parameters_t snp = { 0 };
+ iscsi_set_node_name_parameters_t snp;
int rc;
+ (void) memset(&snp, 0x0, sizeof(snp));
if (!par->InitiatorName[0])
return ISCSID_STATUS_NO_INITIATOR_NAME;
- if (strlen(par->InitiatorName) > ISCSI_STRING_LENGTH
- || strlen(par->InitiatorAlias) > ISCSI_STRING_LENGTH)
+ if (strlen((char *)par->InitiatorName) > ISCSI_STRING_LENGTH
+ || strlen((char *)par->InitiatorAlias) > ISCSI_STRING_LENGTH)
return ISCSID_STATUS_PARAMETER_INVALID;
if (!par->InitiatorAlias[0])
- gethostname(node_name.InitiatorAlias, sizeof(node_name.InitiatorAlias));
+ gethostname((char *)node_name.InitiatorAlias, sizeof(node_name.InitiatorAlias));
node_name = *par;
@@ -75,9 +76,9 @@
return ISCSID_STATUS_SUCCESS;
#endif
- strlcpy(snp.InitiatorName, par->InitiatorName,
+ strlcpy((char *)snp.InitiatorName, (char *)par->InitiatorName,
sizeof(snp.InitiatorName));
- strlcpy(snp.InitiatorAlias, par->InitiatorAlias,
+ strlcpy((char *)snp.InitiatorAlias, (char *)par->InitiatorAlias,
sizeof(snp.InitiatorAlias));
memcpy(snp.ISID, par->ISID, 6);
@@ -103,15 +104,15 @@
STATIC int
bind_socket(int sock, uint8_t * addr)
{
- struct sockaddr_in serverAddress = { 0 };
+ struct sockaddr_in serverAddress;
struct hostent *host;
DEB(8, ("Binding to <%s>\n", addr));
-
- host = gethostbyname(addr);
+ (void) memset(&serverAddress, 0x0, sizeof(serverAddress));
+ host = gethostbyname((char *)addr);
if (host == NULL)
return FALSE;
- if (host->h_length > sizeof(serverAddress.sin_addr))
+ if (host->h_length > (int)sizeof(serverAddress.sin_addr))
return FALSE;
serverAddress.sin_family = host->h_addrtype;
serverAddress.sin_port = 0;
@@ -181,19 +182,21 @@
iscsid_response_t * res, uint32_t * stid)
{
connection_t *conn;
- iscsi_login_parameters_t loginp = { 0 };
+ iscsi_login_parameters_t loginp;
int sock;
int ret;
int yes = 1;
target_t *target;
portal_t *portal = NULL;
iscsi_portal_address_t *addr;
- struct sockaddr_in serverAddress = { 0 };
+ struct sockaddr_in serverAddress;
struct hostent *host;
initiator_t *init;
DEB(9, ("Make Connection sess=%x, req=%x, res=%x, stid=%x\n",
(int) sess, (int) req, (int) res, (int) stid));
+ (void) memset(&loginp, 0x0, sizeof(loginp));
+ (void) memset(&serverAddress, 0x0, sizeof(serverAddress));
/* find the target portal */
if (stid != NULL) {
@@ -279,7 +282,7 @@
/* translate target address */
DEB(8, ("Connecting to <%s>, port %d\n", addr->address, addr->port));
- host = gethostbyname(addr->address);
+ host = gethostbyname((char *)addr->address);
if (host == NULL) {
switch (h_errno) {
case HOST_NOT_FOUND:
@@ -294,7 +297,7 @@
}
return NULL;
}
- if (host->h_length > sizeof(serverAddress.sin_addr)) {
+ if (host->h_length > (int)sizeof(serverAddress.sin_addr)) {
res->status = ISCSID_STATUS_HOST_ERROR;
return NULL;
}
@@ -440,7 +443,7 @@
conn->loginp = loginp;
conn->entry.sid.id = loginp.connection_id;
if (req != NULL) {
- strlcpy(conn->entry.sid.name, req->sym_name,
+ strlcpy((char *)conn->entry.sid.name, (char *)req->sym_name,
sizeof(conn->entry.sid.name));
}
@@ -448,9 +451,9 @@
Copy important target information
*/
conn->target.sid = target->entry.sid;
- strlcpy(conn->target.TargetName, target->TargetName,
+ strlcpy((char *)conn->target.TargetName, (char *)target->TargetName,
sizeof(conn->target.TargetName));
- strlcpy(conn->target.TargetAlias, target->TargetAlias,
+ strlcpy((char *)conn->target.TargetAlias, (char *)target->TargetAlias,
sizeof(conn->target.TargetAlias));
conn->target.options = target->options;
conn->target.auth = target->auth;
@@ -507,10 +510,11 @@
portal_t *portal;
initiator_t *init;
iscsi_portal_address_t *addr;
- struct sockaddr_in serverAddress = { 0 };
+ struct sockaddr_in serverAddress;
struct hostent *host;
DEB(1, ("Event_Recover_Connection sid=%d, cid=%d\n", sid, cid));
+ (void) memset(&serverAddress, 0x0, sizeof(serverAddress));
LOCK_SESSIONS;
@@ -543,11 +547,11 @@
DEB(1, ("Event_Recover_Connection Connecting to <%s>, port %d\n",
addr->address, addr->port));
- if ((host = gethostbyname(addr->address)) == NULL) {
+ if ((host = gethostbyname((char *)addr->address)) == NULL) {
DEB(1, ("GetHostByName failed (error %d)\n", h_errno));
return;
}
- if (host->h_length > sizeof(serverAddress.sin_addr)) {
+ if (host->h_length > (int)sizeof(serverAddress.sin_addr)) {
DEB(1, ("Host address length invalid (%d)\n", host->h_length));
return;
}
@@ -615,7 +619,7 @@
return;
}
TAILQ_INIT(&sess->connections);
- strlcpy(sess->entry.sid.name, req->sym_name,
+ strlcpy((char *)sess->entry.sid.name, (char *)req->sym_name,
sizeof(sess->entry.sid.name));
LOCK_SESSIONS;
@@ -673,10 +677,11 @@
uint32_t
logout(iscsid_sym_id_t * req)
{
- iscsi_logout_parameters_t logoutp = { 0 };
+ iscsi_logout_parameters_t logoutp;
session_t *sess;
int ret;
+ (void) memset(&logoutp, 0x0, sizeof(logoutp));
LOCK_SESSIONS;
sess = find_session(req);
if (sess == NULL) {
@@ -757,13 +762,16 @@
uint32_t
send_targets(uint32_t stid, uint8_t **response_buffer, uint32_t *response_size)
{
- iscsi_send_targets_parameters_t sendt = { 0 };
- iscsi_logout_parameters_t logoutp = { 0 };
+ iscsi_send_targets_parameters_t sendt;
+ iscsi_logout_parameters_t logoutp;
int ret;
connection_t *conn;
- iscsid_response_t res = { 0 };
+ iscsid_response_t res;
uint32_t rc = ISCSID_STATUS_SUCCESS;
+ (void) memset(&sendt, 0x0, sizeof(sendt));
+ (void) memset(&logoutp, 0x0, sizeof(logoutp));
+ (void) memset(&res, 0x0, sizeof(res));
conn = make_connection(NULL, NULL, &res, &stid);
DEB(9, ("Make connection returns, status = %d\n", res.status));
@@ -774,7 +782,7 @@
sendt.response_buffer = NULL;
sendt.response_size = 0;
sendt.response_used = sendt.response_total = 0;
- strlcpy(sendt.key, "All", sizeof(sendt.key));
+ strlcpy((char *)sendt.key, "All", sizeof(sendt.key));
/*Call once to get the size of the buffer necessary */
ret = ioctl(driver, ISCSI_SEND_TARGETS, &sendt);
@@ -839,7 +847,7 @@
ver->interface_version = INTERFACE_VERSION;
ver->major = VERSION_MAJOR;
ver->minor = VERSION_MINOR;
- strlcpy (ver->version_string, VERSION_STRING, sizeof(ver->version_string));
+ strlcpy ((char *)ver->version_string, VERSION_STRING, sizeof(ver->version_string));
#ifdef ISCSI_DEBUG /* DEBUG ONLY: Allow op without driver present */
if (driver < 0)
@@ -849,14 +857,14 @@
ver->driver_interface_version = drv_ver.interface_version;
ver->driver_major = drv_ver.major;
ver->driver_minor = drv_ver.minor;
- strlcpy (ver->driver_version_string, drv_ver.version_string,
+ strlcpy ((char *)ver->driver_version_string, (char *)drv_ver.version_string,
sizeof (ver->driver_version_string));
}
/* -------------------------------------------------------------------------- */
-iscsi_register_event_parameters_t event_reg = { 0 }; /* registered event ID */
+iscsi_register_event_parameters_t event_reg; /* registered event ID */
/*
@@ -904,10 +912,11 @@
void *
event_handler(void *par)
{
- iscsi_wait_event_parameters_t evtp = { 0 };
+ iscsi_wait_event_parameters_t evtp;
int rc;
DEB(99, ("Event handler starts\n"));
+ (void) memset(&evtp, 0x0, sizeof(evtp));
evtp.event_id = event_reg.event_id;
Index: othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_main.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_main.c:1.2 othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_main.c:1.3
--- othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_main.c:1.2 Fri Jun 10 18:49:33 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_main.c Tue Jul 26 05:51:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_main.c,v 1.2 2011/06/10 18:49:33 riz Exp $ */
+/* $NetBSD: iscsid_main.c,v 1.3 2011/07/26 05:51:58 agc Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -79,12 +79,13 @@
STATIC int
create_node_name(void)
{
- iscsi_set_node_name_parameters_t snp = { 0 };
+ iscsi_set_node_name_parameters_t snp;
uint32_t hid = 0;
size_t siz;
int mib[2];
- char *s;
+ unsigned char *s;
+ (void) memset(&snp, 0x0, sizeof(snp));
mib[0] = CTL_KERN;
mib[1] = KERN_HOSTID;
siz = sizeof(hid);
@@ -99,9 +100,9 @@
return ISCSID_STATUS_NO_INITIATOR_NAME;
}
for (s = snp.InitiatorAlias; *s; s++)
- if (!isalnum((int) *s) && *s != '-' && *s != '.' && *s != ':')
+ if (!isalnum((unsigned char) *s) && *s != '-' && *s != '.' && *s != ':')
*s = '-';
- snprintf(snp.InitiatorName, sizeof(snp.InitiatorName),
+ snprintf((char *)snp.InitiatorName, sizeof(snp.InitiatorName),
"iqn.1994-04.org.netbsd:iscsi.%s:%u", snp.InitiatorAlias, hid);
ioctl(driver, ISCSI_SET_NODE_NAME, &snp);
Index: othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.2 othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.3
--- othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.2 Tue Jun 21 22:48:56 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c Tue Jul 26 05:51:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_targets.c,v 1.2 2011/06/21 22:48:56 riz Exp $ */
+/* $NetBSD: iscsid_targets.c,v 1.3 2011/07/26 05:51:58 agc Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -189,7 +189,7 @@
}
target->entry.sid.id = portarget_id;
- strlcpy(target->TargetName, name, sizeof(target->TargetName));
+ strlcpy((char *)target->TargetName, (char *)name, sizeof(target->TargetName));
return target;
}
@@ -255,7 +255,7 @@
send_target_id++;
target->entry.sid.id = send_target_id;
- strlcpy(target->TargetName, name, sizeof(target->TargetName));
+ strlcpy((char *)target->TargetName, (char *)name, sizeof(target->TargetName));
target->addr = *addr;
target->num_groups = 1;
target->num_portals = 1;
@@ -340,7 +340,7 @@
rsp->status = ISCSID_STATUS_DUPLICATE_NAME;
return;
}
- strlcpy(target->entry.sid.name, par->sym_name, sizeof(target->entry.sid.name));
+ strlcpy((char *)target->entry.sid.name, (char *)par->sym_name, sizeof(target->entry.sid.name));
}
} else {
if (par->sym_name[0] &&
@@ -360,7 +360,7 @@
return;
}
num = 0;
- strlcpy(target->entry.sid.name, par->sym_name,
+ strlcpy((char *)target->entry.sid.name, (char *)par->sym_name,
sizeof(target->entry.sid.name));
}
@@ -389,7 +389,7 @@
res->portal_id[0] = target->entry.sid.id;
res->num_portals = 1;
} else {
- for (i = 0; i < par->num_portals; i++) {
+ for (i = 0; i < (int)par->num_portals; i++) {
portal = create_portal(target, &par->portal[i],
PORTAL_TYPE_STATIC,
target->entry.sid.id);
@@ -546,9 +546,9 @@
res = (iscsid_get_target_rsp_t *) rsp->parameter;
res->target_id = target->entry.sid;
- strlcpy(res->TargetName, target->TargetName,
+ strlcpy((char *)res->TargetName, (char *)target->TargetName,
sizeof(res->TargetName));
- strlcpy(res->TargetAlias, target->TargetAlias,
+ strlcpy((char *)res->TargetAlias, (char *)target->TargetAlias,
sizeof(res->TargetAlias));
res->num_portals = num;
@@ -610,7 +610,7 @@
}
if (par->sym_name[0]) {
- strlcpy(portal->entry.sid.name, par->sym_name,
+ strlcpy((char *)portal->entry.sid.name, (char *)par->sym_name,
sizeof(portal->entry.sid.name));
}
portal->options = par->options;
@@ -764,7 +764,8 @@
portal->port = (uint16_t) val;
}
/* is there a group tag? */
- for (; isdigit(*sp); sp++);
+ for (; isdigit((unsigned char)*sp); sp++) {
+ }
if (*sp && *sp != ',')
return 0;
} else
@@ -784,7 +785,7 @@
if (strlen(str) >= sizeof(portal->address))
return 0;
- strlcpy(portal->address, str, sizeof(portal->address));
+ strlcpy((char *)portal->address, str, sizeof(portal->address));
return 1;
}
@@ -846,7 +847,7 @@
tp = response_buffer;
while (*tp) {
- if (strncmp(tp, "TargetName=", 11) != 0) {
+ if (strncmp((char *)tp, "TargetName=", 11) != 0) {
DEBOUT(("Response not TargetName <%s>\n", tp));
break;
}
@@ -857,13 +858,13 @@
rc = -1; /* Mark no address found yet */
/*Now process any "TargetAddress" entries following */
- while (*tp && strncmp(tp, "TargetAddress=", 14) == 0) {
+ while (*tp && strncmp((char *)tp, "TargetAddress=", 14) == 0) {
tp += 14;
sp = tp; /* save start of address */
while (*tp++) {
}
/*Get the target address */
- rc = cl_get_address(&addr, sp);
+ rc = cl_get_address(&addr, (char *)sp);
if (rc) {
add_discovered_target(TargetName,
&addr, PORTAL_TYPE_SENDTARGET,
