[med-svn] [htslib] 06/10: Merge branch 'pr551' into pr551_merge

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to annotated tag 1.5
in repository htslib.

commit f1b95e10fd5b7e579cf0e4f58396e7dfa8f934dc
Merge: 7fd21f5 3c0302d
Author: Rob Davies <rmd+git at sanger.ac.uk>
Date:   Sun Jun 18 18:00:04 2017 +0100

    Merge branch 'pr551' into pr551_merge

 Makefile            |   2 +-
 faidx.c             |  19 ++++-----
 hts.c               |   8 ++--
 htslib/hts_log.h    |   2 +
 htslib/vcf.h        |   2 +-
 knetfile.c          |  25 +++++------
 regidx.c            |  16 +++----
 sam.c               |  14 +++----
 synced_bcf_reader.c |  46 +++++++++++---------
 tbx.c               |   5 ++-
 vcf.c               | 118 +++++++++++++++++++++++++++-------------------------
 vcfutils.c          |  10 ++---
 12 files changed, 140 insertions(+), 127 deletions(-)

diff --cc hts.c
index 8e17d16,355d51d..1c6ca8a
--- a/hts.c
+++ b/hts.c
@@@ -588,12 -587,8 +588,12 @@@ int hts_opt_add(hts_opt **opts, const c
               strcmp(o->arg, "NAME_PREFIX") == 0)
          o->opt = CRAM_OPT_PREFIX, o->val.s = val;
  
 +    else if (strcmp(o->arg, "block_size") == 0 ||
 +             strcmp(o->arg, "BLOCK_SIZE") == 0)
 +        o->opt = HTS_OPT_BLOCK_SIZE, o->val.i = strtol(val, NULL, 0);
 +
      else {
-         fprintf(stderr, "Unknown option '%s'\n", o->arg);
+         hts_log_error("Unknown option '%s'", o->arg);
          free(o->arg);
          free(o);
          return -1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htslib.git