packing update

[qemu] / block-dmg.c

diff --git a/block-dmg.c b/block-dmg.c
index a883a23..82f6de1 100644 (file)
--- a/block-dmg.c
+++ b/block-dmg.c
@@ -1,8 +1,8 @@
 /*
  * QEMU Block driver for DMG images
- * 
+ *
  * Copyright (c) 2004 Johannes E. Schindelin
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -21,14 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "vl.h"
+#include "qemu-common.h"
 #include "block_int.h"
 #include "bswap.h"
 #include <zlib.h>
 
 typedef struct BDRVDMGState {
     int fd;
-    
+
     /* each chunk contains a certain number of sectors,
      * offsets[i] is the offset in the .dmg file,
      * lengths[i] is the length of the compressed chunk,
@@ -85,8 +85,8 @@ static int dmg_open(BlockDriverState *bs, const char *filename, int flags)
         return -errno;
     bs->read_only = 1;
     s->n_chunks = 0;
-    s->offsets = s->lengths = s->sectors = s->sectorcounts = 0;
-    
+    s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
+
     /* read offset of info blocks */
     if(lseek(s->fd,-0x1d8,SEEK_END)<0) {
 dmg_close:
@@ -125,11 +125,11 @@ dmg_close:
                goto dmg_close;
            chunk_count = (count-204)/40;
            new_size = sizeof(uint64_t) * (s->n_chunks + chunk_count);
-           s->types = realloc(s->types, new_size/2);
-           s->offsets = realloc(s->offsets, new_size);
-           s->lengths = realloc(s->lengths, new_size);
-           s->sectors = realloc(s->sectors, new_size);
-           s->sectorcounts = realloc(s->sectorcounts, new_size);
+           s->types = qemu_realloc(s->types, new_size/2);
+           s->offsets = qemu_realloc(s->offsets, new_size);
+           s->lengths = qemu_realloc(s->lengths, new_size);
+           s->sectors = qemu_realloc(s->sectors, new_size);
+           s->sectorcounts = qemu_realloc(s->sectorcounts, new_size);
 
            for(i=s->n_chunks;i<s->n_chunks+chunk_count;i++) {
                s->types[i] = read_uint32(s->fd);
@@ -159,15 +159,13 @@ dmg_close:
     }
 
     /* initialize zlib engine */
-    if(!(s->compressed_chunk = malloc(max_compressed_size+1)))
-       goto dmg_close;
-    if(!(s->uncompressed_chunk = malloc(512*max_sectors_per_chunk)))
-       goto dmg_close;
+    s->compressed_chunk = qemu_malloc(max_compressed_size+1);
+    s->uncompressed_chunk = qemu_malloc(512*max_sectors_per_chunk);
     if(inflateInit(&s->zstream) != Z_OK)
        goto dmg_close;
 
     s->current_chunk = s->n_chunks;
-    
+
     return 0;
 }
 
@@ -227,7 +225,7 @@ static inline int dmg_read_chunk(BDRVDMGState *s,int sector_num)
 
            if (ret != s->lengths[chunk])
                return -1;
-       
+
            s->zstream.next_in = s->compressed_chunk;
            s->zstream.avail_in = s->lengths[chunk];
            s->zstream.next_out = s->uncompressed_chunk;
@@ -253,7 +251,7 @@ static inline int dmg_read_chunk(BDRVDMGState *s,int sector_num)
     return 0;
 }
 
-static int dmg_read(BlockDriverState *bs, int64_t sector_num, 
+static int dmg_read(BlockDriverState *bs, int64_t sector_num,
                     uint8_t *buf, int nb_sectors)
 {
     BDRVDMGState *s = bs->opaque;
@@ -286,12 +284,10 @@ static void dmg_close(BlockDriverState *bs)
 }
 
 BlockDriver bdrv_dmg = {
-    "dmg",
-    sizeof(BDRVDMGState),
-    dmg_probe,
-    dmg_open,
-    dmg_read,
-    NULL,
-    dmg_close,
+    .format_name       = "dmg",
+    .instance_size     = sizeof(BDRVDMGState),
+    .bdrv_probe                = dmg_probe,
+    .bdrv_open         = dmg_open,
+    .bdrv_read         = dmg_read,
+    .bdrv_close                = dmg_close,
 };
-