Indenting cleanup for all *.[ch] files, except htsparse.c (too ugly to be automatically indented for now) and /minizip/, /mmsrip/ (external files)

setup:
  indent -l80 -lc80 -nhnl -nut -bad -bap -bbo -br -brf -bli2 -brs -bls -br -ss -sai -pmt -nsaw -nsaf -nprs -i2 -ce -npsl -npcs -cs -sob -cdw -nbc -lp

logs:
indent: ./src/htsback.c:157: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:1417: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:1826: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:1833: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:1981: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:2685: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:2747: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:2861: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:3128: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:3512: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htswizard.c:140: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htswizard.c:597: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htswizard.c:598: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htswizard.c:611: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:97: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:106: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:106: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:256: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:262: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:935: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:271: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:272: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:273: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:274: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:275: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:276: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:277: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:278: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:279: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:280: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:281: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:662: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:752: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:413: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:414: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:415: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:416: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:417: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:418: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:419: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:420: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:421: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:422: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:423: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:188: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:507: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:508: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:509: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:510: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:511: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:512: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:580: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:581: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:115: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:246: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:247: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:248: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:249: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:250: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:251: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:314: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:315: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:151: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:158: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:161: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:166: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:174: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:177: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:188: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:243: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:245: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:248: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:257: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:647: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsbauth.c:364: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsbauth.c:387: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htscache.c:473: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsserver.h:112: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsserver.h:187: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsjava.c:312: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsjava.c:379: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsjava.c:407: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsjava.c:472: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsjava.c:483: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htslib.c:593: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:809: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:1743: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:1874: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:1896: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:1984: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2085: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2604: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2605: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2606: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2607: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2608: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2609: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2672: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2673: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2906: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2928: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2996: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:4802: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htslib.c:5353: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5354: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5355: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5357: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5429: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5435: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscore.c:208: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htscore.c:277: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htscore.c:279: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htscore.c:357: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htscore.c:394: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htscore.c:1544: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscore.c:3330: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscore.c:3361: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htshash.c:140: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htshash.c:217: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsname.c:733: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsname.c:749: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsname.c:933: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsname.c:1520: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htszlib.c:76: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htszlib.c:81: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscatchurl.c:268: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsinthash.c:156: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:159: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:176: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:179: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:226: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:253: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsftp.c:169: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsftp.c:177: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsfilters.c:67: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsfilters.c:80: Warning:old style assignment ambiguity in "=*".  Assuming "= *"

1 files changed, 129 insertions, 106 deletions

diff --git a/src/htsserver.h b/src/htsserver.h
index da176f5..29a8bb9 100644
--- a/src/htsserver.h
+++ b/src/htsserver.h
@@ -17,18 +17,15 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-
 Important notes:
 
 - We hereby ask people using this source NOT to use it in purpose of grabbing
 emails addresses, or collecting any other private information on persons.
 This would disgrace our work, and spoil the many hours we spent on it.
 
-
 Please visit our Website: http://www.httrack.com
 */
 
-
 /* ------------------------------------------------------------ */
 /* File: Mini-server                                            */
 /* Author: Xavier Roche                                         */
@@ -37,19 +34,18 @@ Please visit our Website: http://www.httrack.com
 // Fichier intercepteur d'URL .h
 
 #ifndef HTS_SERVER_DEFH
-#define HTS_SERVER_DEFH 
+#define HTS_SERVER_DEFH
 
 #include "htsnet.h"
 
 /* String */
 #include "htsstrings.h"
 
-
 // Fonctions
-void socinput(T_SOC soc,char* s,int max);
-T_SOC smallserver_init_std(int* port_prox,char* adr_prox,int defaultPort);
-T_SOC smallserver_init(int* port,char* adr);
-int smallserver(T_SOC soc,char* url,char* method,char* data, char* path);
+void socinput(T_SOC soc, char *s, int max);
+T_SOC smallserver_init_std(int *port_prox, char *adr_prox, int defaultPort);
+T_SOC smallserver_init(int *port, char *adr);
+int smallserver(T_SOC soc, char *url, char *method, char *data, char *path);
 
 #define CATCH_RESPONSE \
   "HTTP/1.0 200 OK\r\n"\
@@ -90,67 +86,76 @@ extern httrackp *global_opt;
 #define  is_quote(c)      (               ((c)=='\"')                                                    || ((c)=='\'') )
 #define  is_retorsep(c)   (                              ((c)==10) || ((c)==13) || ((c)==9)                                          )
 
-extern int smallserver_setkey(char* key, char* value);
-extern int smallserver_setkeyint(char* key, LLint value);
-extern int smallserver_setkeyarr(char* key, int id, char* key2, char* value);
-
+extern int smallserver_setkey(char *key, char *value);
+extern int smallserver_setkeyint(char *key, LLint value);
+extern int smallserver_setkeyarr(char *key, int id, char *key2, char *value);
 
 /* Language files */
-static int htslang_load(char* limit_to, char* apppath);
-static void conv_printf(char* from,char* to);
+static int htslang_load(char *limit_to, char *apppath);
+static void conv_printf(char *from, char *to);
 static void LANG_DELETE(void);
-static void LANG_INIT(char* path);
-static int LANG_T(char* path, int l);
+static void LANG_INIT(char *path);
+static int LANG_T(char *path, int l);
 static int QLANG_T(int l);
-static char* LANGSEL(char* name);
-static char* LANGINTKEY(char* name);
-static int LANG_SEARCH(char* path, char* iso);
-static int LANG_LIST(char* path, char* buffer);
+static char *LANGSEL(char *name);
+static char *LANGINTKEY(char *name);
+static int LANG_SEARCH(char *path, char *iso);
+static int LANG_LIST(char *path, char *buffer);
 
 int htslang_init(void);
 int htslang_uninit(void);
 
 /* Static definitions */
 
-static char* gethomedir(void);
-static int linput_cpp(FILE* fp,char* s,int max);
-static int linput_trim(FILE* fp,char* s,int max);
-static int fexist(const char* s);
-static int linput(FILE* fp,char* s,int max);
+static char *gethomedir(void);
+static int linput_cpp(FILE * fp, char *s, int max);
+static int linput_trim(FILE * fp, char *s, int max);
+static int fexist(const char *s);
+static int linput(FILE * fp, char *s, int max);
 
-static int linputsoc(T_SOC soc, char* s, int max) {
+static int linputsoc(T_SOC soc, char *s, int max) {
   int c;
-  int j=0;
+  int j = 0;
+
   do {
     unsigned char ch;
+
     if (recv(soc, &ch, 1, 0) == 1) {
       c = ch;
     } else {
       c = EOF;
     }
-    if (c!=EOF) {
-      switch(c) {
-        case 13: break;  // sauter CR
-        case 10: c=-1; break;
-        case 9: case 12: break;  // sauter ces caractères
-        default: s[j++]=(char) c; break;
+    if (c != EOF) {
+      switch (c) {
+      case 13:
+        break;                  // sauter CR
+      case 10:
+        c = -1;
+        break;
+      case 9:
+      case 12:
+        break;                  // sauter ces caractères
+      default:
+        s[j++] = (char) c;
+        break;
       }
     }
-  }  while((c!=-1) && (c!=EOF) && (j<(max-1)));
-  s[j]='\0';
+  } while((c != -1) && (c != EOF) && (j < (max - 1)));
+  s[j] = '\0';
   return j;
 }
 
 static int check_readinput_t(T_SOC soc, int timeout) {
   if (soc != INVALID_SOCKET) {
-    fd_set fds;           // poll structures
+    fd_set fds;                 // poll structures
     struct timeval tv;          // structure for select
+
     FD_ZERO(&fds);
-    FD_SET(soc,&fds);           
-    tv.tv_sec=timeout;
-    tv.tv_usec=0;
-    select(soc + 1,&fds,NULL,NULL,&tv);
-    if (FD_ISSET(soc,&fds))
+    FD_SET(soc, &fds);
+    tv.tv_sec = timeout;
+    tv.tv_usec = 0;
+    select(soc + 1, &fds, NULL, NULL, &tv);
+    if (FD_ISSET(soc, &fds))
       return 1;
     else
       return 0;
@@ -158,38 +163,42 @@ static int check_readinput_t(T_SOC soc, int timeout) {
     return 0;
 }
 
-static int linputsoc_t(T_SOC soc, char* s, int max, int timeout) {
+static int linputsoc_t(T_SOC soc, char *s, int max, int timeout) {
   if (check_readinput_t(soc, timeout)) {
     return linputsoc(soc, s, max);
   }
   return -1;
 }
 
-static char* gethomedir(void) {
-  char* home = getenv( "HOME" );
+static char *gethomedir(void) {
+  char *home = getenv("HOME");
+
   if (home)
     return home;
   else
     return ".";
 }
-static int linput_cpp(FILE* fp,char* s,int max) {
-  int rlen=0;
-  s[0]='\0';
+static int linput_cpp(FILE * fp, char *s, int max) {
+  int rlen = 0;
+
+  s[0] = '\0';
   do {
     int ret;
-    if (rlen>0)
-    if (s[rlen-1]=='\\')
-      s[--rlen]='\0';      // couper \ final
+
+    if (rlen > 0)
+      if (s[rlen - 1] == '\\')
+        s[--rlen] = '\0';       // couper \ final
     // lire ligne
-    ret=linput_trim(fp,s+rlen,max-rlen);
-    if (ret>0)
-      rlen+=ret;
-  } while((s[max(rlen-1,0)]=='\\') && (rlen<max));
+    ret = linput_trim(fp, s + rlen, max - rlen);
+    if (ret > 0)
+      rlen += ret;
+  } while((s[max(rlen - 1, 0)] == '\\') && (rlen < max));
   return rlen;
 }
 
-static int fexist(const char* s) {
+static int fexist(const char *s) {
   struct stat st;
+
   memset(&st, 0, sizeof(st));
   if (stat(s, &st) == 0) {
     if (S_ISREG(st.st_mode)) {
@@ -197,45 +206,56 @@ static int fexist(const char* s) {
     }
   }
   return 0;
-} 
-static int linput(FILE* fp,char* s,int max) {
+}
+static int linput(FILE * fp, char *s, int max) {
   int c;
-  int j=0;
+  int j = 0;
+
   do {
-    c=fgetc(fp);
-    if (c!=EOF) {
-      switch(c) {
-        case 13: break;  // sauter CR
-        case 10: c=-1; break;
-        case 0: case 9: case 12: break;  // sauter ces caractères
-        default: s[j++]=(char) c; break;
+    c = fgetc(fp);
+    if (c != EOF) {
+      switch (c) {
+      case 13:
+        break;                  // sauter CR
+      case 10:
+        c = -1;
+        break;
+      case 0:
+      case 9:
+      case 12:
+        break;                  // sauter ces caractères
+      default:
+        s[j++] = (char) c;
+        break;
       }
     }
-  }  while((c!=-1) && (c!=EOF) && (j<(max-1)));
-  s[j]='\0';
+  } while((c != -1) && (c != EOF) && (j < (max - 1)));
+  s[j] = '\0';
   return j;
 }
-static int linput_trim(FILE* fp,char* s,int max) {
-  int rlen=0;
-  char* ls=(char*) malloct(max+2);
-  s[0]='\0';
+static int linput_trim(FILE * fp, char *s, int max) {
+  int rlen = 0;
+  char *ls = (char *) malloct(max + 2);
+
+  s[0] = '\0';
   if (ls) {
-    char* a;
+    char *a;
+
     // lire ligne
-    rlen=linput(fp,ls,max);
+    rlen = linput(fp, ls, max);
     if (rlen) {
       // sauter espaces et tabs en fin
-      while( (rlen>0) && is_realspace(ls[max(rlen-1,0)]) )
-        ls[--rlen]='\0';
+      while((rlen > 0) && is_realspace(ls[max(rlen - 1, 0)]))
+        ls[--rlen] = '\0';
       // sauter espaces en début
-      a=ls;
-      while((rlen>0) && ((*a==' ') || (*a=='\t'))) {
+      a = ls;
+      while((rlen > 0) && ((*a == ' ') || (*a == '\t'))) {
         a++;
         rlen--;
       }
-      if (rlen>0) {
-        memcpy(s,a,rlen);      // can copy \0 chars
-        s[rlen]='\0';
+      if (rlen > 0) {
+        memcpy(s, a, rlen);     // can copy \0 chars
+        s[rlen] = '\0';
       }
     }
     //
@@ -245,57 +265,60 @@ static int linput_trim(FILE* fp,char* s,int max) {
 }
 
 static int ehexh(char c) {
-  if ((c>='0') && (c<='9')) return c-'0';
-  if ((c>='a') && (c<='f')) c-=('a'-'A');
-  if ((c>='A') && (c<='F')) return (c-'A'+10);
+  if ((c >= '0') && (c <= '9'))
+    return c - '0';
+  if ((c >= 'a') && (c <= 'f'))
+    c -= ('a' - 'A');
+  if ((c >= 'A') && (c <= 'F'))
+    return (c - 'A' + 10);
   return 0;
 }
 
-static int ehex(char* s) {
-  return 16*ehexh(*s)+ehexh(*(s+1));
+static int ehex(char *s) {
+  return 16 * ehexh(*s) + ehexh(*(s + 1));
 }
 
-static void unescapehttp(char* s, String* tempo) {
+static void unescapehttp(char *s, String * tempo) {
   int i;
-  for (i=0;i<(int) strlen(s);i++) {
-    if (s[i]=='%' && s[i+1]=='%') {
+
+  for(i = 0; i < (int) strlen(s); i++) {
+    if (s[i] == '%' && s[i + 1] == '%') {
       i++;
       StringAddchar(*tempo, '%');
-    } else if (s[i]=='%') {
+    } else if (s[i] == '%') {
       char hc;
+
       i++;
-      hc = (char) ehex(s+i);
+      hc = (char) ehex(s + i);
       StringAddchar(*tempo, (char) hc);
-      i++;    // sauter 2 caractères finalement
-    }
-    else if (s[i]=='+') {
+      i++;                      // sauter 2 caractères finalement
+    } else if (s[i] == '+') {
       StringAddchar(*tempo, ' ');
-    }
-    else
+    } else
       StringAddchar(*tempo, s[i]);
   }
 }
 
-static void unescapeini(char* s, String* tempo) {
+static void unescapeini(char *s, String * tempo) {
   int i;
-  char lastc=0;
-  for (i=0;i<(int) strlen(s);i++) {
-    if (s[i]=='%' && s[i+1]=='%') {
+  char lastc = 0;
+
+  for(i = 0; i < (int) strlen(s); i++) {
+    if (s[i] == '%' && s[i + 1] == '%') {
       i++;
       StringAddchar(*tempo, lastc = '%');
-    } else if (s[i]=='%') {
+    } else if (s[i] == '%') {
       char hc;
+
       i++;
-      hc = (char) ehex(s+i);
+      hc = (char) ehex(s + i);
       if (!is_retorsep(hc) || !is_retorsep(lastc)) {
         StringAddchar(*tempo, lastc = (char) hc);
       }
-      i++;    // sauter 2 caractères finalement
-    }
-    else
+      i++;                      // sauter 2 caractères finalement
+    } else
       StringAddchar(*tempo, lastc = s[i]);
   }
 }
 
 #endif
-