From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 06/10] DROP: libxl: rename libxl__free_all Date: Fri, 6 Jan 2012 20:35:03 +0000 Message-ID: <1325882107-5794-7-git-send-email-ian.jackson@eu.citrix.com> References: <1325882107-5794-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1325882107-5794-1-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 PATCH WILL PROBABLY BE DROPPED as it is no longer needed in the current version of later patches. *** libxl__free_all is going to gain some extra functionality, which will mean that the name is no longer accurate. Rename it to libxl__gc_cleanup. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.h | 2 +- tools/libxl/libxl_internal.c | 2 +- tools/libxl/libxl_internal.h | 4 ++-- tools/libxl/libxl_qmp.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 723eac2..9ae7cea 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -119,7 +119,7 @@ * * No temporary objects allocated from the pool may be explicitly freed. * Therefore public functions which initialize a libxl__gc MUST call - * libxl__free_all() before returning. + * libxl__gc_cleanup() before returning. */ #ifndef LIBXL_H #define LIBXL_H diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 49b0dab..cc98d86 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -53,7 +53,7 @@ int libxl__ptr_add(libxl__gc *gc, void *ptr) return 0; } -void libxl__free_all(libxl__gc *gc) +void libxl__gc_cleanup(libxl__gc *gc) { void *ptr; int i; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1dadf15..df1dfde 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -190,7 +190,7 @@ static inline libxl_ctx *libxl__gc_owner(libxl__gc *gc) /* register @ptr in @gc for free on exit from outermost libxl callframe. */ _hidden int libxl__ptr_add(libxl__gc *gc, void *ptr); /* if this is the outermost libxl callframe then free all pointers in @gc */ -_hidden void libxl__free_all(libxl__gc *gc); +_hidden void libxl__gc_cleanup(libxl__gc *gc); /* allocate and zero @bytes. (similar to a gc'd malloc(3)+memzero()) */ _hidden void *libxl__zalloc(libxl__gc *gc, int bytes); /* allocate and zero memory for an array of @nmemb members of @size each. @@ -744,7 +744,7 @@ libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); */ #define GC_INIT(ctx) libxl__gc gc[1]; LIBXL_INIT_GC(gc[0],ctx) -#define GC_FREE libxl__free_all(gc) +#define GC_FREE libxl__gc_cleanup(gc) #define CTX libxl__gc_owner(gc) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 61d9769..58f5283 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -528,7 +528,7 @@ static int qmp_send(libxl__qmp_handler *qmp, rc = qmp->last_id_used; out: - libxl__free_all(&gc); + libxl__gc_cleanup(&gc); return rc; } -- 1.7.2.5