 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -222,28 +222,28 @@ find_TargetName(iscsid_list_kind_t lst,
+{
 	generic_entry_t *curr;
 	target_t *t = NULL;
 	if (lst == PORTAL_LIST)
 		lst = TARGET_LIST;
 	TAILQ_FOREACH(curr, &list[lst].list, link) {
 		t = (void *)curr;
 		if (strcmp((char *)t->TargetName, (char *)name) == 0)
 			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;
+}
 /*
  * find_portal_by_addr:
  *    Find a Portal by Address.
+ *
  *    Parameter:  the associated target, and the address
+ *
  *    Returns:    The pointer to the portal (or NULL if not found)
  */
 @@ -256,55 +256,57 @@ find_portal_by_addr(target_t * target, i
 	TAILQ_FOREACH(curr, &list[PORTAL_LIST].list, link) {
 		p = (void *)curr;
 		DEB(10, ("Find_portal_by_addr - addr %s port %d target %p\n",
 				 p->addr.address,
 				 p->addr.port,
 				 p->target));
 		if (strcmp((char *)p->addr.address, (char *)addr->address) == 0 &&
 			(!addr->port || p->addr.port == addr->port) &&
 			p->target == target)
 			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;
+}
 /*
  * find_send_target_by_addr:
  *    Find a Send Target by Address.
+ *
  *    Parameter:  the address
+ *
  *    Returns:    The pointer to the portal (or NULL if not found)
  */
 send_target_t *
 find_send_target_by_addr(iscsi_portal_address_t * addr)
+{
 	generic_entry_t *curr;
 	send_target_t *t = NULL;
 	TAILQ_FOREACH(curr, &list[SEND_TARGETS_LIST].list, link) {
 		t = (void *)curr;
 		if (strcmp((char *)t->addr.address, (char *)addr->address) == 0 &&
 			(!addr->port || t->addr.port == addr->port))
 			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;
+}
 /*
  * get_list:
  *    Handle GET_LIST request: Return the list of IDs contained in the list.
+ *
  *    Parameter:
  *          par         The request parameters.
  *          prsp        Pointer to address of response buffer.
  *          prsp_temp   Will be set to TRUE if buffer was allocated, FALSE
  *                      for static buffer.
  */
 @@ -684,28 +686,29 @@ get_connection_info(iscsid_get_connectio
 static initiator_t *
 find_initiator_by_addr(uint8_t * addr)
+{
 	generic_entry_t *curr;
 	initiator_t *i = NULL;
 	TAILQ_FOREACH(curr, &list[INITIATOR_LIST].list, link) {
 		i = (void *)curr;
 		if (strcmp((char *)i->address, (char *)addr) == 0)
 			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;
+}
 /*
  * add_initiator_portal:
  *    Add an initiator portal.
+ *
  *    Parameter:
  *          par         The request parameters.
  *          prsp        Pointer to address of response buffer.
  *          prsp_temp   Will be set to TRUE if buffer was allocated, FALSE
  *                      for static buffer.
  */