Some cleanup in obviously wrong 15-year-old code.

7 files changed, 19 insertions, 18 deletions

diff --git a/src/htscatchurl.c b/src/htscatchurl.c
index f015a75..53c3102 100644
--- a/src/htscatchurl.c
+++ b/src/htscatchurl.c
@@ -198,11 +198,12 @@ HTSEXT_API int catch_url(T_SOC soc, char *url, char *method, char *data) {
           char BIGSTK url_fil[HTS_URLMAXSIZE * 2];
 
           // méthode en majuscule
-          int i, r = 0;
+          size_t i;
+          int r = 0;
 
           url_adr[0] = url_fil[0] = '\0';
           //
-          for(i = 0; i < (int) strlen(method); i++) {
+          for(i = 0; method[i] != '\0'; i++) {
             if ((method[i] >= 'a') && (method[i] <= 'z'))
               method[i] -= ('a' - 'A');
           }
diff --git a/src/htscore.c b/src/htscore.c
index 3315409..578df60 100644
--- a/src/htscore.c
+++ b/src/htscore.c
@@ -2904,16 +2904,16 @@ void usercommand(httrackp * opt, int _exe, const char *_cmd, const char *file,
 }
 void usercommand_exe(const char *cmd, const char *file) {
   char BIGSTK temp[8192];
-  char c[2] = "";
-  int i;
+  size_t i;
 
   temp[0] = '\0';
   //
-  for(i = 0; i < (int) strlen(cmd); i++) {
+  for(i = 0; cmd[i] != '\0'; i++) {
     if ((cmd[i] == '$') && (cmd[i + 1] == '0')) {
       strcatbuff(temp, file);
       i++;
     } else {
+      char c[2];
       c[0] = cmd[i];
       c[1] = '\0';
       strcatbuff(temp, c);
diff --git a/src/htscoremain.c b/src/htscoremain.c
index 80e9d92..b8cabe5 100644
--- a/src/htscoremain.c
+++ b/src/htscoremain.c
@@ -3069,10 +3069,10 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
             if (((strchr(argv[i], ' ') != NULL)
                  || (strchr(argv[i], '"') != NULL)
                  || (strchr(argv[i], '\\') != NULL)) && (argv[i][0] != '"')) {
-              int j;
+              size_t j;
 
               fprintf(fp, "\"");
-              for(j = 0; j < (int) strlen(argv[i]); j++) {
+              for(j = 0; argv[i][j] != '\0'; j++) {
                 if (argv[i][j] == 34)
                   fprintf(fp, "\\\"");
                 else if (argv[i][j] == '\\')
diff --git a/src/htsjava.c b/src/htsjava.c
index 16ec55c..35ab9f9 100644
--- a/src/htsjava.c
+++ b/src/htsjava.c
@@ -485,7 +485,7 @@ static int tris(httrackp * opt, char *buffer) {
 static char *printname(char rname[1024], char name[1024]) {
   char *p;
   char *p1;
-  int j;
+  size_t j;
 
   rname[0] = '\0';
   //
@@ -497,7 +497,7 @@ static char *printname(char rname[1024], char name[1024]) {
   p += 2;
   //rname=(char*)calloct(strlen(name)+8,sizeof(char));
   p1 = rname;
-  for(j = 0; j < (int) strlen(name); j++, p++) {
+  for(j = 0; name[j] != '\0'; j++, p++) {
     if (*p == '/')
       *p1 = '.';
     if (*p == ';') {
diff --git a/src/htsname.c b/src/htsname.c
index 4e3b763..0570edf 100644
--- a/src/htsname.c
+++ b/src/htsname.c
@@ -1181,7 +1181,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
       }
       break;
     case 99:{                  // 'codé' .. c'est un gadget
-        int i;
+        size_t i;
         int j;
         char *a;
         char C[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-";
@@ -1191,10 +1191,10 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
         unsigned int s = 0;
 
         L = (int) strlen(C);
-        for(i = 0; i < (int) strlen(fil_complete); i++) {
+        for(i = 0; fil_complete[i] != '\0'; i++) {
           s += (unsigned int) fil_complete[i];
         }
-        for(i = 0; i < (int) strlen(adr_complete); i++) {
+        for(i = 0; adr_complete[i] != '\0'; i++) {
           s += (unsigned int) adr_complete[i];
         }
         srand(s);
diff --git a/src/htsserver.h b/src/htsserver.h
index 27ba90d..51a44b2 100644
--- a/src/htsserver.h
+++ b/src/htsserver.h
@@ -273,9 +273,9 @@ static int ehex(char *s) {
 }
 
 HTS_UNUSED static void unescapehttp(char *s, String * tempo) {
-  int i;
+  size_t i;
 
-  for(i = 0; i < (int) strlen(s); i++) {
+  for(i = 0; i < s[i] != '\0'; i++) {
     if (s[i] == '%' && s[i + 1] == '%') {
       i++;
       StringAddchar(*tempo, '%');
@@ -294,10 +294,10 @@ HTS_UNUSED static void unescapehttp(char *s, String * tempo) {
 }
 
 HTS_UNUSED static void unescapeini(char *s, String * tempo) {
-  int i;
+  size_t i;
   char lastc = 0;
 
-  for(i = 0; i < (int) strlen(s); i++) {
+  for(i = 0; s[i] != '\0'; i++) {
     if (s[i] == '%' && s[i + 1] == '%') {
       i++;
       StringAddchar(*tempo, lastc = '%');
diff --git a/src/htstools.c b/src/htstools.c
index 7c543f6..65f868a 100644
--- a/src/htstools.c
+++ b/src/htstools.c
@@ -97,9 +97,9 @@ static int ehex(char *s) {
 }
 
 static void unescapehttp(char *s, String * tempo) {
-  int i;
+  size_t i;
 
-  for(i = 0; i < (int) strlen(s); i++) {
+  for(i = 0; i < s[i] != '\0'; i++) {
     if (s[i] == '%' && s[i + 1] == '%') {
       i++;
       StringAddchar(*tempo, '%');