Module Name: src
Committed By: riz
Date: Mon May 28 00:37:55 UTC 2012
Modified Files:
src/sbin/iscsid: iscsid_lists.c
Log Message:
Fix 4 more instances of the same bug (not returning NULL when stuff
not found). While I'm here, add comments so it hopefully doesn't happen
again.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sbin/iscsid/iscsid_lists.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/iscsid/iscsid_lists.c
diff -u src/sbin/iscsid/iscsid_lists.c:1.6 src/sbin/iscsid/iscsid_lists.c:1.7
--- src/sbin/iscsid/iscsid_lists.c:1.6 Sun May 27 23:54:45 2012
+++ src/sbin/iscsid/iscsid_lists.c Mon May 28 00:37:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_lists.c,v 1.6 2012/05/27 23:54:45 riz Exp $ */
+/* $NetBSD: iscsid_lists.c,v 1.7 2012/05/28 00:37:55 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -232,8 +232,8 @@ find_TargetName(iscsid_list_kind_t lst,
break;
}
+ /* return curr instead of t because curr==NULL if name not found */
DEB(10, ("Find_TargetName returns %p\n", curr));
-
return (target_t *)curr;
}
@@ -266,8 +266,9 @@ find_portal_by_addr(target_t * target, i
break;
}
+ /* return curr instead of p because curr==NULL if not found */
DEB(10, ("Find_portal_by_addr returns %p\n", curr));
- return p;
+ return (portal_t *)curr;
}
@@ -293,8 +294,9 @@ find_send_target_by_addr(iscsi_portal_ad
break;
}
+ /* return curr instead of p because curr==NULL if not found */
DEB(10, ("Find_send_target_by_addr returns %p\n", curr));
- return t;
+ return (send_target_t *)curr;
}
@@ -694,8 +696,9 @@ find_initiator_by_addr(uint8_t * addr)
break;
}
+ /* return curr instead of i because if not found, curr==NULL */
DEB(9, ("Find_initiator_by_addr returns %p\n", curr));
- return i;
+ return (initiator_t *)curr;
}
