From: Qiang Huang <h.huangqiang@huawei.com>
Date: Fri, 8 Nov 2013 02:54:18 +0000 (+0800)
Subject: lxc_user_nic: remove duplicate code
X-Git-Tag: lxc-1.0.0.alpha3~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94d942c3d22a3b8b0d97d990fc41219369addd45;p=thirdparty%2Flxc.git

lxc_user_nic: remove duplicate code

It's a duplicate of util.h.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c
index dc35e55d2..e4f59faeb 100644
--- a/src/lxc/lxc_user_nic.c
+++ b/src/lxc/lxc_user_nic.c
@@ -49,25 +49,6 @@
 #include "config.h"
 #include "utils.h"
 
-#ifndef HAVE_GETLINE
-#ifdef HAVE_FGETLN
-#include <../include/getline.h>
-#endif
-#endif
-
-/* Define setns() if missing from the C library */
-#ifndef HAVE_SETNS
-static inline int setns(int fd, int nstype)
-{
-#ifdef __NR_setns
-	return syscall(__NR_setns, fd, nstype);
-#else
-	errno = ENOSYS;
-	return -1;
-#endif
-}
-#endif
-
 #if ISTEST
 #define CONF_FILE "/tmp/lxc-usernet"
 #define DB_FILE "/tmp/nics"
@@ -76,7 +57,6 @@ static inline int setns(int fd, int nstype)
 #define DB_FILE LXC_USERNIC_DB
 #endif
 
-
 #include "nl.h"
 
 #ifndef IFLA_LINKMODE