Merge branch 'master' of https://github.com/dpryan79/libBigWig

dpryan79 · Jan 12, 2016 · d366e44 · d366e44
2 parents 78e4012 + 41bb6ed
commit d366e44
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 CC ?= gcc
 AR ?= ar
 RANLIB ?= ranlib
-CFLAGS ?= -g -Wall -O3
+CFLAGS ?= -g -Wall -O3 -Wsign-compare
 LIBS = -lcurl -lm -lz
 EXTRA_CFLAGS_PIC = -fpic
 LDFLAGS =

diff --git a/test/testLocal.c b/test/testLocal.c
@@ -6,6 +6,7 @@
 
 void bwPrintHdr(bigWigFile_t *bw) {
     uint64_t i;
+    int64_t i64;
     printf("Version:    %"PRIu16"\n", bw->hdr->version);
     printf("Levels:     %"PRIu16"\n", bw->hdr->nLevels);
     printf("ctOffset:   0x%"PRIx64"\n", bw->hdr->ctOffset);
@@ -33,8 +34,8 @@ void bwPrintHdr(bigWigFile_t *bw) {
     if(bw->cl) {
         printf("Chromosome List\n");
         printf("  idx\tChrom\tLength (bases)\n");
-        for(i=0; i<bw->cl->nKeys; i++) {
-            printf("  %"PRIu64"\t%s\t%"PRIu32"\n", i, bw->cl->chrom[i], bw->cl->len[i]);
+        for(i64=0; i64<bw->cl->nKeys; i64++) {
+            printf("  %"PRIu64"\t%s\t%"PRIu32"\n", i64, bw->cl->chrom[i64], bw->cl->len[i64]);
         }
     }
 }

diff --git a/test/testRemote.c b/test/testRemote.c
@@ -7,6 +7,7 @@
 //Print overly verbose header information
 void bwPrintHdr(bigWigFile_t *bw) {
     uint64_t i;
+    int64_t i64;
     printf("Version:    %"PRIu16"\n", bw->hdr->version);
     printf("Levels:     %"PRIu16"\n", bw->hdr->nLevels);
     printf("ctOffset:   0x%"PRIx64"\n", bw->hdr->ctOffset);
@@ -34,8 +35,8 @@ void bwPrintHdr(bigWigFile_t *bw) {
     if(bw->cl) {
         printf("Chromosome List\n");
         printf("  idx\tChrom\tLength (bases)\n");
-        for(i=0; i<bw->cl->nKeys; i++) {
-            printf("  %"PRIu64"\t%s\t%"PRIu32"\n", i, bw->cl->chrom[i], bw->cl->len[i]);
+        for(i64=0; i64<bw->cl->nKeys; i64++) {
+            printf("  %"PRIu64"\t%s\t%"PRIu32"\n", i64, bw->cl->chrom[i64], bw->cl->len[i64]);
         }
     }
 }