From 8af17b34787c7fe35d65598c98a8afd3018c1dbe Mon Sep 17 00:00:00 2001 From: Heng Li Date: Fri, 17 Oct 2014 12:14:18 -0400 Subject: [PATCH] r912: very minor improvement --- bwashm.c | 8 ++++---- main.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bwashm.c b/bwashm.c index fe187ff..163f764 100644 --- a/bwashm.c +++ b/bwashm.c @@ -53,15 +53,15 @@ int bwa_shm_stage(bwaidx_t *idx, const char *hint, const char *_tmpfn) } strcat(strcpy(path, "/bwaidx-"), name); - l = 8 + strlen(name) + 1; - if (cnt[1] + l > BWA_CTL_SIZE) return -1; - memcpy(shm + cnt[1], &idx->l_mem, 8); - memcpy(shm + cnt[1] + 8, name, l - 8); if ((shmid = shm_open(path, O_CREAT|O_RDWR|O_EXCL, 0644)) < 0) { shm_unlink(path); perror("shm_open()"); return -1; } + l = 8 + strlen(name) + 1; + if (cnt[1] + l > BWA_CTL_SIZE) return -1; + memcpy(shm + cnt[1], &idx->l_mem, 8); + memcpy(shm + cnt[1] + 8, name, l - 8); cnt[1] += l; ++cnt[0]; ftruncate(shmid, idx->l_mem); shm_idx = mmap(0, idx->l_mem, PROT_READ|PROT_WRITE, MAP_SHARED, shmid, 0); diff --git a/main.c b/main.c index aaf3c98..e0f0edb 100644 --- a/main.c +++ b/main.c @@ -4,7 +4,7 @@ #include "utils.h" #ifndef PACKAGE_VERSION -#define PACKAGE_VERSION "0.7.10-r911-dirty" +#define PACKAGE_VERSION "0.7.10-r912-dirty" #endif int bwa_fa2pac(int argc, char *argv[]);