Mercurial > dovecot > core-2.2

diff src/director/doveadm-connection.c @ 21075:6a363cb51d7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
director: Code cleanup - added user director_iterate_users_*() wrappers. This will shrink the diff for the following changes.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Thu, 20 Oct 2016 19:38:28 +0300
parents 6543f5b25252
children ef9d8f4c6c67
line wrap: on
line diff
--- a/src/director/doveadm-connection.c	Thu Oct 20 19:17:11 2016 +0300
+++ b/src/director/doveadm-connection.c	Thu Oct 20 19:38:28 2016 +0300
@@ -31,7 +31,7 @@
 
 	struct director *dir;
 	struct doveadm_connection *_conn;
-	struct user_directory_iter *iter;
+	struct director_user_iter *iter;
 	unsigned int host_idx, hosts_count;
 	unsigned int max_moving_users;
 };
@@ -428,7 +428,7 @@
 	DLLIST_REMOVE(&reset_cmds, cmd);
 
 	if (cmd->iter != NULL)
-		user_directory_iter_deinit(&cmd->iter);
+		director_iterate_users_deinit(&cmd->iter);
 	if (cmd->_conn != NULL)
 		cmd->_conn->reset_cmd = NULL;
 	i_free(cmd);
@@ -449,8 +449,8 @@
 		director_connection_cork(dir->right);
 
 	if (cmd->iter == NULL)
-		cmd->iter = user_directory_iter_init(dir->users);
-	while ((user = user_directory_iter_next(cmd->iter)) != NULL) {
+		cmd->iter = director_iterate_users_init(dir);
+	while ((user = director_iterate_users_next(cmd->iter)) != NULL) {
 		if (user->host != host)
 			continue;
 		new_host = mail_host_get_by_hash(dir->mail_hosts,
@@ -464,7 +464,7 @@
 			break;
 	}
 	if (user == NULL)
-		user_directory_iter_deinit(&cmd->iter);
+		director_iterate_users_deinit(&cmd->iter);
 	if (dir->right != NULL)
 		director_connection_uncork(dir->right);
 	return user == NULL;
@@ -599,7 +599,7 @@
 static int
 doveadm_cmd_user_list(struct doveadm_connection *conn, const char *const *args)
 {
-	struct user_directory_iter *iter;
+	struct director_user_iter *iter;
 	struct user *user;
 	struct ip_addr ip;
 
@@ -612,8 +612,8 @@
 		ip.family = 0;
 	}
 
-	iter = user_directory_iter_init(conn->dir->users);
-	while ((user = user_directory_iter_next(iter)) != NULL) {
+	iter = director_iterate_users_init(conn->dir);
+	while ((user = director_iterate_users_next(iter)) != NULL) {
 		if (ip.family == 0 ||
 		    net_ip_compare(&ip, &user->host->ip)) T_BEGIN {
 			unsigned int expire_time = user->timestamp +
@@ -625,7 +625,7 @@
 				net_ip2addr(&user->host->ip)));
 		} T_END;
 	}
-	user_directory_iter_deinit(&iter);
+	director_iterate_users_deinit(&iter);
 	o_stream_nsend(conn->output, "\n", 1);
 	return 1;
 }