[lxc-devel] [lxc/lxc] dba5e0: Fix build error(ISO C90 specs violation) in lxc.c

[GitHub]

  Branch: refs/heads/stable-1.0
  Home:   https://github.com/lxc/lxc
  Commit: dba5e06aa36a8fb3cedf191d0c7a64a661b89976
      https://github.com/lxc/lxc/commit/dba5e06aa36a8fb3cedf191d0c7a64a661b89976
  Author: Masami Ichikawa <masami256 at gmail.com>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M src/python-lxc/lxc.c

  Log Message:
  -----------
  Fix build error(ISO C90 specs violation) in lxc.c

This patch fixes following build errors.

running build_ext
building '_lxc' extension
creating build/temp.linux-x86_64-3.4
gcc -pthread -Wno-unused-result -Werror=declaration-after-statement -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4 -fPIC -I../../src -I../../src -I/usr/include/python3.4m -c lxc.c -o ./build/temp.linux-x86_64-3.4/lxc.o
lxc.c: In function ‘convert_tuple_to_char_pointer_array’:
lxc.c:49:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
     char **result = (char**) calloc(argc + 1, sizeof(char*));
     ^
lxc.c:60:9: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
   char *str = NULL;
   ^
lxc.c: In function ‘Container_get_cgroup_item’:
lxc.c:822:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
     char* value = (char*) malloc(sizeof(char)*len + 1);
     ^
lxc.c: In function ‘Container_get_config_item’:
lxc.c:861:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
     char* value = (char*) malloc(sizeof(char)*len + 1);
     ^
lxc.c: In function ‘Container_get_keys’:
lxc.c:903:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
     char* value = (char*) malloc(sizeof(char)*len + 1);
     ^
cc1: some warnings being treated as errors
error: command 'gcc' failed with exit status 1
Makefile:472: recipe for target 'all' failed
make[3]: *** [all] Error 1
make[3]: Leaving directory '/home/masami/codes/lxc/src/python-lxc'
Makefile:394: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory '/home/masami/codes/lxc/src'
Makefile:338: recipe for target 'all' failed
make[1]: *** [all] Error 2
make[1]: Leaving directory '/home/masami/codes/lxc/src'
Makefile:484: recipe for target 'all-recursive' failed
make: *** [all-recursive] Error 1

build env:
distribution: Arch Linux
gcc version 4.9.1 20140903 (prerelease) (GCC)

Signed-off-by: Masami Ichikawa <masami256 at gmail.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: c4240864684057c276fef028968b9fab8b58142d
      https://github.com/lxc/lxc/commit/c4240864684057c276fef028968b9fab8b58142d
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  lxc_map_ids: don't do bogus chekc for newgidmap

If we didn't find newuidmap, then simply require the caller to be
root and write to /proc/self/uidmap manually.  Checking for
newgidmap to exist is bogus.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: b682262f1ff0303f3123ba6f4ca90f6f840ba338
      https://github.com/lxc/lxc/commit/b682262f1ff0303f3123ba6f4ca90f6f840ba338
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  lxc_map_ids: add a comment

Explain why we insist that root use newuidmap if it is available.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: a68e7131c4af9ea81d7e5c1efc67e8ac91cce605
      https://github.com/lxc/lxc/commit/a68e7131c4af9ea81d7e5c1efc67e8ac91cce605
  Author: Jean-Tiare LE BIGOT <jean-tiare.le-bigot at ovh.net>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/start.c

  Log Message:
  -----------
  clean autodev dir on container exit

When "lxc.autodev = 1", LXC creates automatically a "/dev/.lxc/<name>.<hash>"
folder to put container's devices in so that they are visible from both
the host and the container itself.

On container exit (ne it normal or not), this folder was not cleaned
which made "/dev" folder grow continuously.

We fix this by adding a new `int lxc_delete_autodev(struct lxc_handler
*handler)` called from `static void lxc_fini(const char *name, struct
lxc_handler *handler)`.

Signed-off-by: Jean-Tiare LE BIGOT <jean-tiare.le-bigot at ovh.net>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: e90b49d38a1b4626d9d6838fdd5f880c6b67821b
      https://github.com/lxc/lxc/commit/e90b49d38a1b4626d9d6838fdd5f880c6b67821b
  Author: Jean-Tiare LE BIGOT <jean-tiare.le-bigot at ovh.net>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  As discussed on ML, do not clean autodev dir on reboot

Signed-off-by: Jean-Tiare LE BIGOT <jean-tiare.le-bigot at ovh.net>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 68b2fa16d454a6ab43bb673b3f2b6f6c38dd3b24
      https://github.com/lxc/lxc/commit/68b2fa16d454a6ab43bb673b3f2b6f6c38dd3b24
  Author: Bill Kolokithas <kolokithas.b at gmail.com>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M templates/lxc-archlinux.in

  Log Message:
  -----------
  lxc-archlinux: Properly set default locale in /etc/locale.conf

Signed-off-by: Bill Kolokithas <kolokithas.b at gmail.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/70d371fe392a...68b2fa16d454