Use INT64_MAX

Author: jkbonfield

hts.c

@@ -2692,7 +2692,7 @@ const char *hts_parse_region(const char *s, int *tid, int64_t *beg, int64_t *end
     if (!s || !tid || !beg || !end || !getid)
         return NULL;
 
-    int s_len = strlen(s); // int is sufficient given beg/end types
+    size_t s_len = strlen(s);
     kstring_t ks = { 0, 0, NULL };
 
     const char *colon = NULL, *comma = NULL;
@@ -2741,7 +2741,7 @@ const char *hts_parse_region(const char *s, int *tid, int64_t *beg, int64_t *end
 
     // No colon is simplest case; just check and return.
     if (colon == NULL) {
-        *beg = 0; *end = INT_MAX;
+        *beg = 0; *end = INT64_MAX;
         kputsn(s, s_len-quoted, &ks); // convert to nul terminated string
         if (!ks.s) {
             *tid = -1;
@@ -2756,7 +2756,7 @@ const char *hts_parse_region(const char *s, int *tid, int64_t *beg, int64_t *end
 
     // Has a colon, but check whole name first.
     if (!quoted) {
-        *beg = 0; *end = INT_MAX;
+        *beg = 0; *end = INT64_MAX;
         kputsn(s, s_len, &ks); // convert to nul terminated string
         if (!ks.s) {
             *tid = -1;
@@ -2805,7 +2805,7 @@ const char *hts_parse_region(const char *s, int *tid, int64_t *beg, int64_t *end
     if (*beg < 0) {
         if (isdigit(*hyphen) || *hyphen == '\0' || *hyphen == ',') {
             // interpret chr:-100 as chr:1-100
-            *end = *beg==-1 ? INT_MAX : -(*beg+1);
+            *end = *beg==-1 ? INT64_MAX : -(*beg+1);
             *beg = 0;
             return s_end;
         } else if (*hyphen == '-') {
@@ -2817,7 +2817,7 @@ const char *hts_parse_region(const char *s, int *tid, int64_t *beg, int64_t *end
     }
 
     if (*hyphen == '\0' || ((flags & HTS_PARSE_LIST) && *hyphen == ',')) {
-        *end = flags & HTS_PARSE_ONE_COORD ? *beg+1 : INT_MAX;
+        *end = flags & HTS_PARSE_ONE_COORD ? *beg+1 : INT64_MAX;
     } else if (*hyphen == '-') {
         *end = hts_parse_decimal(hyphen+1, &hyphen, flags);
         if (*hyphen != '\0' && *hyphen != ',') {
@@ -2830,7 +2830,7 @@ const char *hts_parse_region(const char *s, int *tid, int64_t *beg, int64_t *end
     }
 
     if (*end == 0)
-        *end = INT_MAX; // interpret chr:100- as chr:100-<end>
+        *end = INT64_MAX; // interpret chr:100- as chr:100-<end>
 
     if (*beg >= *end) return NULL;
 

test/test-parse-reg.c

@@ -87,39 +87,38 @@ int reg_test(char *fn) {
     // 5 chr1,chr3
 
     // Check range extensions.
-    // NB: fix INT_MAX once we merge the 64-bit pos code.
-    reg_expected(hdr, "chr1", 0, "",  0, 0, INT_MAX);
-    reg_expected(hdr, "chr1:50", 0, "",  0, 49, INT_MAX);
+    reg_expected(hdr, "chr1", 0, "",  0, 0, INT64_MAX);
+    reg_expected(hdr, "chr1:50", 0, "",  0, 49, INT64_MAX);
     reg_expected(hdr, "chr1:50", HTS_PARSE_ONE_COORD, "",  0, 49, 50);
     reg_expected(hdr, "chr1:50-100", 0, "",  0, 49, 100);
-    reg_expected(hdr, "chr1:50-", 0, "",  0, 49, INT_MAX);
+    reg_expected(hdr, "chr1:50-", 0, "",  0, 49, INT64_MAX);
     reg_expected(hdr, "chr1:-50", 0, "",  0, 0, 50);
 
     // Check quoting
     fprintf(stderr, "Expected error: ");
     reg_expected(hdr, "chr1:100-200", 0, NULL,  0, 0, 0); // ambiguous
     reg_expected(hdr, "{chr1}:100-200", 0, "",  0, 99, 200);
-    reg_expected(hdr, "{chr1:100-200}", 0, "",  2, 0, INT_MAX);
+    reg_expected(hdr, "{chr1:100-200}", 0, "",  2, 0, INT64_MAX);
     reg_expected(hdr, "{chr1:100-200}:100-200", 0, "",  2, 99, 200);
     reg_expected(hdr, "{chr2:100-200}:100-200", 0, "",  3, 99, 200);
     reg_expected(hdr, "chr2:100-200:100-200", 0, "",  3, 99, 200);
-    reg_expected(hdr, "chr2:100-200", 0, "",  3, 0, INT_MAX);
+    reg_expected(hdr, "chr2:100-200", 0, "",  3, 0, INT64_MAX);
 
     // Check numerics
-    reg_expected(hdr, "chr3", 0, "",  4, 0, INT_MAX);
-    reg_expected(hdr, "chr3:", 0, "",  4, 0, INT_MAX);
+    reg_expected(hdr, "chr3", 0, "",  4, 0, INT64_MAX);
+    reg_expected(hdr, "chr3:", 0, "",  4, 0, INT64_MAX);
     reg_expected(hdr, "chr3:1000-1500", 0, "",  4, 999, 1500);
     reg_expected(hdr, "chr3:1,000-1,500", 0, "",  4, 999, 1500);
     reg_expected(hdr, "chr3:1k-1.5K", 0, "",  4, 999, 1500);
     reg_expected(hdr, "chr3:1e3-1.5e3", 0, "",  4, 999, 1500);
     reg_expected(hdr, "chr3:1e3-15e2", 0, "",  4, 999, 1500);
 
     // Check list mode
-    reg_expected(hdr, "chr1,chr3", HTS_PARSE_LIST, "chr3", 0, 0, INT_MAX);
+    reg_expected(hdr, "chr1,chr3", HTS_PARSE_LIST, "chr3", 0, 0, INT64_MAX);
     fprintf(stderr, "Expected error: ");
     reg_expected(hdr, "chr1:100-200,chr3", HTS_PARSE_LIST, NULL,  0, 0, 0); // ambiguous
-    reg_expected(hdr, "{chr1,chr3}", HTS_PARSE_LIST, "", 5, 0, INT_MAX);
-    reg_expected(hdr, "{chr1,chr3},chr1", HTS_PARSE_LIST, "chr1", 5, 0, INT_MAX);
+    reg_expected(hdr, "{chr1,chr3}", HTS_PARSE_LIST, "", 5, 0, INT64_MAX);
+    reg_expected(hdr, "{chr1,chr3},chr1", HTS_PARSE_LIST, "chr1", 5, 0, INT64_MAX);
     // incorrect usage; first reg is valid (but not what user expects).
     reg_expected(hdr, "chr3:1,000-1,500", HTS_PARSE_LIST | HTS_PARSE_ONE_COORD, "000-1,500",  4, 0, 1);