X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_llist.c;h=4c5645b1cba12461c7811cc12c9b6e52a6e2c1da;hb=af6222065f1f5d8969afdde89c9f26a73e1e1690;hp=7fae025d62233ca51613268369239c43f516f973;hpb=b49f3f8aca3b42e64427259dfc6c75242d37b91c;p=collectd.git

diff --git a/src/utils_llist.c b/src/utils_llist.c
index 7fae025d..4c5645b1 100644
--- a/src/utils_llist.c
+++ b/src/utils_llist.c
@@ -12,10 +12,9 @@
  * ranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public Licence for more details.
  *
- * You should have received a copy of the GNU General Public
- * Licence along with this program; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
- * USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * Authors:
  *   Florian Forster <octo at verplant.org>
@@ -59,6 +58,9 @@ void llist_destroy (llist_t *l)
 	llentry_t *e_this;
 	llentry_t *e_next;
 
+	if (l == NULL)
+		return;
+
 	for (e_this = l->head; e_this != NULL; e_this = e_next)
 	{
 		e_next = e_this->next;
@@ -117,6 +119,9 @@ void llist_remove (llist_t *l, llentry_t *e)
 {
 	llentry_t *prev;
 
+	if ((l == NULL) || (e == NULL))
+		return;
+
 	prev = l->head;
 	while ((prev != NULL) && (prev->next != e))
 		prev = prev->next;
@@ -136,23 +141,49 @@ int llist_size (llist_t *l)
 	return (l ? l->size : 0);
 }
 
+static int llist_strcmp (llentry_t *e, void *ud)
+{
+	if ((e == NULL) || (ud == NULL))
+		return (-1);
+	return (strcmp (e->key, (const char *)ud));
+}
+
 llentry_t *llist_search (llist_t *l, const char *key)
 {
+	return (llist_search_custom (l, llist_strcmp, (void *)key));
+}
+
+llentry_t *llist_search_custom (llist_t *l,
+		int (*compare) (llentry_t *, void *), void *user_data)
+{
 	llentry_t *e;
 
-	for (e = l->head; e != NULL; e = e->next)
-		if (strcmp (key, e->key) == 0)
+	if (l == NULL)
+		return (NULL);
+
+	e = l->head;
+	while (e != NULL) {
+		llentry_t *next = e->next;
+
+		if (compare (e, user_data) == 0)
 			break;
 
+		e = next;
+	}
+
 	return (e);
 }
 
 llentry_t *llist_head (llist_t *l)
 {
+	if (l == NULL)
+		return (NULL);
 	return (l->head);
 }
 
 llentry_t *llist_tail (llist_t *l)
 {
+	if (l == NULL)
+		return (NULL);
 	return (l->tail);
 }