]> git.kaiwu.me - klib.git/commitdiff
minor changes
authorHeng Li <lh3@live.co.uk>
Fri, 28 Oct 2011 20:15:33 +0000 (16:15 -0400)
committerHeng Li <lh3@live.co.uk>
Fri, 28 Oct 2011 20:15:33 +0000 (16:15 -0400)
bgzf.c
bgzf.h

diff --git a/bgzf.c b/bgzf.c
index 3bea7182d0384e9e4015ba7d1c69e78d16c33da6..9833414f914af104ee90159f45bd95fc4d08fb47 100644 (file)
--- a/bgzf.c
+++ b/bgzf.c
@@ -104,8 +104,8 @@ static BGZF *bgzf_read_init()
        BGZF *fp;
        fp = calloc(1, sizeof(BGZF));
        fp->open_mode = 'r';
-       fp->uncompressed_block = malloc(BGZF_BLOCK_SIZE);
-       fp->compressed_block = malloc(BGZF_BLOCK_SIZE);
+       fp->uncompressed_block = malloc(BGZF_MAX_BLOCK_SIZE);
+       fp->compressed_block = malloc(BGZF_MAX_BLOCK_SIZE);
 #ifdef BGZF_CACHE
        fp->cache = kh_init(cache);
 #endif
@@ -117,8 +117,8 @@ static BGZF *bgzf_write_init(int compress_level) // compress_level==-1 for the d
        BGZF *fp;
        fp = calloc(1, sizeof(BGZF));
        fp->open_mode = 'w';
-       fp->uncompressed_block = malloc(BGZF_BLOCK_SIZE);
-       fp->compressed_block = malloc(BGZF_BLOCK_SIZE);
+       fp->uncompressed_block = malloc(BGZF_MAX_BLOCK_SIZE);
+       fp->compressed_block = malloc(BGZF_MAX_BLOCK_SIZE);
        fp->compress_level = compress_level < 0? Z_DEFAULT_COMPRESSION : compress_level; // Z_DEFAULT_COMPRESSION==-1
        if (fp->compress_level > 9) fp->compress_level = Z_DEFAULT_COMPRESSION;
        return fp;
diff --git a/bgzf.h b/bgzf.h
index 1fdf6259d5d860973ac25465049162b1889b52c0..888df8ca72fb2c208f0cafa3460d0bcdf6ef3051 100644 (file)
--- a/bgzf.h
+++ b/bgzf.h
@@ -32,7 +32,8 @@
 #include <stdio.h>
 #include <zlib.h>
 
-#define BGZF_BLOCK_SIZE 0x10000 // 64k
+#define BGZF_BLOCK_SIZE     0x10000
+#define BGZF_MAX_BLOCK_SIZE 0x10000
 
 #define BGZF_ERR_ZLIB   1
 #define BGZF_ERR_HEADER 2
@@ -71,7 +72,7 @@ extern "C" {
         * @param fd    file descriptor
         * @param mode  mode matching /[rwu0-9]+/: 'r' for reading, 'w' for writing and a digit specifies
         *              the zlib compression level; if both 'r' and 'w' are present, 'w' is ignored.
-     * @return      BGZF file handler; 0 on error
+        * @return      BGZF file handler; 0 on error
         */
        BGZF* bgzf_dopen(int fd, const char *mode);