From 461d1b3b6eee1530b9afb0a618753c1cdd0ee4f2 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 8 Sep 2010 16:48:48 +0100
Subject: libxl: Use libxl__ namespace for internal types

It's not clear that the namespace rules described in libxl.h are
intended to apply to internal types but I don't see why not.

sed -i -e 's/\<libxl_device\>/libxl__device/g'  tools/libxl/*.[ch]
sed -i -e 's/\<libxl_device_kinds\>/libxl__device_kinds/g'  tools/libxl/*.[ch]
sed -i -e 's/\<libxl_gc\>/libxl__gc/g'  tools/libxl/*.[ch]
sed -i -e 's/\<libxl_gc_owner\>/libxl__gc_owner/g'  tools/libxl/*.[ch]
sed -i -e 's/\<libxl_spawn_starting\>/libxl__spawn_starting/g'  tools/libxl/*.[ch]

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/libxl/libxl_xshelp.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'tools/libxl/libxl_xshelp.c')

diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c
index b707a62d81..4840ededc8 100644
--- a/tools/libxl/libxl_xshelp.c
+++ b/tools/libxl/libxl_xshelp.c
@@ -44,7 +44,7 @@ int xs_writev(struct xs_handle *xsh, xs_transaction_t t, char *dir, char *kvs[])
     return 0;
 }
 
-char **libxl__xs_kvs_of_flexarray(libxl_gc *gc, flexarray_t *array, int length)
+char **libxl__xs_kvs_of_flexarray(libxl__gc *gc, flexarray_t *array, int length)
 {
     char **kvs;
     int i;
@@ -68,10 +68,10 @@ char **libxl__xs_kvs_of_flexarray(libxl_gc *gc, flexarray_t *array, int length)
     return kvs;
 }
 
-int libxl__xs_writev(libxl_gc *gc, xs_transaction_t t,
+int libxl__xs_writev(libxl__gc *gc, xs_transaction_t t,
                     char *dir, char *kvs[])
 {
-    libxl_ctx *ctx = libxl_gc_owner(gc);
+    libxl_ctx *ctx = libxl__gc_owner(gc);
     char *path;
     int i;
 
@@ -88,10 +88,10 @@ int libxl__xs_writev(libxl_gc *gc, xs_transaction_t t,
     return 0;
 }
 
-int libxl__xs_write(libxl_gc *gc, xs_transaction_t t,
+int libxl__xs_write(libxl__gc *gc, xs_transaction_t t,
                    char *path, char *fmt, ...)
 {
-    libxl_ctx *ctx = libxl_gc_owner(gc);
+    libxl_ctx *ctx = libxl__gc_owner(gc);
     char *s;
     va_list ap;
     int ret;
@@ -107,9 +107,9 @@ int libxl__xs_write(libxl_gc *gc, xs_transaction_t t,
     return 0;
 }
 
-char * libxl__xs_read(libxl_gc *gc, xs_transaction_t t, char *path)
+char * libxl__xs_read(libxl__gc *gc, xs_transaction_t t, char *path)
 {
-    libxl_ctx *ctx = libxl_gc_owner(gc);
+    libxl_ctx *ctx = libxl__gc_owner(gc);
     char *ptr;
 
     ptr = xs_read(ctx->xsh, t, path, NULL);
@@ -120,9 +120,9 @@ char * libxl__xs_read(libxl_gc *gc, xs_transaction_t t, char *path)
     return 0;
 }
 
-char *libxl__xs_get_dompath(libxl_gc *gc, uint32_t domid)
+char *libxl__xs_get_dompath(libxl__gc *gc, uint32_t domid)
 {
-    libxl_ctx *ctx = libxl_gc_owner(gc);
+    libxl_ctx *ctx = libxl__gc_owner(gc);
     char *s = xs_get_domain_path(ctx->xsh, domid);
     if (!s) {
         LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to get dompath for %" PRIu32,
@@ -133,9 +133,9 @@ char *libxl__xs_get_dompath(libxl_gc *gc, uint32_t domid)
     return s;
 }
 
-char **libxl__xs_directory(libxl_gc *gc, xs_transaction_t t, char *path, unsigned int *nb)
+char **libxl__xs_directory(libxl__gc *gc, xs_transaction_t t, char *path, unsigned int *nb)
 {
-    libxl_ctx *ctx = libxl_gc_owner(gc);
+    libxl_ctx *ctx = libxl__gc_owner(gc);
     char **ret = NULL;
     ret = xs_directory(ctx->xsh, XBT_NULL, path, nb);
     libxl__ptr_add(gc, ret);
-- 
cgit v1.2.3