[lxc-devel] [PATCH 1/4] Consistently use <lxc/lxccontainer.h> for the API

Serge Hallyn serge.hallyn at ubuntu.com
Mon Sep 23 20:25:32 UTC 2013


Quoting Stéphane Graber (stgraber at ubuntu.com):
> The API header was included in a variety of ways before, standardize
> those to "include <lxc/lxccontainer.h>" as this will always work both in
> tree and on a system with the headers installed.
> 
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  src/lxc/bdev.h             | 2 +-
>  src/lxc/console.c          | 2 +-
>  src/lxc/lxc_clone.c        | 2 +-
>  src/lxc/lxc_config.c       | 2 +-
>  src/lxc/lxc_console.c      | 2 +-
>  src/lxc/lxc_create.c       | 2 +-
>  src/lxc/lxc_destroy.c      | 2 +-
>  src/lxc/lxc_snapshot.c     | 2 +-
>  src/lxc/lxc_start.c        | 2 +-
>  src/lxc/lxccontainer.c     | 2 +-
>  src/tests/cgpath.c         | 2 +-
>  src/tests/clonetest.c      | 2 +-
>  src/tests/concurrent.c     | 2 +-
>  src/tests/console.c        | 2 +-
>  src/tests/containertests.c | 2 +-
>  src/tests/createtest.c     | 2 +-
>  src/tests/destroytest.c    | 2 +-
>  src/tests/get_item.c       | 2 +-
>  src/tests/getkeys.c        | 2 +-
>  src/tests/lxcpath.c        | 2 +-
>  src/tests/saveconfig.c     | 2 +-
>  src/tests/shutdowntest.c   | 2 +-
>  src/tests/snapshot.c       | 2 +-
>  src/tests/startone.c       | 2 +-
>  24 files changed, 24 insertions(+), 24 deletions(-)
> 
> diff --git a/src/lxc/bdev.h b/src/lxc/bdev.h
> index f9d9a0c..a603d9e 100644
> --- a/src/lxc/bdev.h
> +++ b/src/lxc/bdev.h
> @@ -29,7 +29,7 @@
>   */
>  
>  #include "config.h"
> -#include "lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  struct bdev;
>  
> diff --git a/src/lxc/console.c b/src/lxc/console.c
> index 78be403..d854dbb 100644
> --- a/src/lxc/console.c
> +++ b/src/lxc/console.c
> @@ -31,7 +31,7 @@
>  #include <sys/types.h>
>  #include <termios.h>
>  
> -#include "lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  #include "log.h"
>  #include "conf.h"
>  #include "config.h"
> diff --git a/src/lxc/lxc_clone.c b/src/lxc/lxc_clone.c
> index 8b5c6e9..e0be9da 100644
> --- a/src/lxc/lxc_clone.c
> +++ b/src/lxc/lxc_clone.c
> @@ -32,7 +32,7 @@
>  #include "lxc.h"
>  #include "conf.h"
>  #include "state.h"
> -#include "lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  lxc_log_define(lxc_clone, lxc);
>  
> diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c
> index b3f2ed8..c90be7d 100644
> --- a/src/lxc/lxc_config.c
> +++ b/src/lxc/lxc_config.c
> @@ -20,7 +20,7 @@
>  
>  #include <stdio.h>
>  #include "config.h"
> -#include "lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  struct lxc_config_items {
>  	char *name;
> diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c
> index 28ad772..ea1e999 100644
> --- a/src/lxc/lxc_console.c
> +++ b/src/lxc/lxc_console.c
> @@ -38,7 +38,7 @@
>  #include <sys/poll.h>
>  #include <sys/ioctl.h>
>  
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  #include "error.h"
>  #include "lxc.h"
>  #include "log.h"
> diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
> index 4f205e8..f577e30 100644
> --- a/src/lxc/lxc_create.c
> +++ b/src/lxc/lxc_create.c
> @@ -17,7 +17,7 @@
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
>  
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <stdio.h>
>  #include <libgen.h>
> diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c
> index 0724eb8..a1f73ca 100644
> --- a/src/lxc/lxc_destroy.c
> +++ b/src/lxc/lxc_destroy.c
> @@ -17,7 +17,7 @@
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
>  
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <stdio.h>
>  #include <libgen.h>
> diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c
> index 0177f5d..c21563f 100644
> --- a/src/lxc/lxc_snapshot.c
> +++ b/src/lxc/lxc_snapshot.c
> @@ -17,7 +17,7 @@
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
>  
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <stdio.h>
>  #include <libgen.h>
> diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
> index a30a9f6..a894513 100644
> --- a/src/lxc/lxc_start.c
> +++ b/src/lxc/lxc_start.c
> @@ -43,7 +43,7 @@
>  #include "log.h"
>  #include "caps.h"
>  #include "lxc.h"
> -#include "lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  #include "conf.h"
>  #include "cgroup.h"
>  #include "utils.h"
> diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
> index 727c680..44f68cc 100644
> --- a/src/lxc/lxccontainer.c
> +++ b/src/lxc/lxccontainer.c
> @@ -31,7 +31,7 @@
>  #include "config.h"
>  #include "lxc.h"
>  #include "state.h"
> -#include "lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  #include "conf.h"
>  #include "confile.h"
>  #include "console.h"
> diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c
> index f9aaced..26a79c3 100644
> --- a/src/tests/cgpath.c
> +++ b/src/tests/cgpath.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <limits.h>
>  #include <unistd.h>
> diff --git a/src/tests/clonetest.c b/src/tests/clonetest.c
> index da3ce75..b04ab3c 100644
> --- a/src/tests/clonetest.c
> +++ b/src/tests/clonetest.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> diff --git a/src/tests/concurrent.c b/src/tests/concurrent.c
> index c8a1368..6673f3a 100644
> --- a/src/tests/concurrent.c
> +++ b/src/tests/concurrent.c
> @@ -23,7 +23,7 @@
>  #define _GNU_SOURCE
>  #include <getopt.h>
>  
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  static int nthreads = 5;
>  static int iterations = 1;
> diff --git a/src/tests/console.c b/src/tests/console.c
> index cd63981..33d6ad2 100644
> --- a/src/tests/console.c
> +++ b/src/tests/console.c
> @@ -19,7 +19,7 @@
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
>  
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <errno.h>
>  #include <unistd.h>
> diff --git a/src/tests/containertests.c b/src/tests/containertests.c
> index 8d1658f..e463e35 100644
> --- a/src/tests/containertests.c
> +++ b/src/tests/containertests.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> diff --git a/src/tests/createtest.c b/src/tests/createtest.c
> index 879d0a1..c018458 100644
> --- a/src/tests/createtest.c
> +++ b/src/tests/createtest.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> diff --git a/src/tests/destroytest.c b/src/tests/destroytest.c
> index 428d09e..6403472 100644
> --- a/src/tests/destroytest.c
> +++ b/src/tests/destroytest.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> diff --git a/src/tests/get_item.c b/src/tests/get_item.c
> index c4c95cb..9475130 100644
> --- a/src/tests/get_item.c
> +++ b/src/tests/get_item.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> diff --git a/src/tests/getkeys.c b/src/tests/getkeys.c
> index bab6883..f90f009 100644
> --- a/src/tests/getkeys.c
> +++ b/src/tests/getkeys.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> diff --git a/src/tests/lxcpath.c b/src/tests/lxcpath.c
> index a849a38..9a51d76 100644
> --- a/src/tests/lxcpath.c
> +++ b/src/tests/lxcpath.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> diff --git a/src/tests/saveconfig.c b/src/tests/saveconfig.c
> index 649573f..a6eae65 100644
> --- a/src/tests/saveconfig.c
> +++ b/src/tests/saveconfig.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> diff --git a/src/tests/shutdowntest.c b/src/tests/shutdowntest.c
> index f67995e..c7070c1 100644
> --- a/src/tests/shutdowntest.c
> +++ b/src/tests/shutdowntest.c
> @@ -17,7 +17,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> diff --git a/src/tests/snapshot.c b/src/tests/snapshot.c
> index 1bbd6b4..8f16548 100644
> --- a/src/tests/snapshot.c
> +++ b/src/tests/snapshot.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <errno.h>
>  #include <stdlib.h>
> diff --git a/src/tests/startone.c b/src/tests/startone.c
> index d781e75..31ef503 100644
> --- a/src/tests/startone.c
> +++ b/src/tests/startone.c
> @@ -16,7 +16,7 @@
>   * with this program; if not, write to the Free Software Foundation, Inc.,
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
> -#include "../lxc/lxccontainer.h"
> +#include <lxc/lxccontainer.h>
>  
>  #include <unistd.h>
>  #include <signal.h>
> -- 
> 1.8.3.2
> 
> 
> ------------------------------------------------------------------------------
> LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
> 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
> 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
> Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13. 
> http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel




More information about the lxc-devel mailing list