projects
/
tabix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.1.2
[tabix.git]
/
index.c
diff --git
a/index.c
b/index.c
index 80b863d3f84d53ea4c8eafb612db56150c94870a..704b037d2add76bf0c9d02624c3f449ac2bd314b 100644
(file)
--- a/
index.c
+++ b/
index.c
@@
-158,7
+158,7
@@
static int get_intv(ti_index_t *idx, kstring_t *str, ti_intv_t *intv)
intv->tid = get_tid(idx, str->s + b);
if (i != str->l) str->s[i] = '\t';
} else if (id == idx->conf.bc) {
intv->tid = get_tid(idx, str->s + b);
if (i != str->l) str->s[i] = '\t';
} else if (id == idx->conf.bc) {
- // here ->beg is
1-based. it will be changed to 0-based at the end of this routine
.
+ // here ->beg is
0-based
.
intv->beg = intv->end = strtol(str->s + b, &s, 0);
if (!(idx->conf.preset&TI_FLAG_UCSC)) --intv->beg;
} else {
intv->beg = intv->end = strtol(str->s + b, &s, 0);
if (!(idx->conf.preset&TI_FLAG_UCSC)) --intv->beg;
} else {
@@
-174,7
+174,7
@@
static int get_intv(ti_index_t *idx, kstring_t *str, ti_intv_t *intv)
if (op == 'M' || op == 'D' || op == 'N') l += x;
s = t + 1;
}
if (op == 'M' || op == 'D' || op == 'N') l += x;
s = t + 1;
}
- intv->end = intv->beg + l
- 1
;
+ intv->end = intv->beg + l;
}
} else if ((idx->conf.preset&0xffff) == TI_PRESET_VCF) {
// FIXME: the following is NOT tested and is likely to be buggy
}
} else if ((idx->conf.preset&0xffff) == TI_PRESET_VCF) {
// FIXME: the following is NOT tested and is likely to be buggy
@@
-188,7
+188,7
@@
static int get_intv(ti_index_t *idx, kstring_t *str, ti_intv_t *intv)
s = t + 1;
} else ++s;
}
s = t + 1;
} else ++s;
}
- intv->end = intv->beg + max
- 1
;
+ intv->end = intv->beg + max;
}
}
}
}
}
}
@@
-197,7
+197,7
@@
static int get_intv(ti_index_t *idx, kstring_t *str, ti_intv_t *intv)
}
}
if (intv->tid < 0 || intv->beg < 0 || intv->end < 0) return -1;
}
}
if (intv->tid < 0 || intv->beg < 0 || intv->end < 0) return -1;
- intv->bin = ti_reg2bin(intv->beg
-1
, intv->end);
+ intv->bin = ti_reg2bin(intv->beg, intv->end);
return 0;
}
return 0;
}