shithub: ircd

Info  •  Files  •  Log  •  Branches

implements ll in users

--- a/users.c

+++ b/users.c

@@ -2,8 +2,9 @@

 #include <libc.h>

 #include "dat.h"

 #include "fns.h"

+#include "ll.h"

-static Userlist users;

+static Linked *users;

 User*

 adduser(char *name)

@@ -11,39 +12,34 @@

 	User *n;

 	n = mallocz(sizeof(User), 1);

 	n->name = strdup(name);

-	

-	if (!users.first) {

-		users.first = n;

-		return n;

-	}

-	n->next = users.first;

-	users.first->prev = n;

-	users.first = n;

+	ladd(&users, n);

 	return n;

 }

-void

-deluser(User *user)

+static void

+freeuser(void *u)

 {

-	if (!user->prev) {

-		users.first = user->next;

-		if (user->next)

-			user->next->prev = nil;

-	} else {

-		user->prev->next = user->next;

-		if (user->next)

-			user->next->prev = user->prev;

-	}

+	User *user = u;

 	free(user->name);

 	free(user);

 }

+void

+deluser(User *user)

+{

+	ldel(&users, user, freeuser);

+}

+

+static int

+finduserfunc(void *ptr, void *c)

+{

+	User *user = ptr;

+	char *name = c;

+	return strcmp(user->name, name) == 0;

+}

+

 User*

 finduser(char *name)

 {

-	for (User *u = users.first; u; u = u->next) {

-		if (strcmp(name, u->name) == 0)

-			return u;

-	}

-	return nil;

+	return lfind(&users, finduserfunc, name);

 }

-- 

⑨