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, 317 insertions, 272 deletions

diff --git a/src/htslib.h b/src/htslib.h
index 3121004..b622137 100644
--- a/src/htslib.h
+++ b/src/htslib.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: Subroutines .h                                         */
 /* Author: Xavier Roche                                         */
@@ -37,7 +34,7 @@ Please visit our Website: http://www.httrack.com
 // Fichier librairie .h
 
 #ifndef HTS_DEFH
-#define HTS_DEFH 
+#define HTS_DEFH
 
 /* Forward definitions */
 #ifndef HTS_DEF_FWSTRUCT_htsrequest
@@ -90,10 +87,11 @@ typedef struct t_dnscache t_dnscache;
 #else
 #define MSVC2003INLINEBUG
 #endif
-MSVC2003INLINEBUG HTS_STATIC char* getHtsOptBuff_(httrackp *opt) {
-	opt->state.concat.index = ( opt->state.concat.index + 1 ) % 16;
-	return opt->state.concat.buff[opt->state.concat.index];
+MSVC2003INLINEBUG HTS_STATIC char *getHtsOptBuff_(httrackp * opt) {
+  opt->state.concat.index = (opt->state.concat.index + 1) % 16;
+  return opt->state.concat.buff[opt->state.concat.index];
 }
+
 #undef MSVC2003INLINEBUG
 #define OPT_GET_BUFF(OPT) ( getHtsOptBuff_(OPT) )
 
@@ -106,76 +104,75 @@ struct htsrequest_proxy {
   int active;
   char name[1024];
   int port;
-  char bindhost[256];   // bind this host
-}; 
+  char bindhost[256];           // bind this host
+};
+
 #ifndef HTS_DEF_FWSTRUCT_htsrequest
 #define HTS_DEF_FWSTRUCT_htsrequest
 typedef struct htsrequest htsrequest;
 #endif
 struct htsrequest {
-  short int user_agent_send;  // user agent (ex: httrack/1.0 [sun])
-  short int http11;           // l'en tête peut (doit) être signé HTTP/1.1 et non HTTP/1.0
-  short int nokeepalive;      // pas de keep-alive
-  short int range_used;       // Range utilisé
-  short int nocompression;    // Pas de compression
-  short int flush_garbage;    // recycled
+  short int user_agent_send;    // user agent (ex: httrack/1.0 [sun])
+  short int http11;             // l'en tête peut (doit) être signé HTTP/1.1 et non HTTP/1.0
+  short int nokeepalive;        // pas de keep-alive
+  short int range_used;         // Range utilisé
+  short int nocompression;      // Pas de compression
+  short int flush_garbage;      // recycled
   char user_agent[128];
   char referer[256];
   char from[256];
   char lang_iso[64];
-  htsrequest_proxy proxy;              // proxy
+  htsrequest_proxy proxy;       // proxy
 };
 
-
 // structure pour retour d'une connexion/prise d'en tête
 #ifndef HTS_DEF_FWSTRUCT_htsblk
 #define HTS_DEF_FWSTRUCT_htsblk
 typedef struct htsblk htsblk;
 #endif
 struct htsblk {
-  int statuscode;        // status-code, -1=erreur, 200=OK,201=..etc (cf RFC1945)
-  short int notmodified; // page ou fichier NON modifié (transféré)
-  short int is_write;    // sortie sur disque (out) ou en mémoire (adr)
-  short int is_chunk;    // mode chunk
-  short int compressed;  // compressé?
-  short int empty;       // vide?
-  short int keep_alive;  // Keep-Alive?
-  short int keep_alive_trailers;  // ..with trailers extension
-  int keep_alive_t;      // KA timeout
-  int keep_alive_max;    // KA number of requests
-  char* adr;             // adresse du bloc de mémoire, NULL=vide
-  char* headers;         // adresse des en têtes si présents
-  FILE* out;             // écriture directe sur disque (si is_write=1)
-  LLint size;            // taille fichier
-  char msg[80];          // message éventuel si échec ("\0"=non précisé)
-  char contenttype[64];  // content-type ("text/html" par exemple)
-  char charset[64];      // charset ("iso-8859-1" par exemple)
-  char contentencoding[64];  // content-encoding ("gzip" par exemple)
-  char* location;        // on copie dedans éventuellement la véritable 'location'
-  LLint totalsize;       // taille totale à télécharger (-1=inconnue)
-  short int is_file;     // ce n'est pas une socket mais un descripteur de fichier si 1
-  T_SOC soc;             // ID socket
-  SOCaddr address;       // IP address
-  int     address_size;  // IP address structure length
-  FILE* fp;              // fichier pour file://
+  int statuscode;               // status-code, -1=erreur, 200=OK,201=..etc (cf RFC1945)
+  short int notmodified;        // page ou fichier NON modifié (transféré)
+  short int is_write;           // sortie sur disque (out) ou en mémoire (adr)
+  short int is_chunk;           // mode chunk
+  short int compressed;         // compressé?
+  short int empty;              // vide?
+  short int keep_alive;         // Keep-Alive?
+  short int keep_alive_trailers;        // ..with trailers extension
+  int keep_alive_t;             // KA timeout
+  int keep_alive_max;           // KA number of requests
+  char *adr;                    // adresse du bloc de mémoire, NULL=vide
+  char *headers;                // adresse des en têtes si présents
+  FILE *out;                    // écriture directe sur disque (si is_write=1)
+  LLint size;                   // taille fichier
+  char msg[80];                 // message éventuel si échec ("\0"=non précisé)
+  char contenttype[64];         // content-type ("text/html" par exemple)
+  char charset[64];             // charset ("iso-8859-1" par exemple)
+  char contentencoding[64];     // content-encoding ("gzip" par exemple)
+  char *location;               // on copie dedans éventuellement la véritable 'location'
+  LLint totalsize;              // taille totale à télécharger (-1=inconnue)
+  short int is_file;            // ce n'est pas une socket mais un descripteur de fichier si 1
+  T_SOC soc;                    // ID socket
+  SOCaddr address;              // IP address
+  int address_size;             // IP address structure length
+  FILE *fp;                     // fichier pour file://
 #if HTS_USEOPENSSL
-  short int ssl;         // is this connection a SSL one? (https)
+  short int ssl;                // is this connection a SSL one? (https)
   // BIO* ssl_soc;          // SSL structure
-  SSL * ssl_con;         // connection structure
-#endif
-  char lastmodified[64]; // Last-Modified
-  char etag[64];         // Etag
-  char cdispo[256];      // Content-Disposition coupé
-  LLint  crange;         // Content-Range
-  LLint  crange_start;   // Content-Range
-  LLint  crange_end;     // Content-Range
-  int debugid;           // debug connection
+  SSL *ssl_con;                 // connection structure
+#endif
+  char lastmodified[64];        // Last-Modified
+  char etag[64];                // Etag
+  char cdispo[256];             // Content-Disposition coupé
+  LLint crange;                 // Content-Range
+  LLint crange_start;           // Content-Range
+  LLint crange_end;             // Content-Range
+  int debugid;                  // debug connection
   /* */
-  htsrequest req;        // paramètres pour la requête
-  /*char digest[32+2];   // digest md5 généré par le moteur ("" si non généré)*/
+  htsrequest req;               // paramètres pour la requête
+  /*char digest[32+2];   // digest md5 généré par le moteur ("" si non généré) */
 };
 
-
 /* ANCIENNE STURCTURE pour cache 1.0 */
 #ifndef HTS_DEF_FWSTRUCT_OLD_t_proxy
 #define HTS_DEF_FWSTRUCT_OLD_t_proxy
@@ -185,30 +182,32 @@ struct OLD_t_proxy {
   int active;
   char name[1024];
   int port;
-}; 
+};
+
 #ifndef HTS_DEF_FWSTRUCT_OLD_htsblk
 #define HTS_DEF_FWSTRUCT_OLD_htsblk
 typedef struct OLD_htsblk OLD_htsblk;
 #endif
 struct OLD_htsblk {
-  int statuscode;  // ANCIENNE STURCTURE - status-code, -1=erreur, 200=OK,201=..etc (cf RFC1945)
-  int notmodified; // ANCIENNE STURCTURE - page ou fichier NON modifié (transféré)
-  int is_write;    // ANCIENNE STURCTURE - sortie sur disque (out) ou en mémoire (adr)
-  char* adr;       // ANCIENNE STURCTURE - adresse du bloc de mémoire, NULL=vide
-  FILE* out;       // ANCIENNE STURCTURE - écriture directe sur disque (si is_write=1)
-  int size;        // ANCIENNE STURCTURE - taille fichier
-  char msg[80];    // ANCIENNE STURCTURE - message éventuel si échec ("\0"=non précisé)
-  char contenttype[64];  // ANCIENNE STURCTURE - content-type ("text/html" par exemple)
-  char* location;  // ANCIENNE STURCTURE - on copie dedans éventuellement la véritable 'location'
-  int totalsize;   // ANCIENNE STURCTURE - taille totale à télécharger (-1=inconnue)
-  int is_file;     // ANCIENNE STURCTURE - ce n'est pas une socket mais un descripteur de fichier si 1
-  T_SOC soc;       // ANCIENNE STURCTURE - ID socket
-  FILE* fp;        // ANCIENNE STURCTURE - fichier pour file://
-  OLD_t_proxy proxy;   // ANCIENNE STURCTURE - proxy
-  int user_agent_send;  // ANCIENNE STURCTURE - user agent (ex: httrack/1.0 [sun])
+  int statuscode;               // ANCIENNE STURCTURE - status-code, -1=erreur, 200=OK,201=..etc (cf RFC1945)
+  int notmodified;              // ANCIENNE STURCTURE - page ou fichier NON modifié (transféré)
+  int is_write;                 // ANCIENNE STURCTURE - sortie sur disque (out) ou en mémoire (adr)
+  char *adr;                    // ANCIENNE STURCTURE - adresse du bloc de mémoire, NULL=vide
+  FILE *out;                    // ANCIENNE STURCTURE - écriture directe sur disque (si is_write=1)
+  int size;                     // ANCIENNE STURCTURE - taille fichier
+  char msg[80];                 // ANCIENNE STURCTURE - message éventuel si échec ("\0"=non précisé)
+  char contenttype[64];         // ANCIENNE STURCTURE - content-type ("text/html" par exemple)
+  char *location;               // ANCIENNE STURCTURE - on copie dedans éventuellement la véritable 'location'
+  int totalsize;                // ANCIENNE STURCTURE - taille totale à télécharger (-1=inconnue)
+  int is_file;                  // ANCIENNE STURCTURE - ce n'est pas une socket mais un descripteur de fichier si 1
+  T_SOC soc;                    // ANCIENNE STURCTURE - ID socket
+  FILE *fp;                     // ANCIENNE STURCTURE - fichier pour file://
+  OLD_t_proxy proxy;            // ANCIENNE STURCTURE - proxy
+  int user_agent_send;          // ANCIENNE STURCTURE - user agent (ex: httrack/1.0 [sun])
   char user_agent[64];
-  int http11;           // ANCIENNE STURCTURE - l'en tête doit être signé HTTP/1.1 et non HTTP/1.0
+  int http11;                   // ANCIENNE STURCTURE - l'en tête doit être signé HTTP/1.1 et non HTTP/1.0
 };
+
 /* fin ANCIENNE STURCTURE pour cache 1.0 */
 
 // cache pour le dns, pour éviter de faire des gethostbyname sans arrêt
@@ -218,24 +217,24 @@ typedef struct t_dnscache t_dnscache;
 #endif
 struct t_dnscache {
   char iadr[1024];
-  struct t_dnscache* n;
-  char host_addr[HTS_MAXADDRLEN];    // 4 octets (v4), ou 16 octets (v6)
-  int host_length;                   // 4 normalement - ==0  alors en cours de résolution
-                                     // ou >16 si sockaddr
-                                     //                 ==-1 alors erreur (host n'éxiste pas)
+  struct t_dnscache *n;
+  char host_addr[HTS_MAXADDRLEN];       // 4 octets (v4), ou 16 octets (v6)
+  int host_length;              // 4 normalement - ==0  alors en cours de résolution
+  // ou >16 si sockaddr
+  //                 ==-1 alors erreur (host n'éxiste pas)
 };
 
-
 /* Library internal definictions */
 #ifdef HTS_INTERNAL_BYTECODE
 
 extern htsmutex dns_lock;
 
 // initialize an htsblk structure
-void hts_init_htsblk(htsblk* r);
+void hts_init_htsblk(htsblk * r);
 
 // fonctions unix/winsock
-int hts_read(htsblk* r,char* buff,int size);
+int hts_read(htsblk * r, char *buff, int size);
+
 //int HTS_TOTAL_RECV_CHECK(int var);
 LLint check_downloadable_bytes(int rate);
 
@@ -243,207 +242,233 @@ LLint check_downloadable_bytes(int rate);
 HTSEXT_API int hts_init(void);
 HTSEXT_API int hts_uninit(void);
 HTSEXT_API int hts_uninit_module(void);
-HTSEXT_API int hts_resetvar(void);  /* dummy */
+HTSEXT_API int hts_resetvar(void);      /* dummy */
 HTSEXT_API void hts_debug(int level);
-HTSEXT_API httrackp* hts_create_opt(void);
-HTSEXT_API void hts_free_opt(httrackp *opt);
-HTSEXT_API void set_wrappers(httrackp *opt);    /* LEGACY */
-HTSEXT_API int plug_wrapper(httrackp *opt, const char *moduleName, const char* argv);
+HTSEXT_API httrackp *hts_create_opt(void);
+HTSEXT_API void hts_free_opt(httrackp * opt);
+HTSEXT_API void set_wrappers(httrackp * opt);   /* LEGACY */
+HTSEXT_API int plug_wrapper(httrackp * opt, const char *moduleName,
+                            const char *argv);
 
-HTSEXT_API char* hts_strdup(const char* string);
-HTSEXT_API void* hts_malloc(size_t size);
-HTSEXT_API void* hts_realloc(void* data, size_t size);
-HTSEXT_API void hts_free(void* data);
+HTSEXT_API char *hts_strdup(const char *string);
+HTSEXT_API void *hts_malloc(size_t size);
+HTSEXT_API void *hts_realloc(void *data, size_t size);
+HTSEXT_API void hts_free(void *data);
 #endif
 
 // fonctions principales
-T_SOC http_fopen(httrackp *opt,char* adr,char* fil,htsblk* retour);
-T_SOC http_xfopen(httrackp *opt,int mode,int treat,int waitconnect,char* xsend,char* adr,char* fil,htsblk* retour);
-int http_sendhead(httrackp *opt,t_cookie* cookie,int mode,char* xsend,char* adr,char* fil,char* referer_adr,char* referer_fil,htsblk* retour);
-htsblk httpget(httrackp *opt,char* url);
+T_SOC http_fopen(httrackp * opt, char *adr, char *fil, htsblk * retour);
+T_SOC http_xfopen(httrackp * opt, int mode, int treat, int waitconnect,
+                  char *xsend, char *adr, char *fil, htsblk * retour);
+int http_sendhead(httrackp * opt, t_cookie * cookie, int mode, char *xsend,
+                  char *adr, char *fil, char *referer_adr, char *referer_fil,
+                  htsblk * retour);
+htsblk httpget(httrackp * opt, char *url);
+
 //int newhttp(char* iadr,char* err=NULL);
-T_SOC newhttp(httrackp *opt,const char* iadr,htsblk* retour,int port,int waitconnect);
-HTS_INLINE void deletehttp(htsblk* r);
-HTS_INLINE int  deleteaddr(htsblk* r);
+T_SOC newhttp(httrackp * opt, const char *iadr, htsblk * retour, int port,
+              int waitconnect);
+HTS_INLINE void deletehttp(htsblk * r);
+HTS_INLINE int deleteaddr(htsblk * r);
 HTS_INLINE void deletesoc(T_SOC soc);
-HTS_INLINE void deletesoc_r(htsblk* r);
-htsblk http_location(httrackp *opt,char* adr,char* fil,char* loc);
-htsblk http_test(httrackp *opt,char* adr,char* fil,char* loc);
-int check_readinput(htsblk* r);
+HTS_INLINE void deletesoc_r(htsblk * r);
+htsblk http_location(httrackp * opt, char *adr, char *fil, char *loc);
+htsblk http_test(httrackp * opt, char *adr, char *fil, char *loc);
+int check_readinput(htsblk * r);
 int check_readinput_t(T_SOC soc, int timeout);
-void http_fread(T_SOC soc,htsblk* retour);
-LLint http_fread1(htsblk* r);
-void treathead(t_cookie* cookie,char* adr,char* fil,htsblk* retour,char* rcvd);
-void treatfirstline(htsblk* retour,char* rcvd);
+void http_fread(T_SOC soc, htsblk * retour);
+LLint http_fread1(htsblk * r);
+void treathead(t_cookie * cookie, char *adr, char *fil, htsblk * retour,
+               char *rcvd);
+void treatfirstline(htsblk * retour, char *rcvd);
+
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API void infostatuscode(char* msg,int statuscode);
+HTSEXT_API void infostatuscode(char *msg, int statuscode);
 #endif
 
 // sous-fonctions
-htsblk xhttpget(httrackp *opt,char* adr,char* fil);
-htsblk http_gethead(httrackp *opt,char* adr,char* fil);
-LLint http_xfread1(htsblk* r,int bufl);
-HTS_INLINE t_hostent* hts_gethostbyname(httrackp *opt,const char* iadr, void* v_buffer);
+htsblk xhttpget(httrackp * opt, char *adr, char *fil);
+htsblk http_gethead(httrackp * opt, char *adr, char *fil);
+LLint http_xfread1(htsblk * r, int bufl);
+HTS_INLINE t_hostent *hts_gethostbyname(httrackp * opt, const char *iadr,
+                                        void *v_buffer);
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API t_hostent* vxgethostbyname(char* hostname, void* v_buffer);
+HTSEXT_API t_hostent *vxgethostbyname(char *hostname, void *v_buffer);
 #endif
-t_hostent* _hts_ghbn(t_dnscache* cache,const char* iadr,t_hostent* retour);
+t_hostent *_hts_ghbn(t_dnscache * cache, const char *iadr, t_hostent * retour);
 int ftp_available(void);
+
 #if HTS_DNSCACHE
-void hts_cache_free(t_dnscache* cache);
-int hts_dnstest(httrackp *opt, const char* _iadr);
-t_dnscache* _hts_cache(httrackp *opt);
+void hts_cache_free(t_dnscache * cache);
+int hts_dnstest(httrackp * opt, const char *_iadr);
+t_dnscache *_hts_cache(httrackp * opt);
 #endif
 
 // outils divers
 HTS_INLINE TStamp time_local(void);
+
 #ifndef HTTRACK_DEFLIB
 HTSEXT_API HTS_INLINE TStamp mtime_local(void);
 #endif
-void sec2str(char *s,TStamp t);
+void sec2str(char *s, TStamp t);
+
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API void qsec2str(char *st,TStamp t);
-#endif
-void time_gmt_rfc822(char* s);
-void time_local_rfc822(char* s);
-struct tm* convert_time_rfc822(struct tm* buffer, const char* s);
-int set_filetime(const char* file,struct tm* tm_time);
-int set_filetime_rfc822(const char* file,const char* date);
-int get_filetime_rfc822(const char* file,char* date);
-HTS_INLINE void time_rfc822(char* s,struct tm * A);
-HTS_INLINE void time_rfc822_local(char* s,struct tm * A);
+HTSEXT_API void qsec2str(char *st, TStamp t);
+#endif
+void time_gmt_rfc822(char *s);
+void time_local_rfc822(char *s);
+struct tm *convert_time_rfc822(struct tm *buffer, const char *s);
+int set_filetime(const char *file, struct tm *tm_time);
+int set_filetime_rfc822(const char *file, const char *date);
+int get_filetime_rfc822(const char *file, char *date);
+HTS_INLINE void time_rfc822(char *s, struct tm *A);
+HTS_INLINE void time_rfc822_local(char *s, struct tm *A);
+
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API char* int2char(strc_int2bytes2* strc, int n);
-HTSEXT_API char* int2bytes(strc_int2bytes2* strc, LLint n);
-HTSEXT_API char* int2bytessec(strc_int2bytes2* strc, long int n);
-HTSEXT_API char** int2bytes2(strc_int2bytes2* strc, LLint n);
-#endif
-HTS_INLINE int sendc(htsblk* r, const char* s);
-int finput(int fd,char* s,int max);
-int binput(char* buff,char* s,int max);
-int linput(FILE* fp,char* s,int max);
-int linputsoc(T_SOC soc, char* s, int max);
-int linputsoc_t(T_SOC soc, char* s, int max, int timeout);
-int linput_trim(FILE* fp,char* s,int max);
-int linput_cpp(FILE* fp,char* s,int max);
-void rawlinput(FILE* fp,char* s,int max);
-char* strstrcase(char *s,char *o);
-int ident_url_absolute(const char* url,char* adr,char* fil);
-void fil_simplifie(char* f);
-int is_unicode_utf8(const char* buffer, size_t size);
-void map_characters(unsigned char* buffer, unsigned int size, unsigned int* map);
-int ishtml(httrackp *opt,const char* urlfil);
-int ishtml_ext(const char* a);
+HTSEXT_API char *int2char(strc_int2bytes2 * strc, int n);
+HTSEXT_API char *int2bytes(strc_int2bytes2 * strc, LLint n);
+HTSEXT_API char *int2bytessec(strc_int2bytes2 * strc, long int n);
+HTSEXT_API char **int2bytes2(strc_int2bytes2 * strc, LLint n);
+#endif
+HTS_INLINE int sendc(htsblk * r, const char *s);
+int finput(int fd, char *s, int max);
+int binput(char *buff, char *s, int max);
+int linput(FILE * fp, char *s, int max);
+int linputsoc(T_SOC soc, char *s, int max);
+int linputsoc_t(T_SOC soc, char *s, int max, int timeout);
+int linput_trim(FILE * fp, char *s, int max);
+int linput_cpp(FILE * fp, char *s, int max);
+void rawlinput(FILE * fp, char *s, int max);
+char *strstrcase(char *s, char *o);
+int ident_url_absolute(const char *url, char *adr, char *fil);
+void fil_simplifie(char *f);
+int is_unicode_utf8(const char *buffer, size_t size);
+void map_characters(unsigned char *buffer, unsigned int size,
+                    unsigned int *map);
+int ishtml(httrackp * opt, const char *urlfil);
+int ishtml_ext(const char *a);
 int ishttperror(int err);
-void guess_httptype(httrackp *opt,char *s,const char *fil);
+void guess_httptype(httrackp * opt, char *s, const char *fil);
+
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API void get_httptype(httrackp *opt,char *s,const char *fil,int flag);
+HTSEXT_API void get_httptype(httrackp * opt, char *s, const char *fil,
+                             int flag);
 #endif
-int get_userhttptype(httrackp *opt,char *s,const char *fil);
-void give_mimext(char *s,const char *st);
+int get_userhttptype(httrackp * opt, char *s, const char *fil);
+void give_mimext(char *s, const char *st);
+
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API int is_knowntype(httrackp *opt,const char *fil);
-HTSEXT_API int is_userknowntype(httrackp *opt,const char *fil);
+HTSEXT_API int is_knowntype(httrackp * opt, const char *fil);
+HTSEXT_API int is_userknowntype(httrackp * opt, const char *fil);
 HTSEXT_API int is_dyntype(const char *fil);
-HTSEXT_API char* get_ext(char *catbuff, const char *fil);
+HTSEXT_API char *get_ext(char *catbuff, const char *fil);
 #endif
-int may_unknown(httrackp *opt,const char* st);
-int may_bogus_multiple(httrackp *opt, const char* mime, const char *filename);
-int may_unknown2(httrackp *opt,const char* mime, const char *filename);
+int may_unknown(httrackp * opt, const char *st);
+int may_bogus_multiple(httrackp * opt, const char *mime, const char *filename);
+int may_unknown2(httrackp * opt, const char *mime, const char *filename);
+
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API char* jump_identification(const char*);
-HTSEXT_API char* jump_normalized(const char*);
-HTSEXT_API char* jump_toport(const char*);
-HTSEXT_API char* fil_normalized(const char* source, char* dest);
-HTSEXT_API char* adr_normalized(const char* source, char* dest);
-#endif
-char* strrchr_limit(const char* s, char c, const char* limit);
-char* strstr_limit(const char* s, const char* sub, const char* limit);
-HTS_INLINE char* jump_protocol(const char* source);
-void code64(unsigned char* a,int size_a,unsigned char* b,int crlf);
+HTSEXT_API char *jump_identification(const char *);
+HTSEXT_API char *jump_normalized(const char *);
+HTSEXT_API char *jump_toport(const char *);
+HTSEXT_API char *fil_normalized(const char *source, char *dest);
+HTSEXT_API char *adr_normalized(const char *source, char *dest);
+#endif
+char *strrchr_limit(const char *s, char c, const char *limit);
+char *strstr_limit(const char *s, const char *sub, const char *limit);
+HTS_INLINE char *jump_protocol(const char *source);
+void code64(unsigned char *a, int size_a, unsigned char *b, int crlf);
+
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API void unescape_amp(char* s);
-HTSEXT_API void escape_spc_url(char* s);
-HTSEXT_API void escape_in_url(char* s);
-HTSEXT_API void escape_uri(char* s);
-HTSEXT_API void escape_uri_utf(char* s);
-HTSEXT_API void escape_check_url(char* s);
-HTSEXT_API char* escape_check_url_addr(char *catbuff, const char* s);
-HTSEXT_API void x_escape_http(char* s,int mode);
-HTSEXT_API void x_escape_html(char* s);
-HTSEXT_API void escape_remove_control(char* s);
-HTSEXT_API void escape_for_html_print(char* s, char* d);
-HTSEXT_API void escape_for_html_print_full(char* s, char* d);
+HTSEXT_API void unescape_amp(char *s);
+HTSEXT_API void escape_spc_url(char *s);
+HTSEXT_API void escape_in_url(char *s);
+HTSEXT_API void escape_uri(char *s);
+HTSEXT_API void escape_uri_utf(char *s);
+HTSEXT_API void escape_check_url(char *s);
+HTSEXT_API char *escape_check_url_addr(char *catbuff, const char *s);
+HTSEXT_API void x_escape_http(char *s, int mode);
+HTSEXT_API void x_escape_html(char *s);
+HTSEXT_API void escape_remove_control(char *s);
+HTSEXT_API void escape_for_html_print(char *s, char *d);
+HTSEXT_API void escape_for_html_print_full(char *s, char *d);
 #endif
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API char* unescape_http(char *catbuff, const char* s);
-HTSEXT_API char* unescape_http_unharm(char *catbuff, const char* s, int no_high);
-HTSEXT_API char* antislash_unescaped(char *catbuff, const char* s);
-HTSEXT_API char* concat(char *catbuff,const char* a,const char* b);
-HTSEXT_API char* fconcat(char *catbuff, const char* a, const char* b);
-HTSEXT_API char* fconv(char *catbuff, const char* a);
+HTSEXT_API char *unescape_http(char *catbuff, const char *s);
+HTSEXT_API char *unescape_http_unharm(char *catbuff, const char *s,
+                                      int no_high);
+HTSEXT_API char *antislash_unescaped(char *catbuff, const char *s);
+HTSEXT_API char *concat(char *catbuff, const char *a, const char *b);
+HTSEXT_API char *fconcat(char *catbuff, const char *a, const char *b);
+HTSEXT_API char *fconv(char *catbuff, const char *a);
 #endif
 #define copychar(catbuff,a) concat(catbuff,(a),NULL)
-char* fslash(char *catbuff, const char* a);
+char *fslash(char *catbuff, const char *a);
+
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API int hts_log(httrackp *opt, const char* prefix, const char *msg);
-HTSEXT_API void hts_log_print(httrackp *opt, int type, const char *format, ...) HTS_PRINTF_FUN(3, 4);
+HTSEXT_API int hts_log(httrackp * opt, const char *prefix, const char *msg);
+HTSEXT_API void hts_log_print(httrackp * opt, int type, const char *format,
+                              ...) HTS_PRINTF_FUN(3, 4);
 #endif
 
-char* convtolower(char *catbuff, const char* a);
-void hts_lowcase(char* s);
-void hts_replace(char *s,char from,char to);
-int multipleStringMatch(const char *s, const char *match);
+     char *convtolower(char *catbuff, const char *a);
+     void hts_lowcase(char *s);
+     void hts_replace(char *s, char from, char to);
+     int multipleStringMatch(const char *s, const char *match);
 
-
-void fprintfio(FILE* fp,char* buff,char* prefix);
+     void fprintfio(FILE * fp, char *buff, char *prefix);
 
 #ifdef _WIN32
 #else
-int sig_ignore_flag( int setflag );     // flag ignore
+     int sig_ignore_flag(int setflag);  // flag ignore
 #endif
 
-void cut_path(char* fullpath,char* path,char* pname);
-int fexist(const char* s);
-int fexist_utf8(const char* s);
+     void cut_path(char *fullpath, char *path, char *pname);
+     int fexist(const char *s);
+     int fexist_utf8(const char *s);
+
 /*LLint fsize(const char* s);    */
-off_t fpsize(FILE* fp);
-off_t fsize(const char* s);    
-off_t fsize_utf8(const char* s);
+     off_t fpsize(FILE * fp);
+     off_t fsize(const char *s);
+     off_t fsize_utf8(const char *s);
+
 /* root dir */
 #ifndef HTTRACK_DEFLIB
-HTSEXT_API char* hts_rootdir(char* file);
+     HTSEXT_API char *hts_rootdir(char *file);
 #endif
 
 // Threads
-typedef void* ( *beginthread_type )( void * );
+     typedef void *(*beginthread_type) (void *);
+
 /*unsigned long _beginthread( beginthread_type start_address, unsigned stack_size, void *arglist );*/
 
 /* variables globales */
-extern HTSEXT_API hts_stat_struct HTS_STAT;
-extern int _DEBUG_HEAD;
-extern FILE* ioinfo;
+     extern HTSEXT_API hts_stat_struct HTS_STAT;
+     extern int _DEBUG_HEAD;
+     extern FILE *ioinfo;
 
 /* constantes */
-extern const char* hts_mime_keep[];
-extern const char* hts_mime[][2];
-extern const char* hts_main_mime[];
-extern const char* hts_detect[];
-extern const char* hts_detectbeg[];
-extern const char* hts_nodetect[];
-extern const char* hts_detectURL[];
-extern const char* hts_detectandleave[];
-extern const char* hts_detect_js[];
+     extern const char *hts_mime_keep[];
+     extern const char *hts_mime[][2];
+     extern const char *hts_main_mime[];
+     extern const char *hts_detect[];
+     extern const char *hts_detectbeg[];
+     extern const char *hts_nodetect[];
+     extern const char *hts_detectURL[];
+     extern const char *hts_detectandleave[];
+     extern const char *hts_detect_js[];
 
 // htsmodule.c definitions
-extern void* openFunctionLib(const char* file_);
-extern void* getFunctionPtr(void* handle, const char* fncname);
-extern void  closeFunctionLib(void* handle);
+     extern void *openFunctionLib(const char *file_);
+     extern void *getFunctionPtr(void *handle, const char *fncname);
+     extern void closeFunctionLib(void *handle);
 
-extern void clearCallbacks(htscallbacks* chain);
-extern size_t hts_get_callback_offs(const char *name);
-int hts_set_callback(t_hts_htmlcheck_callbacks *callbacks, const char *name, void *function);
-void *hts_get_callback(t_hts_htmlcheck_callbacks *callbacks, const char *name);
+     extern void clearCallbacks(htscallbacks * chain);
+     extern size_t hts_get_callback_offs(const char *name);
+     int hts_set_callback(t_hts_htmlcheck_callbacks * callbacks,
+                          const char *name, void *function);
+     void *hts_get_callback(t_hts_htmlcheck_callbacks * callbacks,
+                            const char *name);
 
 #define CBSTRUCT(OPT) ((t_hts_htmlcheck_callbacks*) ((OPT)->callbacks_fun))
 #define GET_USERCALLBACK(OPT, NAME) ( CBSTRUCT(OPT)-> NAME .fun )
@@ -488,34 +513,42 @@ void *hts_get_callback(t_hts_htmlcheck_callbacks *callbacks, const char *name);
 #ifndef HTS_DEF_FILEAPI
 #ifdef _WIN32
 #define FOPEN hts_fopen_utf8
-HTSEXT_API FILE* hts_fopen_utf8(const char *path, const char *mode);
+     HTSEXT_API FILE *hts_fopen_utf8(const char *path, const char *mode);
+
 #define STAT hts_stat_utf8
-typedef struct _stat STRUCT_STAT;
-HTSEXT_API int hts_stat_utf8(const char *path, STRUCT_STAT *buf);
+     typedef struct _stat STRUCT_STAT;
+     HTSEXT_API int hts_stat_utf8(const char *path, STRUCT_STAT * buf);
+
 #define UNLINK hts_unlink_utf8
-HTSEXT_API int hts_unlink_utf8(const char *pathname);
+     HTSEXT_API int hts_unlink_utf8(const char *pathname);
+
 #define RENAME hts_rename_utf8
-HTSEXT_API int hts_rename_utf8(const char *oldpath, const char *newpath);
+     HTSEXT_API int hts_rename_utf8(const char *oldpath, const char *newpath);
+
 #define MKDIR(F) hts_mkdir_utf8(F)
-HTSEXT_API int hts_mkdir_utf8(const char *pathname);
+     HTSEXT_API int hts_mkdir_utf8(const char *pathname);
+
 #define UTIME(A,B) hts_utime_utf8(A,B)
-typedef struct _utimbuf STRUCT_UTIMBUF;
-HTSEXT_API int hts_utime_utf8(const char *filename, const STRUCT_UTIMBUF *times);
+     typedef struct _utimbuf STRUCT_UTIMBUF;
+     HTSEXT_API int hts_utime_utf8(const char *filename,
+                                   const STRUCT_UTIMBUF * times);
 #else
 /* The underlying filesystem charset is supposed to be UTF-8 */
 #define FOPEN fopen
 #define STAT stat
-typedef struct stat STRUCT_STAT;
+     typedef struct stat STRUCT_STAT;
+
 #define UNLINK unlink
 #define RENAME rename
 #define MKDIR(F) mkdir(F, HTS_ACCESS_FOLDER)
-typedef struct utimbuf STRUCT_UTIMBUF;
+     typedef struct utimbuf STRUCT_UTIMBUF;
+
 #define UTIME(A,B) utime(A,B)
 #endif
 #define HTS_DEF_FILEAPI
 #endif
 
-#endif    // internals
+#endif // internals
 
 #undef PATH_SEPARATOR
 #ifdef _WIN32
@@ -547,17 +580,23 @@ typedef struct utimbuf STRUCT_UTIMBUF;
 
 // compare le début de f avec s et retourne la position de la fin
 // 'A=a' (case insensitive)
-HTS_STATIC int strfield(const char* f,const char* s) {
-  int r=0;
-  while (streql(*f,*s) && ((*f)!=0) && ((*s)!=0)) { f++; s++; r++; }
-  if (*s==0)
+     HTS_STATIC int strfield(const char *f, const char *s) {
+  int r = 0;
+
+  while(streql(*f, *s) && ((*f) != 0) && ((*s) != 0)) {
+    f++;
+    s++;
+    r++;
+  }
+  if (*s == 0)
     return r;
   else
     return 0;
-}
-HTS_STATIC int strcmpnocase(char* a,char* b) {
+     }
+HTS_STATIC int strcmpnocase(char *a, char *b) {
   while(*a) {
     int cmp = hichar(*a) - hichar(*b);
+
     if (cmp != 0)
       return cmp;
     a++;
@@ -609,39 +648,45 @@ HTS_STATIC int strcmpnocase(char* a,char* b) {
 #ifdef HTS_INTERNAL_BYTECODE
 
 // check if (mime, file) is hypertext
-HTS_STATIC int is_hypertext_mime(httrackp *opt,const char* mime, const char* file) {
+HTS_STATIC int is_hypertext_mime(httrackp * opt, const char *mime,
+                                 const char *file) {
   if (is_hypertext_mime__(mime))
     return 1;
-  if (may_unknown(opt,mime)) {
+  if (may_unknown(opt, mime)) {
     char guessed[256];
+
     guessed[0] = '\0';
-    guess_httptype(opt,guessed, file);
+    guess_httptype(opt, guessed, file);
     return is_hypertext_mime__(guessed);
   }
   return 0;
 }
 
 // check if (mime, file) might be "false" hypertext
-HTS_STATIC int may_be_hypertext_mime(httrackp *opt,const char* mime, const char* file) {
+HTS_STATIC int may_be_hypertext_mime(httrackp * opt, const char *mime,
+                                     const char *file) {
   if (may_be_hypertext_mime__(mime))
     return 1;
-  if (file != NULL && file[0] != '\0' && may_unknown(opt,mime)) {
+  if (file != NULL && file[0] != '\0' && may_unknown(opt, mime)) {
     char guessed[256];
+
     guessed[0] = '\0';
-    guess_httptype(opt,guessed, file);
+    guess_httptype(opt, guessed, file);
     return may_be_hypertext_mime__(guessed);
   }
   return 0;
 }
 
 // compare (mime, file) with reference
-HTS_STATIC int compare_mime(httrackp *opt,const char* mime, const char* file, const char* reference) {
+HTS_STATIC int compare_mime(httrackp * opt, const char *mime, const char *file,
+                            const char *reference) {
   if (is_hypertext_mime__(mime) || may_be_hypertext_mime__(mime))
     return strfield2(mime, reference);
-  if (file != NULL && file[0] != '\0' && may_unknown(opt,mime)) {
+  if (file != NULL && file[0] != '\0' && may_unknown(opt, mime)) {
     char guessed[256];
+
     guessed[0] = '\0';
-    guess_httptype(opt,guessed, file);
+    guess_httptype(opt, guessed, file);
     return strfield2(guessed, reference);
   }
   return 0;
@@ -650,26 +695,26 @@ HTS_STATIC int compare_mime(httrackp *opt,const char* mime, const char* file, co
 #endif
 
 #ifdef _WIN32_WCE_XXC
-extern char cwd[MAX_PATH+1];
+extern char cwd[MAX_PATH + 1];
 HTS_STATIC char *getcwd_ce(char *buffer, int maxlen) {
-	TCHAR fileUnc[MAX_PATH+1];
-	char* plast;
-	
-	if(cwd[0] == 0)
-	{
-		GetModuleFileName(NULL, fileUnc, MAX_PATH);
-		WideCharToMultiByte(CP_ACP, 0, fileUnc, -1, cwd, MAX_PATH, NULL, NULL);
-		plast = strrchr(cwd, '\\');
-		if(plast)
-			*plast = 0;
-		/* Special trick to keep start menu clean... */
-		if(_stricmp(cwd, "\\windows\\start menu") == 0)
-			strcpy(cwd, "\\Apps");
-	}
-	if(buffer)
-		strncpy(buffer, cwd, maxlen);
-	return cwd;
+  TCHAR fileUnc[MAX_PATH + 1];
+  char *plast;
+
+  if (cwd[0] == 0) {
+    GetModuleFileName(NULL, fileUnc, MAX_PATH);
+    WideCharToMultiByte(CP_ACP, 0, fileUnc, -1, cwd, MAX_PATH, NULL, NULL);
+    plast = strrchr(cwd, '\\');
+    if (plast)
+      *plast = 0;
+    /* Special trick to keep start menu clean... */
+    if (_stricmp(cwd, "\\windows\\start menu") == 0)
+      strcpy(cwd, "\\Apps");
+  }
+  if (buffer)
+    strncpy(buffer, cwd, maxlen);
+  return cwd;
 }
+
 #undef getcwd
 #define getcwd getcwd_ce
 #endif
@@ -678,11 +723,11 @@ HTS_STATIC char *getcwd_ce(char *buffer, int maxlen) {
 #ifdef _WIN32
 #define HTS_DIRENT_SIZE 256
 struct dirent {
-  ino_t          d_ino;       /* ignored */
-  off_t          d_off;       /* ignored */
-  unsigned short d_reclen;    /* ignored */
-  unsigned char  d_type;      /* ignored */
-  char           d_name[HTS_DIRENT_SIZE]; /* filename */
+  ino_t d_ino;                  /* ignored */
+  off_t d_off;                  /* ignored */
+  unsigned short d_reclen;      /* ignored */
+  unsigned char d_type;         /* ignored */
+  char d_name[HTS_DIRENT_SIZE]; /* filename */
 };
 typedef struct DIR DIR;
 struct DIR {
@@ -691,8 +736,8 @@ struct DIR {
   char *name;
 };
 DIR *opendir(const char *name);
-struct dirent *readdir(DIR *dir);
-int closedir(DIR *dir);
+struct dirent *readdir(DIR * dir);
+int closedir(DIR * dir);
 #endif
 
 #endif