From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 04/14] libxl: make libxl_ctx_free tolerate NULL ctx argument Date: Thu, 12 May 2011 15:36:34 +0100 Message-ID: <1305211004-31687-5-git-send-email-ian.jackson@eu.citrix.com> References: <1305211004-31687-1-git-send-email-ian.jackson@eu.citrix.com> <1305211004-31687-2-git-send-email-ian.jackson@eu.citrix.com> <1305211004-31687-3-git-send-email-ian.jackson@eu.citrix.com> <1305211004-31687-4-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1305211004-31687-4-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Ian Jackson List-Id: xen-devel@lists.xenproject.org This is purely for convenience (eg, when debugging). Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 1 + tools/libxl/libxl.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index fabad4a..d4a47f2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -85,6 +85,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, xentoollog_logger * lg) int libxl_ctx_free(libxl_ctx *ctx) { + if (!ctx) return 0; if (ctx->xch) xc_interface_close(ctx->xch); libxl_version_info_destroy(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 95a7ba3..18a01c6 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -232,7 +232,7 @@ typedef struct { /* context functions */ int libxl_ctx_alloc(libxl_ctx **pctx, int version, xentoollog_logger *lg); -int libxl_ctx_free(libxl_ctx *ctx); +int libxl_ctx_free(libxl_ctx *ctx /* 0 is OK */); int libxl_ctx_postfork(libxl_ctx *ctx); /* domain related functions */ -- 1.7.2.5