nnchat: util.c comparison

Simplify the userhash matching code a bit.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 26 May 2012 05:10:11 +0300
parents	3396acd40147
children	d55cc0b73c62

comparison

equal deleted inserted replaced

-:733396469e5d
+:aeb3171f9e28
 }
 static nn_user_t *nn_userhash_match_do(nn_user_t *list, const char *pattern, size_t len)
 {
-nn_user_t *curr = list;
+nn_user_t *node;
+for (node = list; node != NULL; node = node->next)
-while (curr != NULL)
+{
-{
+if (len <= strlen(node->name) && th_strncasecmp(node->name, pattern, len) == 0)
-if (len <= strlen(curr->name) && th_strncasecmp(curr->name, pattern, len) == 0)
+return node;
-return curr;
-curr = curr->next;
 }
 return NULL;
 }
 if (list == NULL || pattern == NULL) return NULL;
 hash = nn_hash_user(pattern);
 if (list->buckets[hash] != NULL)
 {
-nn_user_t *curr = list->buckets[hash];
+nn_user_t *node;
 size_t len = strlen(pattern);
 if (current != NULL)
 {
-nn_user_t *found = NULL;
+for (node = list->buckets[hash]; node != NULL; node = node->next)
-while (curr != NULL)
+{
-{
+if (th_strcasecmp(node->name, current) == 0)
-if (th_strcasecmp(curr->name, current) == 0)
 {
+nn_user_t *found;
 if (again)
-return curr;
+return node;
-found = curr->next;
-break;
+if ((found = nn_userhash_match_do(node->next, pattern, len)) != NULL)
+return found;
 }
-curr = curr->next;
+}
-}
-if (found != NULL && (found = nn_userhash_match_do(found, pattern, len)) != NULL)
-return found;
 }
-if ((curr = nn_userhash_match_do(list->buckets[hash], pattern, len)) != NULL)
+if ((node = nn_userhash_match_do(list->buckets[hash], pattern, len)) != NULL)
-return curr;
+return node;
 }
 return NULL;
 }

Mercurial > hg > nnchat