From 180faa3594a9e8d6f02027f02915c62e72b36452 Mon Sep 17 00:00:00 2001 From: Heng Li Date: Fri, 21 Apr 2023 11:09:07 -0400 Subject: [PATCH] r1171: add operator priority explicit with () I can never remember the operator priority of & and && --- format.c | 4 ++-- minimap.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/format.c b/format.c index f2d4899..fc03f00 100644 --- a/format.c +++ b/format.c @@ -370,7 +370,7 @@ static void write_sam_cigar(kstring_t *s, int sam_flag, int in_tag, int qlen, co clip_len[0] = r->rev? qlen - r->qe : r->qs; clip_len[1] = r->rev? r->qs : qlen - r->qe; if (in_tag) { - int clip_char = ((sam_flag&0x800 || (sam_flag&0x100 && opt_flag&MM_F_SECONDARY_SEQ)) && + int clip_char = (((sam_flag&0x800) || ((sam_flag&0x100) && (opt_flag&MM_F_SECONDARY_SEQ))) && !(opt_flag&MM_F_SOFTCLIP)) ? 5 : 4; mm_sprintf_lite(s, "\tCG:B:I"); if (clip_len[0]) mm_sprintf_lite(s, ",%u", clip_len[0]<<4|clip_char); @@ -378,7 +378,7 @@ static void write_sam_cigar(kstring_t *s, int sam_flag, int in_tag, int qlen, co mm_sprintf_lite(s, ",%u", r->p->cigar[k]); if (clip_len[1]) mm_sprintf_lite(s, ",%u", clip_len[1]<<4|clip_char); } else { - int clip_char = ((sam_flag&0x800 || (sam_flag&0x100 && opt_flag&MM_F_SECONDARY_SEQ)) && + int clip_char = (((sam_flag&0x800) || ((sam_flag&0x100) && (opt_flag&MM_F_SECONDARY_SEQ))) && !(opt_flag&MM_F_SOFTCLIP)) ? 'H' : 'S'; assert(clip_len[0] < qlen && clip_len[1] < qlen); if (clip_len[0]) mm_sprintf_lite(s, "%d%c", clip_len[0], clip_char); diff --git a/minimap.h b/minimap.h index 0e22792..05ab62c 100644 --- a/minimap.h +++ b/minimap.h @@ -5,7 +5,7 @@ #include #include -#define MM_VERSION "2.24-r1169-dirty" +#define MM_VERSION "2.24-r1171-dirty" #define MM_F_NO_DIAG (0x001LL) // no exact diagonal hit #define MM_F_NO_DUAL (0x002LL) // skip pairs where query name is lexicographically larger than target name