[lxc-devel] [PATCH] return the result of the lxcapi_want_close_all_fds call to the caller

[Serge Hallyn]

Quoting S.Çağlar Onur (caglar at 10ur.org):
> Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>

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

> ---
>  src/lxc/lxccontainer.c | 7 ++++---
>  src/lxc/lxccontainer.h | 2 +-
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
> index 727c680..5c49b8b 100644
> --- a/src/lxc/lxccontainer.c
> +++ b/src/lxc/lxccontainer.c
> @@ -456,16 +456,17 @@ static void lxcapi_want_daemonize(struct lxc_container *c)
>  	container_mem_unlock(c);
>  }
>  
> -static void lxcapi_want_close_all_fds(struct lxc_container *c)
> +static bool lxcapi_want_close_all_fds(struct lxc_container *c)
>  {
>  	if (!c || !c->lxc_conf)
> -		return;
> +		return false;
>  	if (container_mem_lock(c)) {
>  		ERROR("Error getting mem lock");
> -		return;
> +		return false;
>  	}
>  	c->lxc_conf->close_all_fds = 1;
>  	container_mem_unlock(c);
> +	return true;
>  }
>  
>  static bool lxcapi_wait(struct lxc_container *c, const char *state, int timeout)
> diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
> index 8b6c6ef..225fb39 100644
> --- a/src/lxc/lxccontainer.h
> +++ b/src/lxc/lxccontainer.h
> @@ -68,7 +68,7 @@ struct lxc_container {
>  	bool (*startl)(struct lxc_container *c, int useinit, ...);
>  	bool (*stop)(struct lxc_container *c);
>  	void (*want_daemonize)(struct lxc_container *c);
> -	void (*want_close_all_fds)(struct lxc_container *c);
> +	bool (*want_close_all_fds)(struct lxc_container *c);
>  	// Return current config file name.  The result is strdup()d, so free the result.
>  	char *(*config_file_name)(struct lxc_container *c);
>  	// for wait, timeout == -1 means wait forever, timeout == 0 means don't wait.
> -- 
> 1.8.1.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