The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxcfs/pull/354
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From 915c14d04d3a9e506ee564e0450209db393fa533 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Thu, 5 Mar 2020 17:37:11 +0100
Subject: [PATCH 1/2] utils: remove unused variable
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
src/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/utils.c b/src/utils.c
index 3ff5717..ccbb50b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -178,7 +178,7 @@ bool wait_for_sock(int sock, int timeout)
{
__do_close_prot_errno int epfd = -EBADF;
struct epoll_event ev;
- int ret, now, starttime, deltatime, saved_errno;
+ int ret, now, starttime, deltatime;
if ((starttime = time(NULL)) < 0)
return false;
From 19fdc62f216c50bb0096f3be40fd3be6751dda9a Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Thu, 5 Mar 2020 17:37:36 +0100
Subject: [PATCH 2/2] autotools: don't include lxcfs.1
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
doc/Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9248937..022ea22 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,4 @@
-EXTRA_DIST = lxcfs.man.add \
- lxcfs.1
+EXTRA_DIST = lxcfs.man.add
if HAVE_HELP2MAN
man_MANS = lxcfs.1
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
