From 4e8e4213a815a30216e855a805a8bcd5b8c5a886 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 17 Sep 2010 10:33:10 -0700 Subject: Switch many macros from using CONTAINER_OF to using OBJECT_CONTAINING. These macros require one fewer argument by switching, which makes code that uses them shorter and more readable. --- lib/unixctl.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/unixctl.c') diff --git a/lib/unixctl.c b/lib/unixctl.c index ac756a834..706b3e309 100644 --- a/lib/unixctl.c +++ b/lib/unixctl.c @@ -411,8 +411,7 @@ unixctl_server_run(struct unixctl_server *server) new_connection(server, fd); } - LIST_FOR_EACH_SAFE (conn, next, - struct unixctl_conn, node, &server->conns) { + LIST_FOR_EACH_SAFE (conn, next, node, &server->conns) { int error = run_connection(conn); if (error && error != EAGAIN) { kill_connection(conn); @@ -426,7 +425,7 @@ unixctl_server_wait(struct unixctl_server *server) struct unixctl_conn *conn; poll_fd_wait(server->fd, POLLIN); - LIST_FOR_EACH (conn, struct unixctl_conn, node, &server->conns) { + LIST_FOR_EACH (conn, node, &server->conns) { if (conn->state == S_RECV) { poll_fd_wait(conn->fd, POLLIN); } else if (conn->state == S_SEND) { @@ -442,8 +441,7 @@ unixctl_server_destroy(struct unixctl_server *server) if (server) { struct unixctl_conn *conn, *next; - LIST_FOR_EACH_SAFE (conn, next, - struct unixctl_conn, node, &server->conns) { + LIST_FOR_EACH_SAFE (conn, next, node, &server->conns) { kill_connection(conn); } -- cgit v1.2.1