[lxc-devel] [PATCH] [cosmetic] adjust include statements
S.Çağlar Onur
caglar at 10ur.org
Tue Dec 24 18:53:46 UTC 2013
Hi,
On Mon, Dec 23, 2013 at 2:17 PM, Stéphane Graber <stgraber at ubuntu.com> wrote:
> On Mon, Dec 23, 2013 at 02:11:22PM -0500, S.Çağlar Onur wrote:
>> Hey Serge,
>>
>> On Mon, Dec 23, 2013 at 11:09 AM, Serge Hallyn <serge.hallyn at ubuntu.com> wrote:
>> >
>> > Why?
>>
>> I've no good reason to justify this change as it's purely cosmetic.
>> That's why I added [cosmetic] keyword to the patch description :)
>>
>> > Admittedly if you're a developer this will be what you want, but
>> > in general '<lxc/include.h>' would be the more correct way. Could
>> > we instead address this with a -I${topdir}/src in the Makefile, or
>> > would that not suffice?
>>
>> I have a useless tendency to assume "#include <lxc/something>" style
>> is for external headers that live outside of the code and "#include
>> "something"" is for the internal ones. Current codebase uses both
>> styles and just wanted to standardize.
>
> That sounds reasonable to me, though then it'd probably make sense to
> use the "<lxc/blah.h>" syntax for attach_options.h, lxccontainer.h and
> version.h as for those the headers are public.
>
> I believe that's what I've been using personally so far though it never
> bothered me enough to change everything to doing that ;)
>
> I sort of like the way it's in lxc_autostart.c:
> """
> #include <string.h>
> #include <unistd.h>
>
> #include <lxc/lxccontainer.h>
>
> #include "arguments.h"
> #include "list.h"
> #include "log.h"
> """
>
> In the above, it's very clear what's coming from the system, what's part
> of our public API and what's from the private API.
>
> That lets me know in a second whether a given binary can be built out of
> tree with just lxc-dev installed and what needs the in-tree headers.
Do you want me to use this format and re-submit a new version?
>>
>> > (Not Nack-ing this yet, but a little apprehensive)
>> >
>> > Quoting S.Çağlar Onur (caglar at 10ur.org):
>> >> Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>
>> >> ---
>> >> src/lua-lxc/core.c | 4 ++--
>> >> src/lxc/bdev.h | 2 +-
>> >> src/lxc/cgroup.c | 6 +++---
>> >> src/lxc/checkpoint.c | 4 ++--
>> >> src/lxc/commands.c | 12 ++++++------
>> >> src/lxc/conf.h | 4 ++--
>> >> src/lxc/confile.c | 4 ++--
>> >> src/lxc/console.c | 2 +-
>> >> src/lxc/freezer.c | 4 ++--
>> >> src/lxc/lxc.h | 2 +-
>> >> src/lxc/lxc_autostart.c | 2 +-
>> >> src/lxc/lxc_cgroup.c | 6 +++---
>> >> src/lxc/lxc_checkpoint.c | 6 +++---
>> >> src/lxc/lxc_clone.c | 2 +-
>>>> src/lxc/lxc_config.c | 2 +-
>> >> src/lxc/lxc_console.c | 2 +-
>> >> src/lxc/lxc_create.c | 8 ++++----
>> >> src/lxc/lxc_destroy.c | 6 +++---
>> >> src/lxc/lxc_freeze.c | 6 +++---
>> >> src/lxc/lxc_info.c | 8 ++++----
>> >> src/lxc/lxc_monitor.c | 6 +++---
>> >> src/lxc/lxc_monitord.c | 10 +++++-----
>> >> src/lxc/lxc_snapshot.c | 8 ++++----
>> >> src/lxc/lxc_start.c | 2 +-
>> >> src/lxc/lxc_stop.c | 6 +++---
>> >> src/lxc/lxc_unfreeze.c | 6 +++---
>> >> src/lxc/lxc_wait.c | 6 +++---
>> >> src/lxc/lxccontainer.c | 8 ++++----
>> >> src/lxc/lxclock.c | 6 +++---
>> >> src/lxc/monitor.c | 10 +++++-----
>> >> src/lxc/monitor.h | 2 +-
>> >> src/lxc/parse.c | 2 +-
>> >> src/lxc/restart.c | 8 ++++----
>> >> src/lxc/start.h | 2 +-
>> >> src/lxc/state.c | 10 +++++-----
>> >> src/python-lxc/lxc.c | 8 ++++----
>> >> src/tests/attach.c | 6 +++---
>> >> src/tests/cgpath.c | 8 ++++----
>> >> src/tests/clonetest.c | 2 +-
>> >> src/tests/concurrent.c | 2 +-
>> >> src/tests/console.c | 2 +-
>> >> src/tests/containertests.c | 4 ++--
>> >> src/tests/createtest.c | 2 +-
>> >> src/tests/destroytest.c | 2 +-
>> >> src/tests/get_item.c | 4 ++--
>> >> src/tests/getkeys.c | 4 ++--
>> >> src/tests/list.c | 2 +-
>> >> src/tests/locktests.c | 2 +-
>> >> src/tests/lxcpath.c | 2 +-
>> >> src/tests/may_control.c | 2 +-
>> >> src/tests/reboot.c | 2 +-
>> >> src/tests/saveconfig.c | 2 +-
>> >> src/tests/shutdowntest.c | 2 +-
>> >> src/tests/snapshot.c | 4 ++--
>> >> src/tests/startone.c | 2 +-
>> >> 55 files changed, 124 insertions(+), 124 deletions(-)
>> >>
>> >> diff --git a/src/lua-lxc/core.c b/src/lua-lxc/core.c
>> >> index 8904ffc..9016014 100644
>> >> --- a/src/lua-lxc/core.c
>> >> +++ b/src/lua-lxc/core.c
>> >> @@ -29,8 +29,8 @@
>> >> #include <string.h>
>> >> #include <unistd.h>
>> >> #include <libgen.h>
>> >> -#include <lxc/lxccontainer.h>
>> >> -#include <lxc/commands.h>
>> >> +#include "lxc/lxccontainer.h"
>> >> +#include "lxc/commands.h"
>> >>
>> >> #if LUA_VERSION_NUM < 502
>> >> #define luaL_newlib(L,l) (lua_newtable(L), luaL_register(L,NULL,l))
>> >> diff --git a/src/lxc/bdev.h b/src/lxc/bdev.h
>> >> index 8c17117..c988639 100644
>> >> --- a/src/lxc/bdev.h
>> >> +++ b/src/lxc/bdev.h
>> >> @@ -29,7 +29,7 @@
>> >> */
>> >>
>> >> #include "config.h"
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >>
>> >> struct bdev;
>> >>
>> >> diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
>> >> index f2a686a..b62c3b7 100644
>> >> --- a/src/lxc/cgroup.c
>> >> +++ b/src/lxc/cgroup.c
>> >> @@ -47,9 +47,9 @@
>> >> #include "bdev.h"
>> >> #include "lxclock.h"
>> >>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/cgroup.h>
>> >> -#include <lxc/start.h>
>> >> +#include "log.h"
>> >> +#include "cgroup.h"
>> >> +#include "start.h"
>> >>
>> >> #if IS_BIONIC
>> >> #include <../include/lxcmntent.h>
>> >> diff --git a/src/lxc/checkpoint.c b/src/lxc/checkpoint.c
>> >> index 75834c9..b50273a 100644
>> >> --- a/src/lxc/checkpoint.c
>> >> +++ b/src/lxc/checkpoint.c
>> >> @@ -20,8 +20,8 @@
>> >> * License along with this library; if not, write to the Free Software
>> >> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>> >> */
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >>
>> >> lxc_log_define(lxc_checkpoint, lxc);
>> >>
>> >> diff --git a/src/lxc/commands.c b/src/lxc/commands.c
>> >> index de0b3e3..6c163ac 100644
>> >> --- a/src/lxc/commands.c
>> >> +++ b/src/lxc/commands.c
>> >> @@ -33,12 +33,12 @@
>> >> #include <malloc.h>
>> >> #include <stdlib.h>
>> >>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/conf.h>
>> >> -#include <lxc/start.h> /* for struct lxc_handler */
>> >> -#include <lxc/utils.h>
>> >> -#include <lxc/cgroup.h>
>> >> +#include "log.h"
>> >> +#include "lxc.h"
>> >> +#include "conf.h"
>> >> +#include "start.h" /* for struct lxc_handler */
>> >> +#include "utils.h"
>> >> +#include "cgroup.h"
>> >>
>> >> #include "commands.h"
>> >> #include "console.h"
>> >> diff --git a/src/lxc/conf.h b/src/lxc/conf.h
>> >> index ec76295..82816b7 100644
>> >> --- a/src/lxc/conf.h
>> >> +++ b/src/lxc/conf.h
>> >> @@ -31,9 +31,9 @@
>> >> #include <sys/types.h>
>> >> #include <stdbool.h>
>> >>
>> >> -#include <lxc/list.h>
>> >> +#include "list.h"
>> >>
>> >> -#include <lxc/start.h> /* for lxc_handler */
>> >> +#include "start.h" /* for lxc_handler */
>> >>
>> >> #if HAVE_SCMP_FILTER_CTX
>> >> typedef void * scmp_filter_ctx;
>> >> diff --git a/src/lxc/confile.c b/src/lxc/confile.c
>> >> index c5ec4f3..58a3366 100644
>> >> --- a/src/lxc/confile.c
>> >> +++ b/src/lxc/confile.c
>> >> @@ -42,8 +42,8 @@
>> >> #include "confile.h"
>> >> #include "utils.h"
>> >>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/conf.h>
>> >> +#include "log.h"
>> >> +#include "conf.h"
>> >> #include "network.h"
>> >>
>> >> #if HAVE_SYS_PERSONALITY_H
>> >> diff --git a/src/lxc/console.c b/src/lxc/console.c
>> >> index 5d91f24..bc4fb42 100644
>> >> --- a/src/lxc/console.c
>> >> +++ b/src/lxc/console.c
>> >> @@ -31,7 +31,7 @@
>> >> #include <sys/types.h>
>> >> #include <termios.h>
>> >>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >> #include "log.h"
>> >> #include "conf.h"
>> >> #include "config.h"
>> >> diff --git a/src/lxc/freezer.c b/src/lxc/freezer.c
>> >> index 41dc61e..3424df1 100644
>> >> --- a/src/lxc/freezer.c
>> >> +++ b/src/lxc/freezer.c
>> >> @@ -36,8 +36,8 @@
>> >> #include "monitor.h"
>> >> #include "lxclock.h"
>> >>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/cgroup.h>
>> >> +#include "log.h"
>> >> +#include "cgroup.h"
>> >>
>> >> lxc_log_define(lxc_freezer, lxc);
>> >>
>> >> diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
>> >> index 84bcc04..d048cf2 100644
>> >> --- a/src/lxc/lxc.h
>> >> +++ b/src/lxc/lxc.h
>> >> @@ -30,7 +30,7 @@ extern "C" {
>> >> #include <stddef.h>
>> >> #include <sys/select.h>
>> >> #include <sys/types.h>
>> >> -#include <lxc/state.h>
>> >> +#include "state.h"
>> >>
>> >> struct lxc_msg;
>> >> struct lxc_conf;
>> >> diff --git a/src/lxc/lxc_autostart.c b/src/lxc/lxc_autostart.c
>> >> index 588a9c6..60c62d8 100644
>> >> --- a/src/lxc/lxc_autostart.c
>> >> +++ b/src/lxc/lxc_autostart.c
>> >> @@ -21,7 +21,7 @@
>> >> #include <string.h>
>> >> #include <unistd.h>
>> >>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >>
>> >> #include "arguments.h"
>> >> #include "list.h"
>> >> diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
>> >> index 7c26fc6..ce5ece4 100644
>> >> --- a/src/lxc/lxc_cgroup.c
>> >> +++ b/src/lxc/lxc_cgroup.c
>> >> @@ -26,10 +26,10 @@
>> >> #include <libgen.h>
>> >> #include <sys/types.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >> #include "arguments.h"
>> >>
>> >> lxc_log_define(lxc_cgroup_ui, lxc_cgroup);
>> >> diff --git a/src/lxc/lxc_checkpoint.c b/src/lxc/lxc_checkpoint.c
>> >> index f6a0313..52a8683 100644
>> >> --- a/src/lxc/lxc_checkpoint.c
>> >> +++ b/src/lxc/lxc_checkpoint.c
>> >> @@ -30,9 +30,9 @@
>> >> #include <sys/types.h>
>> >> #include <fcntl.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/utils.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >> +#include "utils.h"
>> >>
>> >> #include "arguments.h"
>> >> #include "config.h"
>> >> diff --git a/src/lxc/lxc_clone.c b/src/lxc/lxc_clone.c
>> >> index 7464dcd..dcc2041 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 <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >>
>> >> lxc_log_define(lxc_clone, lxc);
>> >>
>> >> diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c
>> >> index 8a4114d..dfee286 100644
>> >> --- a/src/lxc/lxc_config.c
>> >> +++ b/src/lxc/lxc_config.c
>> >> @@ -21,7 +21,7 @@
>> >> #include <stdio.h>
>> >> #include <string.h>
>> >> #include "config.h"
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >>
>> >> struct lxc_config_items {
>> >> char *name;
>> >> diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c
>> >> index 5dc3d49..c814258 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 "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 7399683..ca20d6c 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 "lxccontainer.h"
>> >>
>> >> #include <stdio.h>
>> >> #include <libgen.h>
>> >> @@ -26,9 +26,9 @@
>> >> #include <fcntl.h>
>> >> #include <sys/types.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/bdev.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >> +#include "bdev.h"
>> >>
>> >> #include "arguments.h"
>> >> #include "utils.h"
>> >> diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c
>> >> index 06d2d0d..ecc1b5a 100644
>> >> --- a/src/lxc/lxc_destroy.c
>> >> +++ b/src/lxc/lxc_destroy.c
>> >> @@ -17,15 +17,15 @@
>> >> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>> >> */
>> >>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >>
>> >> #include <stdio.h>
>> >> #include <libgen.h>
>> >> #include <unistd.h>
>> >> #include <sys/types.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >>
>> >> #include "arguments.h"
>> >> #include "utils.h"
>> >> diff --git a/src/lxc/lxc_freeze.c b/src/lxc/lxc_freeze.c
>> >> index 9e783bd..190f313 100644
>> >> --- a/src/lxc/lxc_freeze.c
>> >> +++ b/src/lxc/lxc_freeze.c
>> >> @@ -26,9 +26,9 @@
>> >> #include <libgen.h>
>> >> #include <string.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >> +#include "lxccontainer.h"
>> >>
>> >> #include "arguments.h"
>> >>
>> >> diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c
>> >> index b344dca..0c900db 100644
>> >> --- a/src/lxc/lxc_info.c
>> >> +++ b/src/lxc/lxc_info.c
>> >> @@ -29,10 +29,10 @@
>> >> #include <libgen.h>
>> >> #include <sys/types.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/utils.h>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >> +#include "utils.h"
>> >> +#include "lxccontainer.h"
>> >>
>> >> #include "commands.h"
>> >> #include "arguments.h"
>> >> diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
>> >> index be381b0..52f4c98 100644
>> >> --- a/src/lxc/lxc_monitor.c
>> >> +++ b/src/lxc/lxc_monitor.c
>> >> @@ -29,9 +29,9 @@
>> >> #include <sys/types.h>
>> >> #include <errno.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/monitor.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >> +#include "monitor.h"
>> >> #include "arguments.h"
>> >>
>> >> lxc_log_define(lxc_monitor_ui, lxc_monitor);
>> >> diff --git a/src/lxc/lxc_monitord.c b/src/lxc/lxc_monitord.c
>> >> index fc83f01..84e0239 100644
>> >> --- a/src/lxc/lxc_monitord.c
>> >> +++ b/src/lxc/lxc_monitord.c
>> >> @@ -38,11 +38,11 @@
>> >> #include <netinet/in.h>
>> >> #include <net/if.h>
>> >>
>> >> -#include <lxc/af_unix.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/mainloop.h>
>> >> -#include <lxc/monitor.h>
>> >> -#include <lxc/utils.h>
>> >> +#include "af_unix.h"
>> >> +#include "log.h"
>> >> +#include "mainloop.h"
>> >> +#include "monitor.h"
>> >> +#include "utils.h"
>> >>
>> >> #define CLIENTFDS_CHUNK 64
>> >>
>> >> diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c
>> >> index 1de5671..458e7e2 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 "lxccontainer.h"
>> >>
>> >> #include <stdio.h>
>> >> #include <libgen.h>
>> >> @@ -26,9 +26,9 @@
>> >> #include <sys/types.h>
>> >> #include <fcntl.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/bdev.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >> +#include "bdev.h"
>> >>
>> >> #include "arguments.h"
>> >> #include "utils.h"
>> >> diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
>> >> index d006ba1..14b485c 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 <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >> #include "conf.h"
>> >> #include "cgroup.h"
>> >> #include "utils.h"
>> >> diff --git a/src/lxc/lxc_stop.c b/src/lxc/lxc_stop.c
>> >> index a4ead81..42ad30a 100644
>> >> --- a/src/lxc/lxc_stop.c
>> >> +++ b/src/lxc/lxc_stop.c
>> >> @@ -25,10 +25,10 @@
>> >> #include <unistd.h>
>> >> #include <sys/types.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >> #include "arguments.h"
>> >> #include "commands.h"
>> >> #include "utils.h"
>> >> diff --git a/src/lxc/lxc_unfreeze.c b/src/lxc/lxc_unfreeze.c
>> >> index e5def1a..409a142 100644
>> >> --- a/src/lxc/lxc_unfreeze.c
>> >> +++ b/src/lxc/lxc_unfreeze.c
>> >> @@ -25,9 +25,9 @@
>> >> #include <libgen.h>
>> >> #include <sys/types.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >> +#include "lxccontainer.h"
>> >>
>> >> #include "arguments.h"
>> >>
>> >> diff --git a/src/lxc/lxc_wait.c b/src/lxc/lxc_wait.c
>> >> index b00377c..d03d3cc 100644
>> >> --- a/src/lxc/lxc_wait.c
>> >> +++ b/src/lxc/lxc_wait.c
>> >> @@ -28,9 +28,9 @@
>> >> #include <signal.h>
>> >> #include <sys/types.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >> +#include "lxccontainer.h"
>> >> #include "arguments.h"
>> >>
>> >> lxc_log_define(lxc_wait_ui, lxc_monitor);
>> >> diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
>> >> index 203f4a8..a7e072d 100644
>> >> --- a/src/lxc/lxccontainer.c
>> >> +++ b/src/lxc/lxccontainer.c
>> >> @@ -33,7 +33,7 @@
>> >> #include "config.h"
>> >> #include "lxc.h"
>> >> #include "state.h"
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxccontainer.h"
>> >> #include "conf.h"
>> >> #include "confile.h"
>> >> #include "console.h"
>> >> @@ -44,9 +44,9 @@
>> >> #include "bdev.h"
>> >> #include "utils.h"
>> >> #include "attach.h"
>> >> -#include <lxc/utils.h>
>> >> -#include <lxc/monitor.h>
>> >> -#include <lxc/namespace.h>
>> >> +#include "utils.h"
>> >> +#include "monitor.h"
>> >> +#include "namespace.h"
>> >> #include <sched.h>
>> >> #include <arpa/inet.h>
>> >> #include <libgen.h>
>> >> diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
>> >> index 62e774f..a70082f 100644
>> >> --- a/src/lxc/lxclock.c
>> >> +++ b/src/lxc/lxclock.c
>> >> @@ -27,9 +27,9 @@
>> >> #include <fcntl.h>
>> >> #include <stdlib.h>
>> >> #include <pthread.h>
>> >> -#include <lxc/utils.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "utils.h"
>> >> +#include "log.h"
>> >> +#include "lxccontainer.h"
>> >>
>> >> #ifdef MUTEX_DEBUGGING
>> >> #include <execinfo.h>
>> >> diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c
>> >> index 1eae8e6..6e66682 100644
>> >> --- a/src/lxc/monitor.c
>> >> +++ b/src/lxc/monitor.c
>> >> @@ -42,11 +42,11 @@
>> >> #include "error.h"
>> >> #include "af_unix.h"
>> >>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/lxclock.h>
>> >> -#include <lxc/state.h>
>> >> -#include <lxc/monitor.h>
>> >> -#include <lxc/utils.h>
>> >> +#include "log.h"
>> >> +#include "lxclock.h"
>> >> +#include "state.h"
>> >> +#include "monitor.h"
>> >> +#include "utils.h"
>> >>
>> >> lxc_log_define(lxc_monitor, lxc);
>> >>
>> >> diff --git a/src/lxc/monitor.h b/src/lxc/monitor.h
>> >> index 8093919..7e2a468 100644
>> >> --- a/src/lxc/monitor.h
>> >> +++ b/src/lxc/monitor.h
>> >> @@ -26,7 +26,7 @@
>> >> #include <sys/param.h>
>> >> #include <sys/un.h>
>> >>
>> >> -#include <lxc/conf.h>
>> >> +#include "conf.h"
>> >>
>> >> typedef enum {
>> >> lxc_msg_state,
>> >> diff --git a/src/lxc/parse.c b/src/lxc/parse.c
>> >> index dcf5cf0..07cd45a 100644
>> >> --- a/src/lxc/parse.c
>> >> +++ b/src/lxc/parse.c
>> >> @@ -32,7 +32,7 @@
>> >> #include "config.h"
>> >> #include "utils.h"
>> >> #include "lxclock.h"
>> >> -#include <lxc/log.h>
>> >> +#include "log.h"
>> >>
>> >> /* Workaround for the broken signature of alphasort() in bionic.
>> >> This was fixed upstream in 40e467ec668b59be25491bd44bf348a884d6a68d so the
>> >> diff --git a/src/lxc/restart.c b/src/lxc/restart.c
>> >> index 7232074..8d5b792 100644
>> >> --- a/src/lxc/restart.c
>> >> +++ b/src/lxc/restart.c
>> >> @@ -30,10 +30,10 @@
>> >> #include <errno.h>
>> >> #include <unistd.h>
>> >>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/start.h> /* for struct lxc_handler */
>> >> -#include <lxc/utils.h>
>> >> -#include <lxc/error.h>
>> >> +#include "log.h"
>> >> +#include "start.h" /* for struct lxc_handler */
>> >> +#include "utils.h"
>> >> +#include "error.h"
>> >>
>> >> lxc_log_define(lxc_restart, lxc);
>> >>
>> >> diff --git a/src/lxc/start.h b/src/lxc/start.h
>> >> index c1f7909..15a3394 100644
>> >> --- a/src/lxc/start.h
>> >> +++ b/src/lxc/start.h
>> >> @@ -25,7 +25,7 @@
>> >>
>> >> #include "config.h"
>> >>
>> >> -#include <lxc/state.h>
>> >> +#include "state.h"
>> >> #include <sys/param.h>
>> >> #include "namespace.h"
>> >>
>> >> diff --git a/src/lxc/state.c b/src/lxc/state.c
>> >> index 92be560..b30a8e5 100644
>> >> --- a/src/lxc/state.c
>> >> +++ b/src/lxc/state.c
>> >> @@ -32,11 +32,11 @@
>> >> #include <sys/stat.h>
>> >> #include <sys/file.h>
>> >>
>> >> -#include <lxc/lxc.h>
>> >> -#include <lxc/log.h>
>> >> -#include <lxc/start.h>
>> >> -#include <lxc/cgroup.h>
>> >> -#include <lxc/monitor.h>
>> >> +#include "lxc.h"
>> >> +#include "log.h"
>> >> +#include "start.h"
>> >> +#include "cgroup.h"
>> >> +#include "monitor.h"
>> >> #include "commands.h"
>> >> #include "config.h"
>> >> #include "lxclock.h"
>> >> diff --git a/src/python-lxc/lxc.c b/src/python-lxc/lxc.c
>> >> index 0099b98..371a7f5 100644
>> >> --- a/src/python-lxc/lxc.c
>> >> +++ b/src/python-lxc/lxc.c
>> >> @@ -24,10 +24,10 @@
>> >>
>> >> #include <Python.h>
>> >> #include "structmember.h"
>> >> -#include <lxc/lxccontainer.h>
>> >> -#include <lxc/utils.h>
>> >> -#include <lxc/namespace.h>
>> >> -#include <lxc/confile.h>
>> >> +#include "lxc/lxccontainer.h"
>> >> +#include "lxc/utils.h"
>> >> +#include "lxc/namespace.h"
>> >> +#include "lxc/confile.h"
>> >> #include <stdio.h>
>> >> #include <sys/wait.h>
>> >>
>> >> diff --git a/src/tests/attach.c b/src/tests/attach.c
>> >> index 54f899f..61c23e5 100644
>> >> --- a/src/tests/attach.c
>> >> +++ b/src/tests/attach.c
>> >> @@ -19,9 +19,9 @@
>> >> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>> >> */
>> >>
>> >> -#include <lxc/lxccontainer.h>
>> >> -#include <lxc/utils.h>
>> >> -#include <lxc/lsm/lsm.h>
>> >> +#include "lxc/lxccontainer.h"
>> >> +#include "lxc/utils.h"
>> >> +#include "lxc/lsm/lsm.h"
>> >>
>> >> #include <string.h>
>> >> #include <sys/stat.h>
>> >> diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c
>> >> index ef192c6..4f9921a 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>
>> >> @@ -28,9 +28,9 @@
>> >> #include <errno.h>
>> >> #include <string.h>
>> >> #include <sys/stat.h>
>> >> -#include "../lxc/cgroup.h"
>> >> -#include "../lxc/lxc.h"
>> >> -#include "../lxc/commands.h"
>> >> +#include "lxc/cgroup.h"
>> >> +#include "lxc/lxc.h"
>> >> +#include "lxc/commands.h"
>> >>
>> >> #define MYNAME "lxctest1"
>> >>
>> >> diff --git a/src/tests/clonetest.c b/src/tests/clonetest.c
>> >> index b04ab3c..fa983cb 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 7145d99..3c64385 100644
>> >> --- a/src/tests/concurrent.c
>> >> +++ b/src/tests/concurrent.c
>> >> @@ -25,7 +25,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 351f47a..90bca46 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 e6f05af..552e5f6 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>
>> >> @@ -26,7 +26,7 @@
>> >> #include <stdlib.h>
>> >> #include <errno.h>
>> >> #include <string.h>
>> >> -#include <lxc/state.h>
>> >> +#include "lxc/state.h"
>> >>
>> >> #define MYNAME "lxctest1"
>> >>
>> >> diff --git a/src/tests/createtest.c b/src/tests/createtest.c
>> >> index b53c963..7e29095 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 6403472..dfbc4fa 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 10ab3d1..90b5b61 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>
>> >> @@ -26,7 +26,7 @@
>> >> #include <stdlib.h>
>> >> #include <errno.h>
>> >> #include <string.h>
>> >> -#include <lxc/state.h>
>> >> +#include "lxc/state.h"
>> >>
>> >> #define MYNAME "lxctest1"
>> >>
>> >> diff --git a/src/tests/getkeys.c b/src/tests/getkeys.c
>> >> index 5c336db..798cda3 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>
>> >> @@ -25,7 +25,7 @@
>> >> #include <sys/wait.h>
>> >> #include <stdlib.h>
>> >> #include <errno.h>
>> >> -#include <lxc/state.h>
>> >> +#include "lxc/state.h"
>> >>
>> >> #define MYNAME "lxctest1"
>> >>
>> >> diff --git a/src/tests/list.c b/src/tests/list.c
>> >> index 9559c23..a50a5db 100644
>> >> --- a/src/tests/list.c
>> >> +++ b/src/tests/list.c
>> >> @@ -20,7 +20,7 @@
>> >> #include <stdio.h>
>> >> #include <stdlib.h>
>> >> #include <string.h>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxc/lxccontainer.h"
>> >>
>> >> static void test_list_func(const char *lxcpath, const char *type,
>> >> int (*func)(const char *path, char ***names,
>> >> diff --git a/src/tests/locktests.c b/src/tests/locktests.c
>> >> index 360851f..191414c 100644
>> >> --- a/src/tests/locktests.c
>> >> +++ b/src/tests/locktests.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/lxclock.h"
>> >> +#include "lxc/lxclock.h"
>> >> #include <unistd.h>
>> >> #include <signal.h>
>> >> #include <stdio.h>
>> >> diff --git a/src/tests/lxcpath.c b/src/tests/lxcpath.c
>> >> index 6018990..60b50dc 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/may_control.c b/src/tests/may_control.c
>> >> index c176087..c0dcfa2 100644
>> >> --- a/src/tests/may_control.c
>> >> +++ b/src/tests/may_control.c
>> >> @@ -19,7 +19,7 @@
>> >>
>> >> #include <stdio.h>
>> >> #include <stdlib.h>
>> >> -#include <lxc/lxccontainer.h>
>> >> +#include "lxc/lxccontainer.h"
>> >>
>> >> void usage(char *me)
>> >> {
>> >> diff --git a/src/tests/reboot.c b/src/tests/reboot.c
>> >> index b27d523..3601e0d 100644
>> >> --- a/src/tests/reboot.c
>> >> +++ b/src/tests/reboot.c
>> >> @@ -25,7 +25,7 @@
>> >> #include <sys/types.h>
>> >> #include <sys/wait.h>
>> >>
>> >> -#include <lxc/namespace.h>
>> >> +#include "lxc/namespace.h"
>> >>
>> >> #include <sched.h>
>> >> #include <linux/sched.h>
>> >> diff --git a/src/tests/saveconfig.c b/src/tests/saveconfig.c
>> >> index a6eae65..b50e8a4 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 fc4e8fd..b7cc1ca 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 d9fed36..cb45afe 100644
>> >> --- a/src/tests/snapshot.c
>> >> +++ b/src/tests/snapshot.c
>> >> @@ -16,14 +16,14 @@
>> >> * 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>
>> >> #include <stdio.h>
>> >> #include <string.h>
>> >> #include <sys/stat.h>
>> >> -#include "../lxc/lxc.h"
>> >> +#include "lxc/lxc.h"
>> >>
>> >> #define MYNAME "snapxxx1"
>> >> #define RESTNAME "snapxxx2"
>> >> diff --git a/src/tests/startone.c b/src/tests/startone.c
>> >> index 08587ea..76f115e 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
>> >>
>> >> _______________________________________________
>> >> lxc-devel mailing list
>> >> lxc-devel at lists.linuxcontainers.org
>> >> http://lists.linuxcontainers.org/listinfo/lxc-devel
>> > _______________________________________________
>> > lxc-devel mailing list
>> > lxc-devel at lists.linuxcontainers.org
>> > http://lists.linuxcontainers.org/listinfo/lxc-devel
>>
>>
>>
>> --
>> S.Çağlar Onur <caglar at 10ur.org>
>> _______________________________________________
>> lxc-devel mailing list
>> lxc-devel at lists.linuxcontainers.org
>> http://lists.linuxcontainers.org/listinfo/lxc-devel
>
> --
> Stéphane Graber
> Ubuntu developer
> http://www.ubuntu.com
>
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
>
--
S.Çağlar Onur <caglar at 10ur.org>
More information about the lxc-devel
mailing list