From 9227a12a1de4d8d9adb1f27ae682142c038fa0b9 Mon Sep 17 00:00:00 2001 From: Michel Normand Date: Wed, 7 Oct 2009 16:06:08 +0200 Subject: [PATCH] local struct name changed in mainloop.c Two files have each their own structure definition with the same name. The types name don't conflict but in the name of sanity, let's rename these structures. not critical isn't it :) Signed-off-by: Michel Normand Signed-off-by: Daniel Lezcano --- src/lxc/mainloop.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c index d951801aa..c96be7d84 100644 --- a/src/lxc/mainloop.c +++ b/src/lxc/mainloop.c @@ -29,7 +29,7 @@ #include "mainloop.h" -struct lxc_handler { +struct mainloop_handler { lxc_mainloop_callback_t callback; int fd; void *data; @@ -38,7 +38,7 @@ struct lxc_handler { int lxc_mainloop(struct lxc_epoll_descr *descr) { int i, nfds, triggered; - struct lxc_handler *handler; + struct mainloop_handler *handler; for (;;) { @@ -58,7 +58,8 @@ int lxc_mainloop(struct lxc_epoll_descr *descr) continue; triggered++; - handler = (struct lxc_handler *)descr->ev[i].data.ptr; + handler = + (struct mainloop_handler *) descr->ev[i].data.ptr; /* If the handler returns a positive value, exit the mainloop */ @@ -79,7 +80,7 @@ int lxc_mainloop_add_handler(struct lxc_epoll_descr *descr, int fd, lxc_mainloop_callback_t callback, void *data) { struct epoll_event *ev; - struct lxc_handler *handler; + struct mainloop_handler *handler; int ret = -1; handler = malloc(sizeof(*handler)); @@ -118,7 +119,7 @@ out_free: int lxc_mainloop_del_handler(struct lxc_epoll_descr *descr, int fd) { struct epoll_event *ev; - struct lxc_handler *handler; + struct mainloop_handler *handler; int i, j, idx = 0; for (i = 0; i < descr->nfds; i++) { -- 2.39.2