Module Name: othersrc
Committed By: riz
Date: Tue Jun 21 22:48:57 UTC 2011
Modified Files:
othersrc/external/bsd/iscsi/sbin/iscsid: iscsid_targets.c
Log Message:
Take the sizeof the *correct* structure. Now iscsid returns sensible
data to iscsictl that the display code can display (more) sensibly.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
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_targets.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.1.1.1 othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.2
--- othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.1.1.1 Mon May 2 07:01:08 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c Tue Jun 21 22:48:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_targets.c,v 1.1.1.1 2011/05/02 07:01:08 agc Exp $ */
+/* $NetBSD: iscsid_targets.c,v 1.2 2011/06/21 22:48:56 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -364,7 +364,7 @@
sizeof(target->entry.sid.name));
}
- rsp = make_rsp(sizeof(*rsp) + (par->num_portals * sizeof(uint32_t)),
+ rsp = make_rsp(sizeof(*res) + (par->num_portals * sizeof(uint32_t)),
prsp, prsp_temp);
if (rsp == NULL)
return;
@@ -539,7 +539,7 @@
} else if (par->list_kind != SEND_TARGETS_LIST) {
num = target->num_portals;
}
- rsp = make_rsp(sizeof(*rsp) + (num - 1) * sizeof(uint32_t),
+ rsp = make_rsp(sizeof(*res) + (num - 1) * sizeof(uint32_t),
prsp, prsp_temp);
if (rsp == NULL)
return;
@@ -615,7 +615,7 @@
}
portal->options = par->options;
- rsp = make_rsp(sizeof(*rsp), prsp, prsp_temp);
+ rsp = make_rsp(sizeof(*res), prsp, prsp_temp);
if (rsp == NULL)
return;
@@ -661,7 +661,7 @@
return;
}
- rsp = make_rsp(sizeof(*rsp), prsp, prsp_temp);
+ rsp = make_rsp(sizeof(*res), prsp, prsp_temp);
if (rsp == NULL)
return;
