diff options
author | Keir Fraser <keir@xensource.com> | 2007-02-24 15:30:19 +0000 |
---|---|---|
committer | Keir Fraser <keir@xensource.com> | 2007-02-24 15:30:19 +0000 |
commit | 159ce02013e3d50d3f54ce16e9ceb3bb0164b7c8 (patch) | |
tree | a8c12b077d222d9a7e37f2f867eb71a3f1a3b31e /tools/libxc/xg_private.c | |
parent | e0b421d24279d3cce426c0df4bf6d8734c6ce325 (diff) | |
download | xen-159ce02013e3d50d3f54ce16e9ceb3bb0164b7c8.tar.gz xen-159ce02013e3d50d3f54ce16e9ceb3bb0164b7c8.tar.bz2 xen-159ce02013e3d50d3f54ce16e9ceb3bb0164b7c8.zip |
libxc: Code format cleanups.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools/libxc/xg_private.c')
-rw-r--r-- | tools/libxc/xg_private.c | 92 |
1 files changed, 51 insertions, 41 deletions
diff --git a/tools/libxc/xg_private.c b/tools/libxc/xg_private.c index 23d8f8b695..63ffea4aad 100644 --- a/tools/libxc/xg_private.c +++ b/tools/libxc/xg_private.c @@ -54,45 +54,45 @@ char *xc_read_image(const char *filename, unsigned long *size) #define CHUNK 1*1024*1024 while(1) { - if ( (tmp = realloc(image, *size + CHUNK)) == NULL ) - { - PERROR("Could not allocate memory for kernel image"); - free(image); - image = NULL; - goto out; - } - image = tmp; - - bytes = gzread(kernel_gfd, image + *size, CHUNK); - switch (bytes) - { - case -1: - PERROR("Error reading kernel image"); - free(image); - image = NULL; - goto out; - case 0: /* EOF */ - goto out; - default: - *size += bytes; - break; - } + if ( (tmp = realloc(image, *size + CHUNK)) == NULL ) + { + PERROR("Could not allocate memory for kernel image"); + free(image); + image = NULL; + goto out; + } + image = tmp; + + bytes = gzread(kernel_gfd, image + *size, CHUNK); + switch (bytes) + { + case -1: + PERROR("Error reading kernel image"); + free(image); + image = NULL; + goto out; + case 0: /* EOF */ + goto out; + default: + *size += bytes; + break; + } } #undef CHUNK out: if ( *size == 0 ) { - PERROR("Could not read kernel image"); - free(image); - image = NULL; + PERROR("Could not read kernel image"); + free(image); + image = NULL; } else if ( image ) { - /* Shrink allocation to fit image. */ - tmp = realloc(image, *size); - if ( tmp ) - image = tmp; + /* Shrink allocation to fit image. */ + tmp = realloc(image, *size); + if ( tmp ) + image = tmp; } if ( kernel_gfd != NULL ) @@ -189,29 +189,29 @@ unsigned long csum_page(void *page) } __attribute__((weak)) -int xc_hvm_build(int xc_handle, - uint32_t domid, - int memsize, - const char *image_name) + int xc_hvm_build(int xc_handle, + uint32_t domid, + int memsize, + const char *image_name) { errno = ENOSYS; return -1; } __attribute__((weak)) -int xc_hvm_save(int xc_handle, int io_fd, uint32_t dom, uint32_t max_iters, - uint32_t max_factor, uint32_t flags, - int (*suspend)(int domid)) + int xc_hvm_save(int xc_handle, int io_fd, uint32_t dom, uint32_t max_iters, + uint32_t max_factor, uint32_t flags, + int (*suspend)(int domid)) { errno = ENOSYS; return -1; } __attribute__((weak)) -int xc_hvm_restore(int xc_handle, int io_fd, uint32_t dom, - unsigned long max_pfn, unsigned int store_evtchn, - unsigned long *store_mfn, - unsigned int pae, unsigned int apic) + int xc_hvm_restore(int xc_handle, int io_fd, uint32_t dom, + unsigned long max_pfn, unsigned int store_evtchn, + unsigned long *store_mfn, + unsigned int pae, unsigned int apic) { errno = ENOSYS; return -1; @@ -228,3 +228,13 @@ __attribute__((weak)) int xc_set_hvm_param( { return -ENOSYS; } + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ |