3aa934c99d7ce21128bebdf2d3b9055922901ec4 hiram Sat Jan 5 15:38:11 2019 -0800 mostly minor cosmetic fixups to satisify gcc-7 warnings no redmine diff --git src/htslib/vcf.c src/htslib/vcf.c index 0e7a075..a181f31 100644 --- src/htslib/vcf.c +++ src/htslib/vcf.c @@ -2087,31 +2087,31 @@ if ( bcf_float_is_missing(v->qual) ) kputc('.', s); // QUAL else ksprintf(s, "%g", v->qual); kputc('\t', s); // FILTER if (v->d.n_flt) { for (i = 0; i < v->d.n_flt; ++i) { if (i) kputc(';', s); kputs(h->id[BCF_DT_ID][v->d.flt[i]].key, s); } } else kputc('.', s); kputc('\t', s); // INFO if (v->n_info) { int first = 1; for (i = 0; i < v->n_info; ++i) { bcf_info_t *z = &v->d.info[i]; if ( !z->vptr ) continue; - if ( !first ) kputc(';', s); first = 0; + if ( !first ) { kputc(';', s); first = 0; } kputs(h->id[BCF_DT_ID][z->key].key, s); if (z->len <= 0) continue; kputc('=', s); if (z->len == 1) { switch (z->type) { case BCF_BT_INT8: if ( z->v1.i==bcf_int8_missing ) kputc('.', s); else kputw(z->v1.i, s); break; case BCF_BT_INT16: if ( z->v1.i==bcf_int16_missing ) kputc('.', s); else kputw(z->v1.i, s); break; case BCF_BT_INT32: if ( z->v1.i==bcf_int32_missing ) kputc('.', s); else kputw(z->v1.i, s); break; case BCF_BT_FLOAT: if ( bcf_float_is_missing(z->v1.f) ) kputc('.', s); else ksprintf(s, "%g", z->v1.f); break; case BCF_BT_CHAR: kputc(z->v1.i, s); break; default: fprintf(stderr,"todo: type %d\n", z->type); exit(1); break; } } @@ -2134,31 +2134,31 @@ if ( fmt[i].id<0 ) //!bcf_hdr_idinfo_exists(h,BCF_HL_FMT,fmt[i].id) ) { fprintf(stderr, "[E::%s] invalid BCF, the FORMAT tag id=%d not present in the header.\n", __func__, fmt[i].id); abort(); } kputs(h->id[BCF_DT_ID][fmt[i].id].key, s); if (strcmp(h->id[BCF_DT_ID][fmt[i].id].key, "GT") == 0) gt_i = i; } if ( first ) kputs("\t.", s); for (j = 0; j < v->n_sample; ++j) { kputc('\t', s); first = 1; for (i = 0; i < (int)v->n_fmt; ++i) { bcf_fmt_t *f = &fmt[i]; if ( !f->p ) continue; - if (!first) kputc(':', s); first = 0; + if (!first) { kputc(':', s); first = 0; } if (gt_i == i) bcf_format_gt(f,j,s); else bcf_fmt_array(s, f->n, f->type, f->p + j * f->size); } if ( first ) kputc('.', s); } } else for (j=0; j<=v->n_sample; j++) kputs("\t.", s); } kputc('\n', s); return 0; }