mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-01 11:08:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3931 from brauner/2021-08-11.fixes

Browse Source 
memory_utils: make cleanup handler as unused
This commit is contained in:
Stéphane Graber
2021-08-11 10:58:21 -04:00
committed by GitHub
parent d5b6db61e2 96348aa8ab
commit 34a16b88c6
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lxc/mainloop.c
View File

@@ -315,11 +315,10 @@ static int __lxc_mainloop_io_uring(struct lxc_async_descr *descr, int timeout_ms
static int __lxc_mainloop_epoll(struct lxc_async_descr *descr, int timeout_ms) static int __lxc_mainloop_epoll(struct lxc_async_descr *descr, int timeout_ms)
{ {
int i, nfds, ret;
struct mainloop_handler *handler;
struct epoll_event events[MAX_EVENTS];
for (;;) { for (;;) {
int nfds;
struct epoll_event events[MAX_EVENTS];
nfds = epoll_wait(descr->epfd, events, MAX_EVENTS, timeout_ms); nfds = epoll_wait(descr->epfd, events, MAX_EVENTS, timeout_ms);
if (nfds < 0) { if (nfds < 0) {
if (errno == EINTR) if (errno == EINTR)
@@ -328,8 +327,9 @@ static int __lxc_mainloop_epoll(struct lxc_async_descr *descr, int timeout_ms)
return -errno; return -errno;
} }
for (i = 0; i < nfds; i++) { for (int i = 0; i < nfds; i++) {
handler = events[i].data.ptr; int ret;
struct mainloop_handler *handler = events[i].data.ptr;
/* If the handler returns a positive value, exit the /* If the handler returns a positive value, exit the
* mainloop. * mainloop.

3
src/lxc/memory_utils.h
View File

@@ -20,7 +20,8 @@
cleaner(*ptr); \ cleaner(*ptr); \
} }
#define call_cleaner(cleaner) __attribute__((__cleanup__(cleaner##_function))) #define call_cleaner(cleaner) \
__attribute__((__cleanup__(cleaner##_function))) __attribute__((unused))
#define close_prot_errno_disarm(fd) \ #define close_prot_errno_disarm(fd) \
if (fd >= 0) { \ if (fd >= 0) { \