[Xen-changelog] [xen-unstable] libxl: fixup incorrect indentation

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1318340047 -3600
# Node ID e65977f3fa8667d31f4885318abdf9c6ffed4eec
# Parent  c5f8c3597cae4e3122ba067a33da28735630c9bb
libxl: fixup incorrect indentation

Several places which were previsously indented using hard tabs are now
incorrectly indented. Fix them up.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r c5f8c3597cae -r e65977f3fa86 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c       Tue Oct 11 14:26:00 2011 +0100
+++ b/tools/libxl/libxl.c       Tue Oct 11 14:34:07 2011 +0100
@@ -696,13 +696,13 @@
     sscanf(backend,
             "/local/domain/%d/backend/%" TOSTRING(BACKEND_STRING_SIZE) 
"[a-z]/%*d/%*d",
             &disk->backend_domid, backend_type);
-        if (!strcmp(backend_type, "tap") || !strcmp(backend_type, "vbd")) {
-                disk->backend = LIBXL_DISK_BACKEND_TAP;
-        } else if (!strcmp(backend_type, "qdisk")) {
-                disk->backend = LIBXL_DISK_BACKEND_QDISK;
-        } else {
-                disk->backend = LIBXL_DISK_BACKEND_UNKNOWN;
-        }
+    if (!strcmp(backend_type, "tap") || !strcmp(backend_type, "vbd")) {
+        disk->backend = LIBXL_DISK_BACKEND_TAP;
+    } else if (!strcmp(backend_type, "qdisk")) {
+        disk->backend = LIBXL_DISK_BACKEND_QDISK;
+    } else {
+        disk->backend = LIBXL_DISK_BACKEND_UNKNOWN;
+    }
 
     disk->pdev_path = strdup("");
     disk->format = LIBXL_DISK_FORMAT_EMPTY;
diff -r c5f8c3597cae -r e65977f3fa86 tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c    Tue Oct 11 14:26:00 2011 +0100
+++ b/tools/libxl/libxl_bootloader.c    Tue Oct 11 14:34:07 2011 +0100
@@ -81,14 +81,14 @@
 
     ret = openpty(master, slave, NULL, NULL, NULL);
     if (ret < 0)
-            return -1;
+        return -1;
 
     ret = ttyname_r(*slave, slave_path, slave_path_len);
     if (ret == -1) {
-            close(*master);
-            close(*slave);
-            *master = *slave = -1;
-            return -1;
+        close(*master);
+        close(*slave);
+        *master = *slave = -1;
+        return -1;
     }
 
     /*
diff -r c5f8c3597cae -r e65977f3fa86 tools/libxl/libxl_internal.c
--- a/tools/libxl/libxl_internal.c      Tue Oct 11 14:26:00 2011 +0100
+++ b/tools/libxl/libxl_internal.c      Tue Oct 11 14:34:07 2011 +0100
@@ -228,53 +228,53 @@
 
 int libxl__file_reference_map(libxl_file_reference *f)
 {
-        struct stat st_buf;
-        int ret, fd;
-        void *data;
+    struct stat st_buf;
+    int ret, fd;
+    void *data;
 
-        if (f->mapped)
-                return 0;
+    if (f->mapped)
+        return 0;
 
-        fd = open(f->path, O_RDONLY);
-        if (f < 0)
-                return ERROR_FAIL;
+    fd = open(f->path, O_RDONLY);
+    if (f < 0)
+        return ERROR_FAIL;
 
-        ret = fstat(fd, &st_buf);
-        if (ret < 0)
-                goto out;
+    ret = fstat(fd, &st_buf);
+    if (ret < 0)
+        goto out;
 
-        ret = -1;
-        data = mmap(NULL, st_buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-        if (data == NULL)
-                goto out;
+    ret = -1;
+    data = mmap(NULL, st_buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+    if (data == NULL)
+        goto out;
 
-        f->mapped = 1;
-        f->data = data;
-        f->size = st_buf.st_size;
+    f->mapped = 1;
+    f->data = data;
+    f->size = st_buf.st_size;
 
-        ret = 0;
+    ret = 0;
 out:
-        close(fd);
+    close(fd);
 
-        return ret == 0 ? 0 : ERROR_FAIL;
+    return ret == 0 ? 0 : ERROR_FAIL;
 }
 
 int libxl__file_reference_unmap(libxl_file_reference *f)
 {
-        int ret;
+    int ret;
 
-        if (!f->mapped)
-                return 0;
+    if (!f->mapped)
+        return 0;
 
-        ret = munmap(f->data, f->size);
-        if (ret == 0) {
-                f->mapped = 0;
-                f->data = NULL;
-                f->size = 0;
-                return 0;
-        }
+    ret = munmap(f->data, f->size);
+    if (ret == 0) {
+        f->mapped = 0;
+        f->data = NULL;
+        f->size = 0;
+        return 0;
+    }
 
-        return ERROR_FAIL;
+    return ERROR_FAIL;
 }
 
 _hidden int libxl__parse_mac(const char *s, libxl_mac mac)
diff -r c5f8c3597cae -r e65977f3fa86 tools/libxl/libxl_pci.c
--- a/tools/libxl/libxl_pci.c   Tue Oct 11 14:26:00 2011 +0100
+++ b/tools/libxl/libxl_pci.c   Tue Oct 11 14:34:07 2011 +0100
@@ -1113,7 +1113,7 @@
         if ((src[i].type == E820_RAM) ||
             (src[i].type == E820_UNUSABLE) ||
             (src[i].type == 0))
-                continue;
+            continue;
 
         start = src[i].addr < start ? src[i].addr : start;
         last = src[i].addr + src[i].size > last ?
diff -r c5f8c3597cae -r e65977f3fa86 tools/libxl/libxl_utils.c
--- a/tools/libxl/libxl_utils.c Tue Oct 11 14:26:00 2011 +0100
+++ b/tools/libxl/libxl_utils.c Tue Oct 11 14:34:07 2011 +0100
@@ -457,7 +457,7 @@
 
     rc = libxl__parse_mac(mac, mac_n);
     if (rc)
-            return rc;
+        return rc;
 
     nics = libxl_list_nics(ctx, domid, &nb);
     if (!nics)
@@ -509,7 +509,7 @@
     val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/mac", 
nic_path_fe));
     rc = libxl__parse_mac(val, nic->mac);
     if (rc)
-            goto out;
+        goto out;
 
     nic->script = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(&gc, "%s/script", 
nic_path_be), NULL);
     rc = 0;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog