172c9065c1e6d94aabd25f63b238f17b9a51bffc
braney
  Tue Jul 12 08:49:47 2016 -0700
fix some compiler warnings in htslib

diff --git src/htslib/hts.c src/htslib/hts.c
index a580bba..2f8d9f5 100644
--- src/htslib/hts.c
+++ src/htslib/hts.c
@@ -1955,39 +1955,39 @@
                 iter->curr_tid = tid;
                 iter->curr_beg = beg;
                 iter->curr_end = end;
                 return ret;
             }
         } else break; // end of file or error
     }
     iter->finished = 1;
     return ret;
 }
 
 /**********************
  *** Retrieve index ***
  **********************/
 
-static char *test_and_fetch(const char *fn)
+static const char *test_and_fetch(const char *fn)
 {
     FILE *fp;
     if (hisremote(fn)) {
-        const int buf_size = 1 * 1024 * 1024;
         hFILE *fp_remote;
+#ifdef NOTNOW
+        const int buf_size = 1 * 1024 * 1024;
         uint8_t *buf;
         int l;
-#ifdef NOTNOW
         const char *p;
         for (p = fn + strlen(fn) - 1; p >= fn; --p)
             if (*p == '/') break;
         ++p; // p now points to the local file name
         // Attempt to open local file first
         if ((fp = fopen((char*)p, "rb")) != 0)
         {
             fclose(fp);
             return (char*)p;
         }
 #endif
         // Attempt to open remote file. Stay quiet on failure, it is OK to fail when trying first .csi then .tbi index.
         if ((fp_remote = hopen(fn, "r")) == 0) return 0;
 hclose(fp_remote);
 return fn;
@@ -2003,31 +2003,32 @@
         free(buf);
         fclose(fp);
         if (hclose(fp_remote) != 0) fprintf(stderr, "[E::%s] fail to close remote file '%s'\n", __func__, fn);
         return (char*)p;
 #endif
     } else {
         if ((fp = fopen(fn, "rb")) == 0) return 0;
         fclose(fp);
         return (char*)fn;
     }
 }
 
 char *hts_idx_getfn(const char *fn, const char *ext)
 {
     int i, l_fn, l_ext;
-    char *fnidx, *ret;
+    char *fnidx;
+    const char *ret;
     l_fn = strlen(fn); l_ext = strlen(ext);
     fnidx = (char*)calloc(l_fn + l_ext + 1, 1);
     strcpy(fnidx, fn); strcpy(fnidx + l_fn, ext);
     if ((ret = test_and_fetch(fnidx)) == 0) {
         for (i = l_fn - 1; i > 0; --i)
             if (fnidx[i] == '.') break;
         strcpy(fnidx + i, ext);
         ret = test_and_fetch(fnidx);
     }
     if (ret == 0) {
         free(fnidx);
         return 0;
     }
     l_fn = strlen(ret);
     memmove(fnidx, ret, l_fn + 1);