diff --git a/src/xpdev/str_list.c b/src/xpdev/str_list.c
index 1edabb5241ad0439300a2443fc6c9fb1794413c2..d199e915bbd90e2f4f55e2acb041f9fdb36ef31f 100644
--- a/src/xpdev/str_list.c
+++ b/src/xpdev/str_list.c
@@ -55,11 +55,7 @@ size_t strListCount(const str_list_t list)
 {
 	size_t i;
 
-	if(list==NULL)
-		return(0);
-
-	for(i=0; list[i]!=NULL; i++)
-		;
+	COUNT_LIST_ITEMS(list,i);
 
 	return(i);
 }