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 "= *"

12 files changed, 471 insertions, 276 deletions

diff --git a/libtest/callbacks-example-baselinks.c b/libtest/callbacks-example-baselinks.c
index 246c921..f6705e5 100755
--- a/libtest/callbacks-example-baselinks.c
+++ b/libtest/callbacks-example-baselinks.c
@@ -25,18 +25,21 @@
 #include "htsdefines.h"
 
 /* Local function definitions */
-static int process_file(t_hts_callbackarg *carg, httrackp* opt, char* html, int len, const char* url_address, const char* url_file);
-static int check_detectedlink(t_hts_callbackarg *carg, httrackp* opt, char* link);
-static int check_detectedlink_end(t_hts_callbackarg *carg, httrackp *opt);
+static int process_file(t_hts_callbackarg * carg, httrackp * opt, char *html,
+                        int len, const char *url_address, const char *url_file);
+static int check_detectedlink(t_hts_callbackarg * carg, httrackp * opt,
+                              char *link);
+static int check_detectedlink_end(t_hts_callbackarg * carg, httrackp * opt);
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
 
 /* 
 module entry point 
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
 
@@ -45,8 +48,9 @@ EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
   if (arg == NULL || *arg == '\0' || strlen(arg) >= HTS_URLMAXSIZE / 2) {
     fprintf(stderr, "** callback error: arguments expected or bad arguments\n");
     fprintf(stderr, "usage: httrack --wrapper modulename,base\n");
-    fprintf(stderr, "example: httrack --wrapper callback,http://www.example.com/\n");
-    return 0;  /* failed */
+    fprintf(stderr,
+            "example: httrack --wrapper callback,http://www.example.com/\n");
+    return 0;                   /* failed */
   } else {
     char *callbacks_userdef = strdup(arg);      /* userdef */
 
@@ -58,50 +62,56 @@ EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
     fprintf(stderr, "Using root '%s'\n", callbacks_userdef);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int process_file(t_hts_callbackarg *carg, httrackp* opt, char* html, int len, const char* url_address, const char* url_file) {
-  char* prevBase;
+static int process_file(t_hts_callbackarg * carg, httrackp * opt, char *html,
+                        int len, const char *url_address,
+                        const char *url_file) {
+  char *prevBase;
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, check_html) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, check_html)(CALLBACKARG_PREV_CARG(carg), opt, html, len, url_address, url_file)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, check_html)
+        (CALLBACKARG_PREV_CARG(carg), opt, html, len, url_address, url_file)) {
+      return 0;                 /* Abort */
     }
   }
 
   /* Disable base href, if any */
-  if ( ( prevBase = strstr(html, "<BASE HREF=\"") ) != NULL) {
+  if ((prevBase = strstr(html, "<BASE HREF=\"")) != NULL) {
     prevBase[1] = 'X';
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int check_detectedlink(t_hts_callbackarg *carg, httrackp* opt, char* link) {
-  const char *base = (char*) CALLBACKARG_USERDEF(carg);
+static int check_detectedlink(t_hts_callbackarg * carg, httrackp * opt,
+                              char *link) {
+  const char *base = (char *) CALLBACKARG_USERDEF(carg);
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, linkdetected) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, linkdetected)(CALLBACKARG_PREV_CARG(carg), opt, link)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, linkdetected)
+        (CALLBACKARG_PREV_CARG(carg), opt, link)) {
+      return 0;                 /* Abort */
     }
   }
 
   /* The incoming (read/write) buffer is at least HTS_URLMAXSIZE bytes long */
   if (strncmp(link, "http://", 7) == 0 || strncmp(link, "https://", 8) == 0) {
     char temp[HTS_URLMAXSIZE * 2];
+
     strcpy(temp, base);
     strcat(temp, link);
     strcpy(link, temp);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int check_detectedlink_end(t_hts_callbackarg *carg, httrackp *opt) {
-  char *base = (char*) CALLBACKARG_USERDEF(carg);
+static int check_detectedlink_end(t_hts_callbackarg * carg, httrackp * opt) {
+  char *base = (char *) CALLBACKARG_USERDEF(carg);
 
   fprintf(stderr, "Unplugged ..\n");
   if (base != NULL) {
@@ -111,8 +121,8 @@ static int check_detectedlink_end(t_hts_callbackarg *carg, httrackp *opt) {
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, end) != NULL) {
-    return CALLBACKARG_PREV_FUN(carg, end)(CALLBACKARG_PREV_CARG(carg), opt);
+    return CALLBACKARG_PREV_FUN(carg, end) (CALLBACKARG_PREV_CARG(carg), opt);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
diff --git a/libtest/callbacks-example-changecontent.c b/libtest/callbacks-example-changecontent.c
index e141789..dc6c51d 100755
--- a/libtest/callbacks-example-changecontent.c
+++ b/libtest/callbacks-example-changecontent.c
@@ -25,33 +25,36 @@
 #include "htsdefines.h"
 
 /* Local function definitions */
-static int postprocess(t_hts_callbackarg *carg, httrackp *opt, 
-                       char** html, int* len,
-                       const char* url_address, const char* url_file);
+static int postprocess(t_hts_callbackarg * carg, httrackp * opt, char **html,
+                       int *len, const char *url_address, const char *url_file);
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
 
 /* 
 module entry point 
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
 
   /* Plug callback functions */
   CHAIN_FUNCTION(opt, postprocess, postprocess, NULL);
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int postprocess(t_hts_callbackarg *carg, httrackp *opt, char** html,int* len,const char* url_address,const char* url_file) {
+static int postprocess(t_hts_callbackarg * carg, httrackp * opt, char **html,
+                       int *len, const char *url_address,
+                       const char *url_file) {
   char *old = *html;
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, postprocess) != NULL) {
-    if (CALLBACKARG_PREV_FUN(carg, postprocess)(CALLBACKARG_PREV_CARG(carg), opt, html, len, url_address, url_file)) {
+    if (CALLBACKARG_PREV_FUN(carg, postprocess)
+        (CALLBACKARG_PREV_CARG(carg), opt, html, len, url_address, url_file)) {
       /* Modified *html */
       old = *html;
     }
diff --git a/libtest/callbacks-example-contentfilter.c b/libtest/callbacks-example-contentfilter.c
index bbd2262..c98120e 100755
--- a/libtest/callbacks-example-contentfilter.c
+++ b/libtest/callbacks-example-contentfilter.c
@@ -25,11 +25,12 @@
 #include "htsdefines.h"
 
 /* Local function definitions */
-static int process(t_hts_callbackarg *carg, httrackp *opt, char* html, int len, const char* address, const char* filename);
-static int end(t_hts_callbackarg *carg, httrackp *opt);
+static int process(t_hts_callbackarg * carg, httrackp * opt, char *html,
+                   int len, const char *address, const char *filename);
+static int end(t_hts_callbackarg * carg, httrackp * opt);
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
 
 /* TOLOWER */
 #define TOLOWER_(a) (a >= 'A' && a <= 'Z') ? (a + ('a' - 'A')) : a
@@ -41,32 +42,37 @@ EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
 
 typedef struct t_my_userdef {
   char stringfilter[8192];
-  char* stringfilters[128];
+  char *stringfilters[128];
 } t_my_userdef;
 
 /* 
 module entry point 
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
 
   /* Check args */
   if (arg == NULL || *arg == '\0') {
     fprintf(stderr, "** callback error: arguments expected or bad arguments\n");
-    fprintf(stderr, "usage: httrack --wrapper callback,stringtofind,stringtofind..\n");
+    fprintf(stderr,
+            "usage: httrack --wrapper callback,stringtofind,stringtofind..\n");
     fprintf(stderr, "example: httrack --wrapper callback,apple,orange,lemon\n");
     return 0;
   } else {
-    t_my_userdef *userdef = (t_my_userdef*) malloc(sizeof(t_my_userdef));    /* userdef */
-    char * const stringfilter = userdef->stringfilter;
-    char** const stringfilters = userdef->stringfilters;
+    t_my_userdef *userdef = (t_my_userdef *) malloc(sizeof(t_my_userdef));      /* userdef */
+    char *const stringfilter = userdef->stringfilter;
+    char **const stringfilters = userdef->stringfilters;
+
     /* */
-    char* a = stringfilter;
+    char *a = stringfilter;
     int i = 0;
+
     fprintf(stderr, "** info: wrapper_init(%s) called!\n", arg);
-    fprintf(stderr, "** callback example: crawling pages only if specific keywords are found\n");
+    fprintf(stderr,
+            "** callback example: crawling pages only if specific keywords are found\n");
 
     /* stringfilters = split(arg, ','); */
     strcpy(stringfilter, arg);
@@ -75,9 +81,10 @@ EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
       a = strchr(a, ',');
       if (a != NULL) {
         *a = '\0';
-        a ++;
+        a++;
       }
-      fprintf(stderr, "** callback info: will crawl pages with '%s' in them\n", stringfilters[i]);
+      fprintf(stderr, "** callback info: will crawl pages with '%s' in them\n",
+              stringfilters[i]);
       i++;
     }
     stringfilters[i++] = NULL;
@@ -87,35 +94,42 @@ EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
     CHAIN_FUNCTION(opt, end, end, userdef);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int process(t_hts_callbackarg *carg, httrackp *opt, char* html, int len, const char* address, const char* filename) {
-  t_my_userdef *userdef = (t_my_userdef*) CALLBACKARG_USERDEF(carg);
-  /*char * const stringfilter = userdef->stringfilter;*/
-  char** const stringfilters = userdef->stringfilters;
+static int process(t_hts_callbackarg * carg, httrackp * opt, char *html,
+                   int len, const char *address, const char *filename) {
+  t_my_userdef *userdef = (t_my_userdef *) CALLBACKARG_USERDEF(carg);
+
+  /*char * const stringfilter = userdef->stringfilter; */
+  char **const stringfilters = userdef->stringfilters;
+
   /* */
   int i = 0;
   int getIt = 0;
-  char* pos;
+  char *pos;
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, check_html) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, check_html)(CALLBACKARG_PREV_CARG(carg), opt, html, len, address, filename)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, check_html)
+        (CALLBACKARG_PREV_CARG(carg), opt, html, len, address, filename)) {
+      return 0;                 /* Abort */
     }
   }
 
   /* Process */
-  if (strcmp(address, "primary") == 0 && strcmp(filename, "/primary") == 0)      /* primary page (list of links) */
+  if (strcmp(address, "primary") == 0 && strcmp(filename, "/primary") == 0)     /* primary page (list of links) */
     return 1;
-  while(stringfilters[i] != NULL && ! getIt) {
-    if ( ( pos = strstr(html, stringfilters[i]) ) != NULL) {
+  while(stringfilters[i] != NULL && !getIt) {
+    if ((pos = strstr(html, stringfilters[i])) != NULL) {
       int j;
+
       getIt = 1;
-      fprintf(stderr, "** callback info: found '%s' keyword in '%s%s', crawling this page!\n", stringfilters[i], address, filename);
+      fprintf(stderr,
+              "** callback info: found '%s' keyword in '%s%s', crawling this page!\n",
+              stringfilters[i], address, filename);
       fprintf(stderr, "** details:\n(..)");
-      for(j = 0; j < 72 && pos[j] ; j++) {
+      for(j = 0; j < 72 && pos[j]; j++) {
         if (pos[j] > 32)
           fprintf(stderr, "%c", pos[j]);
         else
@@ -126,15 +140,18 @@ static int process(t_hts_callbackarg *carg, httrackp *opt, char* html, int len,
     i++;
   }
   if (getIt) {
-    return 1;  /* success */
+    return 1;                   /* success */
   } else {
-    fprintf(stderr, "** callback info: won't parse '%s%s' (no specified keywords found)\n", address, filename);
-    return 0;  /* this page sucks, don't parse it */
+    fprintf(stderr,
+            "** callback info: won't parse '%s%s' (no specified keywords found)\n",
+            address, filename);
+    return 0;                   /* this page sucks, don't parse it */
   }
 }
 
-static int end(t_hts_callbackarg *carg, httrackp *opt) {
-  t_my_userdef *userdef = (t_my_userdef*) CALLBACKARG_USERDEF(carg);
+static int end(t_hts_callbackarg * carg, httrackp * opt) {
+  t_my_userdef *userdef = (t_my_userdef *) CALLBACKARG_USERDEF(carg);
+
   fprintf(stderr, "** info: wrapper_exit() called!\n");
   if (userdef != NULL) {
     free(userdef);
@@ -143,8 +160,8 @@ static int end(t_hts_callbackarg *carg, httrackp *opt) {
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, end) != NULL) {
-    return CALLBACKARG_PREV_FUN(carg, end)(CALLBACKARG_PREV_CARG(carg), opt);
+    return CALLBACKARG_PREV_FUN(carg, end) (CALLBACKARG_PREV_CARG(carg), opt);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
diff --git a/libtest/callbacks-example-displayheader.c b/libtest/callbacks-example-displayheader.c
index ae1efd4..bb71e5f 100755
--- a/libtest/callbacks-example-displayheader.c
+++ b/libtest/callbacks-example-displayheader.c
@@ -25,42 +25,43 @@
 #include "htsdefines.h"
 
 /* Local function definitions */
-static int process(t_hts_callbackarg *carg, httrackp *opt, 
-                   char* buff, const char* adr, const char* fil, 
-                   const char* referer_adr, const char* referer_fil, 
-                   htsblk* incoming);
+static int process(t_hts_callbackarg * carg, httrackp * opt, char *buff,
+                   const char *adr, const char *fil, const char *referer_adr,
+                   const char *referer_fil, htsblk * incoming);
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
 
 /* 
 module entry point 
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
 
   /* Plug callback functions */
   CHAIN_FUNCTION(opt, receivehead, process, NULL);
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int process(t_hts_callbackarg *carg, httrackp *opt, 
-                   char* buff, const char* adr, const char* fil, 
-                   const char* referer_adr, const char* referer_fil, 
-                   htsblk* incoming) {
+static int process(t_hts_callbackarg * carg, httrackp * opt, char *buff,
+                   const char *adr, const char *fil, const char *referer_adr,
+                   const char *referer_fil, htsblk * incoming) {
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, receivehead) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, receivehead)(CALLBACKARG_PREV_CARG(carg), opt, buff, adr, fil, referer_adr, referer_fil, incoming)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, receivehead)
+        (CALLBACKARG_PREV_CARG(carg), opt, buff, adr, fil, referer_adr,
+         referer_fil, incoming)) {
+      return 0;                 /* Abort */
     }
   }
 
   /* Process */
   printf("[ %s%s ]\n%s\n", adr, fil, buff);
 
-  return 1;   /* success */
+  return 1;                     /* success */
 }
diff --git a/libtest/callbacks-example-filename.c b/libtest/callbacks-example-filename.c
index 361ebb0..4e1fbc5 100755
--- a/libtest/callbacks-example-filename.c
+++ b/libtest/callbacks-example-filename.c
@@ -24,10 +24,13 @@
 #include "htsdefines.h"
 
 /* Local function definitions */
-static int mysavename(t_hts_callbackarg *carg, httrackp *opt, const char* adr_complete, const char* fil_complete, const char* referer_adr, const char* referer_fil, char* save);
+static int mysavename(t_hts_callbackarg * carg, httrackp * opt,
+                      const char *adr_complete, const char *fil_complete,
+                      const char *referer_adr, const char *referer_fil,
+                      char *save);
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
 
 /* Options settings */
 #include "htsopt.h"
@@ -54,33 +57,40 @@ EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
 /* 
 module entry point 
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
 
   /* Plug callback functions */
   CHAIN_FUNCTION(opt, savename, mysavename, NULL);
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int mysavename(t_hts_callbackarg *carg, httrackp *opt, const char* adr_complete, const char* fil_complete, const char* referer_adr, const char* referer_fil, char* save) {
-  char* a;
+static int mysavename(t_hts_callbackarg * carg, httrackp * opt,
+                      const char *adr_complete, const char *fil_complete,
+                      const char *referer_adr, const char *referer_fil,
+                      char *save) {
+  char *a;
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, savename) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, savename)(CALLBACKARG_PREV_CARG(carg), opt, adr_complete, fil_complete, referer_adr, referer_fil, save)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, savename)
+        (CALLBACKARG_PREV_CARG(carg), opt, adr_complete, fil_complete,
+         referer_adr, referer_fil, save)) {
+      return 0;                 /* Abort */
     }
   }
 
   /* Process */
-  for(a = save ; *a != 0 ; a++) {
+  for(a = save; *a != 0; a++) {
     char c = TOLOWER(*a);
+
     if (c >= 'a' && c <= 'z')
-      *a = ( ( ( c - 'a' ) + 13 ) % 26 ) + 'a';     // ROT-13
+      *a = (((c - 'a') + 13) % 26) + 'a';       // ROT-13
   }
-  
-  return 1;  /* success */
+
+  return 1;                     /* success */
 }
diff --git a/libtest/callbacks-example-filename2.c b/libtest/callbacks-example-filename2.c
index 2683b7b..fe2d964 100755
--- a/libtest/callbacks-example-filename2.c
+++ b/libtest/callbacks-example-filename2.c
@@ -21,11 +21,14 @@
 #include "htsdefines.h"
 
 /* Function definitions */
-static int mysavename(t_hts_callbackarg *carg, httrackp *opt, const char* adr_complete, const char* fil_complete, const char* referer_adr, const char* referer_fil, char* save);
-static int myend(t_hts_callbackarg *carg, httrackp *opt);
+static int mysavename(t_hts_callbackarg * carg, httrackp * opt,
+                      const char *adr_complete, const char *fil_complete,
+                      const char *referer_adr, const char *referer_fil,
+                      char *save);
+static int myend(t_hts_callbackarg * carg, httrackp * opt);
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
 
 /* TOLOWER */
 #define TOLOWER_(a) (a >= 'A' && a <= 'Z') ? (a + ('a' - 'A')) : a
@@ -45,41 +48,46 @@ typedef struct t_my_userdef {
 /* 
 module entry point 
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
 
   /* Check args */
   if (arg == NULL || *arg == '\0' || strchr(arg, ',') == NULL) {
     fprintf(stderr, "** callback error: arguments expected or bad arguments\n");
-    fprintf(stderr, "usage: httrack --wrapper save-name=callback:mysavename,string1,string2\n");
-    fprintf(stderr, "example: httrack --wrapper save-name=callback:mysavename,foo,bar\n");
-    return 0;   /* failed */
+    fprintf(stderr,
+            "usage: httrack --wrapper save-name=callback:mysavename,string1,string2\n");
+    fprintf(stderr,
+            "example: httrack --wrapper save-name=callback:mysavename,foo,bar\n");
+    return 0;                   /* failed */
   } else {
     char *pos = strchr(arg, ',');
-    t_my_userdef *userdef = (t_my_userdef*) malloc(sizeof(t_my_userdef));
-    char * const string1 = userdef->string1;
-    char * const string2 = userdef->string2;
+    t_my_userdef *userdef = (t_my_userdef *) malloc(sizeof(t_my_userdef));
+    char *const string1 = userdef->string1;
+    char *const string2 = userdef->string2;
 
     /* Split args */
     fprintf(stderr, "** info: wrapper_init(%s) called!\n", arg);
-    fprintf(stderr, "** callback example: changing destination filename word by another one\n");
+    fprintf(stderr,
+            "** callback example: changing destination filename word by another one\n");
     string1[0] = string1[1] = '\0';
     strncat(string1, arg, pos - arg);
     strcpy(string2, pos + 1);
-    fprintf(stderr, "** callback info: will replace %s by %s in filenames!\n", string1, string2);
+    fprintf(stderr, "** callback info: will replace %s by %s in filenames!\n",
+            string1, string2);
 
     /* Plug callback functions */
     CHAIN_FUNCTION(opt, savename, mysavename, userdef);
     CHAIN_FUNCTION(opt, end, myend, userdef);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int myend(t_hts_callbackarg *carg, httrackp *opt) {
-  t_my_userdef *userdef = (t_my_userdef*) CALLBACKARG_USERDEF(carg);
+static int myend(t_hts_callbackarg * carg, httrackp * opt) {
+  t_my_userdef *userdef = (t_my_userdef *) CALLBACKARG_USERDEF(carg);
 
   fprintf(stderr, "** info: wrapper_exit() called!\n");
   if (userdef != NULL) {
@@ -89,23 +97,29 @@ static int myend(t_hts_callbackarg *carg, httrackp *opt) {
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, end) != NULL) {
-    return CALLBACKARG_PREV_FUN(carg, end)(CALLBACKARG_PREV_CARG(carg), opt);
+    return CALLBACKARG_PREV_FUN(carg, end) (CALLBACKARG_PREV_CARG(carg), opt);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int mysavename(t_hts_callbackarg *carg, httrackp *opt, const char* adr_complete, const char* fil_complete, const char* referer_adr, const char* referer_fil, char* save) {
-  t_my_userdef *userdef = (t_my_userdef*) CALLBACKARG_USERDEF(carg);
-  char * const string1 = userdef->string1;
-  char * const string2 = userdef->string2;
+static int mysavename(t_hts_callbackarg * carg, httrackp * opt,
+                      const char *adr_complete, const char *fil_complete,
+                      const char *referer_adr, const char *referer_fil,
+                      char *save) {
+  t_my_userdef *userdef = (t_my_userdef *) CALLBACKARG_USERDEF(carg);
+  char *const string1 = userdef->string1;
+  char *const string2 = userdef->string2;
+
   /* */
   char *buff, *a, *b;
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, savename) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, savename)(CALLBACKARG_PREV_CARG(carg), opt, adr_complete, fil_complete, referer_adr, referer_fil, save)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, savename)
+        (CALLBACKARG_PREV_CARG(carg), opt, adr_complete, fil_complete,
+         referer_adr, referer_fil, save)) {
+      return 0;                 /* Abort */
     }
   }
 
@@ -113,9 +127,9 @@ static int mysavename(t_hts_callbackarg *carg, httrackp *opt, const char* adr_co
   buff = strdup(save);
   a = buff;
   b = save;
-  *b = '\0';          /* the "save" variable points to a buffer with "sufficient" space */
+  *b = '\0';                    /* the "save" variable points to a buffer with "sufficient" space */
   while(*a) {
-    if (strncmp(a, string1, (int)strlen(string1)) == 0) {
+    if (strncmp(a, string1, (int) strlen(string1)) == 0) {
       strcat(b, string2);
       b += strlen(b);
       a += strlen(string1);
@@ -126,5 +140,5 @@ static int mysavename(t_hts_callbackarg *carg, httrackp *opt, const char* adr_co
   }
   free(buff);
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
diff --git a/libtest/callbacks-example-filenameiisbug.c b/libtest/callbacks-example-filenameiisbug.c
index bd882cf..b615abc 100755
--- a/libtest/callbacks-example-filenameiisbug.c
+++ b/libtest/callbacks-example-filenameiisbug.c
@@ -21,49 +21,61 @@
 #include "htsdefines.h"
 
 /* Function definitions */
-static int mysavename(t_hts_callbackarg *carg, httrackp *opt, const char* adr_complete, const char* fil_complete, const char* referer_adr, const char* referer_fil, char* save);
+static int mysavename(t_hts_callbackarg * carg, httrackp * opt,
+                      const char *adr_complete, const char *fil_complete,
+                      const char *referer_adr, const char *referer_fil,
+                      char *save);
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
 
 /* 
 module entry point 
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
   CHAIN_FUNCTION(opt, savename, mysavename, NULL);
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
 /*
   Replaces all "offending" IIS extensions (exe, dll..) with "nice" ones
 */
-static int mysavename(t_hts_callbackarg *carg, httrackp *opt, const char* adr_complete, const char* fil_complete, const char* referer_adr, const char* referer_fil, char* save) {
-  static const char* iisBogus[]        = { ".com", ".exe", ".dll", ".sh", NULL };
-  static const char* iisBogusReplace[] = { ".c0m", ".ex3", ".dl1", ".5h", NULL }; /* MUST be the same sizes */
-  char* a;
+static int mysavename(t_hts_callbackarg * carg, httrackp * opt,
+                      const char *adr_complete, const char *fil_complete,
+                      const char *referer_adr, const char *referer_fil,
+                      char *save) {
+  static const char *iisBogus[] = { ".com", ".exe", ".dll", ".sh", NULL };
+  static const char *iisBogusReplace[] = { ".c0m", ".ex3", ".dl1", ".5h", NULL };       /* MUST be the same sizes */
+  char *a;
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, savename) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, savename)(CALLBACKARG_PREV_CARG(carg), opt, adr_complete, fil_complete, referer_adr, referer_fil, save)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, savename)
+        (CALLBACKARG_PREV_CARG(carg), opt, adr_complete, fil_complete,
+         referer_adr, referer_fil, save)) {
+      return 0;                 /* Abort */
     }
   }
 
   /* Process */
-  for(a = save ; *a != '\0' ; a++) {
+  for(a = save; *a != '\0'; a++) {
     int i;
-    for(i = 0 ; iisBogus[i] != NULL ; i++) {
+
+    for(i = 0; iisBogus[i] != NULL; i++) {
       int j;
-      for(j = 0 ; iisBogus[i][j] == a[j] && iisBogus[i][j] != '\0' ; j++);
-      if (iisBogus[i][j] == '\0' && ( a[j] == '\0' || a[j] == '/' || a[j] == '\\' ) ) {
+
+      for(j = 0; iisBogus[i][j] == a[j] && iisBogus[i][j] != '\0'; j++) ;
+      if (iisBogus[i][j] == '\0'
+          && (a[j] == '\0' || a[j] == '/' || a[j] == '\\')) {
         strncpy(a, iisBogusReplace[i], strlen(iisBogusReplace[i]));
         break;
       }
     }
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
diff --git a/libtest/callbacks-example-listlinks.c b/libtest/callbacks-example-listlinks.c
index 8828f3f..390d7aa 100755
--- a/libtest/callbacks-example-listlinks.c
+++ b/libtest/callbacks-example-listlinks.c
@@ -24,13 +24,17 @@
 #include "htsdefines.h"
 
 /* Function definitions */
-static int process_file(t_hts_callbackarg *carg, httrackp *opt, char* html, int len, const char* url_address, const char* url_file);
-static int check_detectedlink(t_hts_callbackarg *carg, httrackp *opt, char* link);
-static int check_loop(t_hts_callbackarg *carg, httrackp *opt, void* back,int back_max,int back_index,int lien_tot,int lien_ntot,int stat_time,hts_stat_struct* stats);
-static int end(t_hts_callbackarg *carg, httrackp *opt);
+static int process_file(t_hts_callbackarg * carg, httrackp * opt, char *html,
+                        int len, const char *url_address, const char *url_file);
+static int check_detectedlink(t_hts_callbackarg * carg, httrackp * opt,
+                              char *link);
+static int check_loop(t_hts_callbackarg * carg, httrackp * opt, void *back,
+                      int back_max, int back_index, int lien_tot, int lien_ntot,
+                      int stat_time, hts_stat_struct * stats);
+static int end(t_hts_callbackarg * carg, httrackp * opt);
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
 
 /*
   This sample just lists all links in documents with the parent link:
@@ -45,15 +49,17 @@ typedef struct t_my_userdef {
 /* 
 module entry point 
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   t_my_userdef *userdef;
+
   /* */
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
 
   /* Create user-defined structure */
-  userdef = (t_my_userdef*) malloc(sizeof(t_my_userdef));    /* userdef */
+  userdef = (t_my_userdef *) malloc(sizeof(t_my_userdef));      /* userdef */
   userdef->currentURLBeingParsed[0] = '\0';
 
   /* Plug callback functions */
@@ -62,17 +68,20 @@ EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
   CHAIN_FUNCTION(opt, linkdetected, check_detectedlink, userdef);
   CHAIN_FUNCTION(opt, loop, check_loop, userdef);
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int process_file(t_hts_callbackarg *carg, httrackp *opt, char* html, int len, const char* url_address, const char* url_file) {
-  t_my_userdef *userdef = (t_my_userdef*) CALLBACKARG_USERDEF(carg);
-  char * const currentURLBeingParsed = userdef->currentURLBeingParsed;
+static int process_file(t_hts_callbackarg * carg, httrackp * opt, char *html,
+                        int len, const char *url_address,
+                        const char *url_file) {
+  t_my_userdef *userdef = (t_my_userdef *) CALLBACKARG_USERDEF(carg);
+  char *const currentURLBeingParsed = userdef->currentURLBeingParsed;
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, check_html) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, check_html)(CALLBACKARG_PREV_CARG(carg), opt, html, len, url_address, url_file)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, check_html)
+        (CALLBACKARG_PREV_CARG(carg), opt, html, len, url_address, url_file)) {
+      return 0;                 /* Abort */
     }
   }
 
@@ -81,43 +90,50 @@ static int process_file(t_hts_callbackarg *carg, httrackp *opt, char* html, int
   strcpy(currentURLBeingParsed, url_address);
   strcat(currentURLBeingParsed, url_file);
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int check_detectedlink(t_hts_callbackarg *carg, httrackp *opt, char* link) {
-  t_my_userdef *userdef = (t_my_userdef*) CALLBACKARG_USERDEF(carg);
-  char * const currentURLBeingParsed = userdef->currentURLBeingParsed;
+static int check_detectedlink(t_hts_callbackarg * carg, httrackp * opt,
+                              char *link) {
+  t_my_userdef *userdef = (t_my_userdef *) CALLBACKARG_USERDEF(carg);
+  char *const currentURLBeingParsed = userdef->currentURLBeingParsed;
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, linkdetected) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, linkdetected)(CALLBACKARG_PREV_CARG(carg), opt, link)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, linkdetected)
+        (CALLBACKARG_PREV_CARG(carg), opt, link)) {
+      return 0;                 /* Abort */
     }
   }
 
   /* Process */
   printf("[%s] -> [%s]\n", currentURLBeingParsed, link);
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int check_loop(t_hts_callbackarg *carg, httrackp *opt, void* back,int back_max,int back_index,int lien_tot,int lien_ntot,int stat_time,hts_stat_struct* stats) {
-  static int fun_animation=0;
+static int check_loop(t_hts_callbackarg * carg, httrackp * opt, void *back,
+                      int back_max, int back_index, int lien_tot, int lien_ntot,
+                      int stat_time, hts_stat_struct * stats) {
+  static int fun_animation = 0;
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, loop) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, loop)(CALLBACKARG_PREV_CARG(carg), opt, back, back_max, back_index, lien_tot, lien_ntot, stat_time, stats)) {
-      return 0;  /* Abort */
+    if (!CALLBACKARG_PREV_FUN(carg, loop)
+        (CALLBACKARG_PREV_CARG(carg), opt, back, back_max, back_index, lien_tot,
+         lien_ntot, stat_time, stats)) {
+      return 0;                 /* Abort */
     }
   }
 
   /* Process */
-  printf("%c\r", "/-\\|"[(fun_animation++)%4]);
+  printf("%c\r", "/-\\|"[(fun_animation++) % 4]);
   return 1;
 }
 
-static int end(t_hts_callbackarg *carg, httrackp *opt) {
-  t_my_userdef *userdef = (t_my_userdef*) CALLBACKARG_USERDEF(carg);
+static int end(t_hts_callbackarg * carg, httrackp * opt) {
+  t_my_userdef *userdef = (t_my_userdef *) CALLBACKARG_USERDEF(carg);
+
   fprintf(stderr, "** info: wrapper_exit() called!\n");
   if (userdef != NULL) {
     free(userdef);
@@ -126,8 +142,8 @@ static int end(t_hts_callbackarg *carg, httrackp *opt) {
 
   /* Call parent functions if multiple callbacks are chained. */
   if (CALLBACKARG_PREV_FUN(carg, end) != NULL) {
-    return CALLBACKARG_PREV_FUN(carg, end)(CALLBACKARG_PREV_CARG(carg), opt);
+    return CALLBACKARG_PREV_FUN(carg, end) (CALLBACKARG_PREV_CARG(carg), opt);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
diff --git a/libtest/callbacks-example-log.c b/libtest/callbacks-example-log.c
index 21881b7..d7d1465 100755
--- a/libtest/callbacks-example-log.c
+++ b/libtest/callbacks-example-log.c
@@ -24,23 +24,24 @@
 #include "htsdefines.h"
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
-EXTERNAL_FUNCTION int hts_unplug(httrackp *opt);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
+EXTERNAL_FUNCTION int hts_unplug(httrackp * opt);
 
 /* local function called as "check_html" callback */
-static int process_file(t_hts_callbackarg *carg, httrackp *opt, 
-                        char* html, int len, const char* url_address, const char* url_file) {
-  void *ourDummyArg = (void*) CALLBACKARG_USERDEF(carg);    /*optional user-defined arg*/
+static int process_file(t_hts_callbackarg * carg, httrackp * opt, char *html,
+                        int len, const char *url_address,
+                        const char *url_file) {
+  void *ourDummyArg = (void *) CALLBACKARG_USERDEF(carg);       /*optional user-defined arg */
   char *fmt;
 
   (void) ourDummyArg;
 
   /* call parent functions if multiple callbacks are chained. you can skip this part, if you don't want previous callbacks to be called. */
   if (CALLBACKARG_PREV_FUN(carg, check_html) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, check_html)(CALLBACKARG_PREV_CARG(carg), opt,
-                                                html, len, url_address, url_file)) {
-        return 0;  /* abort */
-      }
+    if (!CALLBACKARG_PREV_FUN(carg, check_html)
+        (CALLBACKARG_PREV_CARG(carg), opt, html, len, url_address, url_file)) {
+      return 0;                 /* abort */
+    }
   }
 
   /* log */
@@ -50,11 +51,11 @@ static int process_file(t_hts_callbackarg *carg, httrackp *opt,
   hts_log(opt, "log-wrapper-info", fmt);
   free(fmt);
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
-static int start_of_mirror(t_hts_callbackarg *carg, httrackp *opt) {
-  const char *arginfo = (char*) CALLBACKARG_USERDEF(carg);
+static int start_of_mirror(t_hts_callbackarg * carg, httrackp * opt) {
+  const char *arginfo = (char *) CALLBACKARG_USERDEF(carg);
 
   fprintf(stderr, "* mirror start\n");
   hts_log(opt, arginfo, "mirror started");
@@ -62,15 +63,15 @@ static int start_of_mirror(t_hts_callbackarg *carg, httrackp *opt) {
   /* call parent functions if multiple callbacks are chained. you can skip this part, if you don't want previous callbacks to be called. */
   if (CALLBACKARG_PREV_FUN(carg, end) != NULL) {
     /* status is ok on our side, return other callabck's status */
-    return CALLBACKARG_PREV_FUN(carg, start)(CALLBACKARG_PREV_CARG(carg), opt);
+    return CALLBACKARG_PREV_FUN(carg, start) (CALLBACKARG_PREV_CARG(carg), opt);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
 /* local function called as "end" callback */
-static int end_of_mirror(t_hts_callbackarg *carg, httrackp *opt) {
-  const char *arginfo = (char*) CALLBACKARG_USERDEF(carg);
+static int end_of_mirror(t_hts_callbackarg * carg, httrackp * opt) {
+  const char *arginfo = (char *) CALLBACKARG_USERDEF(carg);
 
   fprintf(stderr, "* mirror end\n");
   hts_log(opt, arginfo, "mirror ended");
@@ -78,19 +79,20 @@ static int end_of_mirror(t_hts_callbackarg *carg, httrackp *opt) {
   /* call parent functions if multiple callbacks are chained. you can skip this part, if you don't want previous callbacks to be called. */
   if (CALLBACKARG_PREV_FUN(carg, end) != NULL) {
     /* status is ok on our side, return other callabck's status */
-    return CALLBACKARG_PREV_FUN(carg, end)(CALLBACKARG_PREV_CARG(carg), opt);
+    return CALLBACKARG_PREV_FUN(carg, end) (CALLBACKARG_PREV_CARG(carg), opt);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
 /*
 module entry point
 the function name and prototype MUST match this prototype
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   /* optional argument passed in the commandline we won't be using here */
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
 
@@ -98,19 +100,19 @@ EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
   if (arg == NULL)
     arg = "log-wrapper-info";
   hts_log(opt, arg, "* plugging functions");
-  CHAIN_FUNCTION(opt, check_html, process_file, (char*) arg);
-  CHAIN_FUNCTION(opt, start, start_of_mirror, (char*) arg);
-  CHAIN_FUNCTION(opt, end, end_of_mirror, (char*) arg);
+  CHAIN_FUNCTION(opt, check_html, process_file, (char *) arg);
+  CHAIN_FUNCTION(opt, start, start_of_mirror, (char *) arg);
+  CHAIN_FUNCTION(opt, end, end_of_mirror, (char *) arg);
 
   hts_log(opt, arg, "* module successfully plugged");
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
 /*
 module exit point
 the function name and prototype MUST match this prototype
 */
-EXTERNAL_FUNCTION int hts_unplug(httrackp *opt) {
+EXTERNAL_FUNCTION int hts_unplug(httrackp * opt) {
   hts_log(opt, "log-wrapper-info", "* module successfully unplugged");
   return 1;
 }
diff --git a/libtest/callbacks-example-simple.c b/libtest/callbacks-example-simple.c
index f481ed2..975f695 100755
--- a/libtest/callbacks-example-simple.c
+++ b/libtest/callbacks-example-simple.c
@@ -24,32 +24,37 @@
 #include "htsdefines.h"
 
 /* external functions */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv);
-EXTERNAL_FUNCTION int hts_unplug(httrackp *opt);
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv);
+EXTERNAL_FUNCTION int hts_unplug(httrackp * opt);
 
 /* local function called as "check_html" callback */
-static int process_file(t_hts_callbackarg /*the carg structure, holding various information*/*carg, /*the option settings*/httrackp *opt, 
-                        /*other parameters are callback-specific*/
-                        char* html, int len, const char* url_address, const char* url_file) {
-  void *ourDummyArg = (void*) CALLBACKARG_USERDEF(carg);    /*optional user-defined arg*/
+static int process_file(t_hts_callbackarg
+                        /*the carg structure, holding various information */  *
+                        carg, /*the option settings */ httrackp * opt,
+                        /*other parameters are callback-specific */
+                        char *html, int len, const char *url_address,
+                        const char *url_file) {
+  void *ourDummyArg = (void *) CALLBACKARG_USERDEF(carg);       /*optional user-defined arg */
 
   (void) ourDummyArg;
 
   /* call parent functions if multiple callbacks are chained. you can skip this part, if you don't want previous callbacks to be called. */
   if (CALLBACKARG_PREV_FUN(carg, check_html) != NULL) {
-    if (!CALLBACKARG_PREV_FUN(carg, check_html)(CALLBACKARG_PREV_CARG(carg), opt,
-                                                html, len, url_address, url_file)) {
-        return 0;  /* abort */
-      }
+    if (!CALLBACKARG_PREV_FUN(carg, check_html)
+        (CALLBACKARG_PREV_CARG(carg), opt, html, len, url_address, url_file)) {
+      return 0;                 /* abort */
+    }
   }
 
   printf("file %s%s content: %s\n", url_address, url_file, html);
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
 /* local function called as "end" callback */
-static int end_of_mirror(t_hts_callbackarg /*the carg structure, holding various information*/*carg, /*the option settings*/httrackp *opt) {
-  void *ourDummyArg = (void*) CALLBACKARG_USERDEF(carg);    /*optional user-defined arg*/
+static int end_of_mirror(t_hts_callbackarg
+                         /*the carg structure, holding various information */  *
+                         carg, /*the option settings */ httrackp * opt) {
+  void *ourDummyArg = (void *) CALLBACKARG_USERDEF(carg);       /*optional user-defined arg */
 
   (void) ourDummyArg;
 
@@ -59,35 +64,37 @@ static int end_of_mirror(t_hts_callbackarg /*the carg structure, holding various
   /* call parent functions if multiple callbacks are chained. you can skip this part, if you don't want previous callbacks to be called. */
   if (CALLBACKARG_PREV_FUN(carg, end) != NULL) {
     /* status is ok on our side, return other callabck's status */
-    return CALLBACKARG_PREV_FUN(carg, end)(CALLBACKARG_PREV_CARG(carg), opt);
+    return CALLBACKARG_PREV_FUN(carg, end) (CALLBACKARG_PREV_CARG(carg), opt);
   }
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
 /*
 module entry point
 the function name and prototype MUST match this prototype
 */
-EXTERNAL_FUNCTION int hts_plug(httrackp *opt, const char* argv) {
+EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   /* optional argument passed in the commandline we won't be using here */
   const char *arg = strchr(argv, ',');
+
   if (arg != NULL)
     arg++;
 
   /* plug callback functions */
-  CHAIN_FUNCTION(opt, check_html, process_file, /*optional user-defined arg*/NULL);
-  CHAIN_FUNCTION(opt, end, end_of_mirror, /*optional user-defined arg*/NULL);
+  CHAIN_FUNCTION(opt, check_html, process_file, /*optional user-defined arg */
+                 NULL);
+  CHAIN_FUNCTION(opt, end, end_of_mirror, /*optional user-defined arg */ NULL);
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
 
 /*
 module exit point
 the function name and prototype MUST match this prototype
 */
-EXTERNAL_FUNCTION int hts_unplug(httrackp *opt) {
+EXTERNAL_FUNCTION int hts_unplug(httrackp * opt) {
   fprintf(stderr, "Module unplugged");
 
-  return 1;  /* success */
+  return 1;                     /* success */
 }
diff --git a/libtest/example.c b/libtest/example.c
index 21f7254..2556830 100644
--- a/libtest/example.c
+++ b/libtest/example.c
@@ -38,34 +38,36 @@ int main(void) {
   /* 
      First, ask for an URL 
      Note: For the test, option r2 (mirror max depth=1) and --testscan (no index, no cache, do not store, no log files)
-  */
-  char _argv[][256] = {"httrack_test" , "<URL>" , "-r3" , "--testscan" , ""  };
-  char* argv[]      = {NULL           , NULL    , NULL  , NULL        , NULL};
-  int         argc = 0;
+   */
+  char _argv[][256] = { "httrack_test", "<URL>", "-r3", "--testscan", "" };
+  char *argv[] = { NULL, NULL, NULL, NULL, NULL };
+  int argc = 0;
   httrackp *opt;
-	int ret;
+  int ret;
+
   while(strlen(_argv[argc])) {
-    argv[argc]=_argv[argc];
+    argv[argc] = _argv[argc];
     argc++;
   }
-  argv[argc]=NULL;
+  argv[argc] = NULL;
   printf("HTTrackLib test program\n");
   printf("Enter URL (example: www.foobar.com/index.html) :");
-  scanf("%s",argv[1]);
+  scanf("%s", argv[1]);
   printf("Test: 1 depth\n");
 
-	/* Initialize the library */
+  /* Initialize the library */
 #ifdef _WIN32
   {
-    WORD   wVersionRequested;   // requested version WinSock API
+    WORD wVersionRequested;     // requested version WinSock API
     WSADATA wsadata;            // Windows Sockets API data
     int stat;
+
     wVersionRequested = 0x0101;
-    stat = WSAStartup( wVersionRequested, &wsadata );
+    stat = WSAStartup(wVersionRequested, &wsadata);
     if (stat != 0) {
       printf("Winsock not found!\n");
       return;
-    } else if (LOBYTE(wsadata.wVersion) != 1  && HIBYTE(wsadata.wVersion) != 1) {
+    } else if (LOBYTE(wsadata.wVersion) != 1 && HIBYTE(wsadata.wVersion) != 1) {
       printf("WINSOCK.DLL does not support version 1.1\n");
       WSACleanup();
       return;
@@ -74,8 +76,8 @@ int main(void) {
 #endif
   hts_init();
 
-	/* Create option settings and set callbacks (wrappers) */
-	opt = hts_create_opt();
+  /* Create option settings and set callbacks (wrappers) */
+  opt = hts_create_opt();
 
   CHAIN_FUNCTION(opt, init, httrack_wrapper_init, NULL);
   CHAIN_FUNCTION(opt, uninit, httrack_wrapper_uninit, NULL);
@@ -102,15 +104,15 @@ int main(void) {
   CHAIN_FUNCTION(opt, receivehead, httrack_wrapper_receiveheader, NULL);
 
   /* Then, launch the mirror */
-	ret = hts_main2(argc, argv, opt);
+  ret = hts_main2(argc, argv, opt);
 
   /* Wait for a key */
   printf("\nPress ENTER key to exit\n");
-  scanf("%s",argv[1]);
+  scanf("%s", argv[1]);
 
-	/* Clear option state */
-	hts_free_opt(opt);
-	hts_uninit();
+  /* Clear option state */
+  hts_free_opt(opt);
+  hts_uninit();
 #ifdef _WIN32
   WSACleanup();
 #endif
@@ -119,83 +121,132 @@ int main(void) {
   return 0;
 }
 
-
 /* CALLBACK FUNCTIONS */
 
 /* Initialize the Winsock */
-static void CDECL httrack_wrapper_init(t_hts_callbackarg *carg) {
+static void CDECL httrack_wrapper_init(t_hts_callbackarg * carg) {
   printf("Engine started\n");
 }
-static void CDECL httrack_wrapper_uninit(t_hts_callbackarg *carg) {
+static void CDECL httrack_wrapper_uninit(t_hts_callbackarg * carg) {
   printf("Engine exited\n");
 }
-static int CDECL httrack_wrapper_start(t_hts_callbackarg *carg, httrackp* opt) {
+static int CDECL httrack_wrapper_start(t_hts_callbackarg * carg, httrackp * opt) {
   printf("Start of mirror\n");
-  return 1; 
+  return 1;
 }
-static int CDECL httrack_wrapper_chopt(t_hts_callbackarg *carg, httrackp* opt) {
+static int CDECL httrack_wrapper_chopt(t_hts_callbackarg * carg, httrackp * opt) {
   return 1;
 }
-static int CDECL httrack_wrapper_end(t_hts_callbackarg *carg, httrackp* opt) { 
+static int CDECL httrack_wrapper_end(t_hts_callbackarg * carg, httrackp * opt) {
   printf("End of mirror\n");
-  return 1; 
+  return 1;
 }
-static int CDECL httrack_wrapper_checkhtml(t_hts_callbackarg *carg, httrackp *opt,  char* html,int len,const char* url_address,const char* url_file) {
-  printf("Parsing html file: http://%s%s\n",url_address,url_file);
+static int CDECL httrack_wrapper_checkhtml(t_hts_callbackarg * carg,
+                                           httrackp * opt, char *html, int len,
+                                           const char *url_address,
+                                           const char *url_file) {
+  printf("Parsing html file: http://%s%s\n", url_address, url_file);
   return 1;
 }
-static int CDECL httrack_wrapper_loop(t_hts_callbackarg *carg, httrackp *opt,  void* _back,int back_max,int back_index,int lien_n,int lien_tot,int stat_time,hts_stat_struct* stats) {
+static int CDECL httrack_wrapper_loop(t_hts_callbackarg * carg, httrackp * opt,
+                                      void *_back, int back_max, int back_index,
+                                      int lien_n, int lien_tot, int stat_time,
+                                      hts_stat_struct * stats) {
   /* printf("..httrack_wrapper_loop called\n"); */
   return 1;
 }
-static const char* CDECL httrack_wrapper_query(t_hts_callbackarg *carg, httrackp *opt,  const char* question) {
+static const char *CDECL httrack_wrapper_query(t_hts_callbackarg * carg,
+                                               httrackp * opt,
+                                               const char *question) {
   /* Answer is No */
   return "N";
 }
-static const char* CDECL httrack_wrapper_query2(t_hts_callbackarg *carg, httrackp *opt,  const char* question) {
+static const char *CDECL httrack_wrapper_query2(t_hts_callbackarg * carg,
+                                                httrackp * opt,
+                                                const char *question) {
   /* Answer is No */
   return "N";
 }
-static const char* CDECL httrack_wrapper_query3(t_hts_callbackarg *carg, httrackp *opt,  const char* question) {
+static const char *CDECL httrack_wrapper_query3(t_hts_callbackarg * carg,
+                                                httrackp * opt,
+                                                const char *question) {
   /* Answer is "" */
   return "";
 }
-static int CDECL httrack_wrapper_check(t_hts_callbackarg *carg, httrackp *opt,  const char* adr,const char* fil,int status) {
-  printf("Link status tested: http://%s%s\n",adr,fil);
+static int CDECL httrack_wrapper_check(t_hts_callbackarg * carg, httrackp * opt,
+                                       const char *adr, const char *fil,
+                                       int status) {
+  printf("Link status tested: http://%s%s\n", adr, fil);
   return -1;
 }
-static void CDECL httrack_wrapper_pause(t_hts_callbackarg *carg, httrackp *opt,  const char* lockfile) {
+static void CDECL httrack_wrapper_pause(t_hts_callbackarg * carg,
+                                        httrackp * opt, const char *lockfile) {
   /* Wait until lockfile is removed.. */
 }
-static void CDECL httrack_wrapper_filesave(t_hts_callbackarg *carg, httrackp *opt,  const char* file) {
+static void CDECL httrack_wrapper_filesave(t_hts_callbackarg * carg,
+                                           httrackp * opt, const char *file) {
 }
-static int CDECL httrack_wrapper_linkdetected(t_hts_callbackarg *carg, httrackp *opt,  char* link) {
-  printf("Link detected: %s\n",link);
+static int CDECL httrack_wrapper_linkdetected(t_hts_callbackarg * carg,
+                                              httrackp * opt, char *link) {
+  printf("Link detected: %s\n", link);
   return 1;
 }
-static int CDECL httrack_wrapper_xfrstatus(t_hts_callbackarg *carg, httrackp *opt,  void* back) {
+static int CDECL httrack_wrapper_xfrstatus(t_hts_callbackarg * carg,
+                                           httrackp * opt, void *back) {
   return 1;
 }
-static int CDECL httrack_wrapper_preprocesshtml(t_hts_callbackarg *carg, httrackp *opt,  char** html,int* len,const char* url_address,const char* url_file) {
+static int CDECL httrack_wrapper_preprocesshtml(t_hts_callbackarg * carg,
+                                                httrackp * opt, char **html,
+                                                int *len,
+                                                const char *url_address,
+                                                const char *url_file) {
   return 1;
 }
-static int CDECL httrack_wrapper_postprocesshtml(t_hts_callbackarg *carg, httrackp *opt,  char** html,int* len,const char* url_address,const char* url_file) {
+static int CDECL httrack_wrapper_postprocesshtml(t_hts_callbackarg * carg,
+                                                 httrackp * opt, char **html,
+                                                 int *len,
+                                                 const char *url_address,
+                                                 const char *url_file) {
   return 1;
 }
-static int CDECL httrack_wrapper_check_mime(t_hts_callbackarg *carg, httrackp *opt,  const char* adr,const char* fil,const char* mime,int status) {
+static int CDECL httrack_wrapper_check_mime(t_hts_callbackarg * carg,
+                                            httrackp * opt, const char *adr,
+                                            const char *fil, const char *mime,
+                                            int status) {
   return -1;
 }
-static void CDECL httrack_wrapper_filesave2(t_hts_callbackarg *carg, httrackp *opt,  const char* adr, const char* fil, const char* save, int is_new, int is_modified,int not_updated) {
+static void CDECL httrack_wrapper_filesave2(t_hts_callbackarg * carg,
+                                            httrackp * opt, const char *adr,
+                                            const char *fil, const char *save,
+                                            int is_new, int is_modified,
+                                            int not_updated) {
 }
-static int CDECL httrack_wrapper_linkdetected2(t_hts_callbackarg *carg, httrackp *opt,  char* link, const char* start_tag) {
+static int CDECL httrack_wrapper_linkdetected2(t_hts_callbackarg * carg,
+                                               httrackp * opt, char *link,
+                                               const char *start_tag) {
   return 1;
 }
-static int CDECL httrack_wrapper_savename(t_hts_callbackarg *carg, httrackp *opt,  const char* adr_complete,const char* fil_complete,const char* referer_adr,const char* referer_fil,char* save) {
+static int CDECL httrack_wrapper_savename(t_hts_callbackarg * carg,
+                                          httrackp * opt,
+                                          const char *adr_complete,
+                                          const char *fil_complete,
+                                          const char *referer_adr,
+                                          const char *referer_fil, char *save) {
   return 1;
 }
-static int CDECL httrack_wrapper_sendheader(t_hts_callbackarg *carg, httrackp *opt,  char* buff, const char* adr, const char* fil, const char* referer_adr, const char* referer_fil, htsblk* outgoing) {
+static int CDECL httrack_wrapper_sendheader(t_hts_callbackarg * carg,
+                                            httrackp * opt, char *buff,
+                                            const char *adr, const char *fil,
+                                            const char *referer_adr,
+                                            const char *referer_fil,
+                                            htsblk * outgoing) {
   return 1;
 }
-static int CDECL httrack_wrapper_receiveheader(t_hts_callbackarg *carg, httrackp *opt,  char* buff, const char* adr, const char* fil, const char* referer_adr, const char* referer_fil, htsblk* incoming) {
+static int CDECL httrack_wrapper_receiveheader(t_hts_callbackarg * carg,
+                                               httrackp * opt, char *buff,
+                                               const char *adr, const char *fil,
+                                               const char *referer_adr,
+                                               const char *referer_fil,
+                                               htsblk * incoming) {
   return 1;
 }
diff --git a/libtest/example.h b/libtest/example.h
index b1d8e38..7228653 100644
--- a/libtest/example.h
+++ b/libtest/example.h
@@ -9,26 +9,78 @@
 #define CDECL
 #endif
 
-static void CDECL httrack_wrapper_init(t_hts_callbackarg *carg);
-static void CDECL httrack_wrapper_uninit(t_hts_callbackarg *carg);
-static int CDECL httrack_wrapper_start(t_hts_callbackarg *carg, httrackp* opt);
-static int CDECL httrack_wrapper_chopt(t_hts_callbackarg *carg, httrackp* opt);
-static int CDECL httrack_wrapper_end(t_hts_callbackarg *carg, httrackp* opt); 
-static int CDECL httrack_wrapper_checkhtml(t_hts_callbackarg *carg, httrackp *opt,  char* html,int len,const char* url_address,const char* url_file);
-static int CDECL httrack_wrapper_loop(t_hts_callbackarg *carg, httrackp *opt,  void* _back,int back_max,int back_index,int lien_n,int lien_tot,int stat_time,hts_stat_struct* stats);
-static const char* CDECL httrack_wrapper_query(t_hts_callbackarg *carg, httrackp *opt,  const char* question);
-static const char* CDECL httrack_wrapper_query2(t_hts_callbackarg *carg, httrackp *opt,  const char* question);
-static const char* CDECL httrack_wrapper_query3(t_hts_callbackarg *carg, httrackp *opt,  const char* question);
-static int CDECL httrack_wrapper_check(t_hts_callbackarg *carg, httrackp *opt,  const char* adr,const char* fil,int status);
-static void CDECL httrack_wrapper_pause(t_hts_callbackarg *carg, httrackp *opt,  const char* lockfile);
-static void CDECL httrack_wrapper_filesave(t_hts_callbackarg *carg, httrackp *opt,  const char* file);
-static int CDECL httrack_wrapper_linkdetected(t_hts_callbackarg *carg, httrackp *opt,  char* link);
-static int CDECL httrack_wrapper_xfrstatus(t_hts_callbackarg *carg, httrackp *opt,  void* back);
-static int CDECL httrack_wrapper_preprocesshtml(t_hts_callbackarg *carg, httrackp *opt,  char** html,int* len,const char* url_address,const char* url_file);
-static int CDECL httrack_wrapper_postprocesshtml(t_hts_callbackarg *carg, httrackp *opt,  char** html,int* len,const char* url_address,const char* url_file);
-static int CDECL httrack_wrapper_check_mime(t_hts_callbackarg *carg, httrackp *opt,  const char* adr,const char* fil,const char* mime,int status);
-static void CDECL httrack_wrapper_filesave2(t_hts_callbackarg *carg, httrackp *opt,  const char* adr, const char* fil, const char* save, int is_new, int is_modified,int not_updated);
-static int CDECL httrack_wrapper_linkdetected2(t_hts_callbackarg *carg, httrackp *opt,  char* link, const char* start_tag);
-static int CDECL httrack_wrapper_savename(t_hts_callbackarg *carg, httrackp *opt,  const char* adr_complete,const char* fil_complete,const char* referer_adr,const char* referer_fil,char* save);
-static int CDECL httrack_wrapper_sendheader(t_hts_callbackarg *carg, httrackp *opt,  char* buff, const char* adr, const char* fil, const char* referer_adr, const char* referer_fil, htsblk* outgoing);
-static int CDECL httrack_wrapper_receiveheader(t_hts_callbackarg *carg, httrackp *opt,  char* buff, const char* adr, const char* fil, const char* referer_adr, const char* referer_fil, htsblk* incoming);
+static void CDECL httrack_wrapper_init(t_hts_callbackarg * carg);
+static void CDECL httrack_wrapper_uninit(t_hts_callbackarg * carg);
+static int CDECL httrack_wrapper_start(t_hts_callbackarg * carg,
+                                       httrackp * opt);
+static int CDECL httrack_wrapper_chopt(t_hts_callbackarg * carg,
+                                       httrackp * opt);
+static int CDECL httrack_wrapper_end(t_hts_callbackarg * carg, httrackp * opt);
+static int CDECL httrack_wrapper_checkhtml(t_hts_callbackarg * carg,
+                                           httrackp * opt, char *html, int len,
+                                           const char *url_address,
+                                           const char *url_file);
+static int CDECL httrack_wrapper_loop(t_hts_callbackarg * carg, httrackp * opt,
+                                      void *_back, int back_max, int back_index,
+                                      int lien_n, int lien_tot, int stat_time,
+                                      hts_stat_struct * stats);
+static const char *CDECL httrack_wrapper_query(t_hts_callbackarg * carg,
+                                               httrackp * opt,
+                                               const char *question);
+static const char *CDECL httrack_wrapper_query2(t_hts_callbackarg * carg,
+                                                httrackp * opt,
+                                                const char *question);
+static const char *CDECL httrack_wrapper_query3(t_hts_callbackarg * carg,
+                                                httrackp * opt,
+                                                const char *question);
+static int CDECL httrack_wrapper_check(t_hts_callbackarg * carg, httrackp * opt,
+                                       const char *adr, const char *fil,
+                                       int status);
+static void CDECL httrack_wrapper_pause(t_hts_callbackarg * carg,
+                                        httrackp * opt, const char *lockfile);
+static void CDECL httrack_wrapper_filesave(t_hts_callbackarg * carg,
+                                           httrackp * opt, const char *file);
+static int CDECL httrack_wrapper_linkdetected(t_hts_callbackarg * carg,
+                                              httrackp * opt, char *link);
+static int CDECL httrack_wrapper_xfrstatus(t_hts_callbackarg * carg,
+                                           httrackp * opt, void *back);
+static int CDECL httrack_wrapper_preprocesshtml(t_hts_callbackarg * carg,
+                                                httrackp * opt, char **html,
+                                                int *len,
+                                                const char *url_address,
+                                                const char *url_file);
+static int CDECL httrack_wrapper_postprocesshtml(t_hts_callbackarg * carg,
+                                                 httrackp * opt, char **html,
+                                                 int *len,
+                                                 const char *url_address,
+                                                 const char *url_file);
+static int CDECL httrack_wrapper_check_mime(t_hts_callbackarg * carg,
+                                            httrackp * opt, const char *adr,
+                                            const char *fil, const char *mime,
+                                            int status);
+static void CDECL httrack_wrapper_filesave2(t_hts_callbackarg * carg,
+                                            httrackp * opt, const char *adr,
+                                            const char *fil, const char *save,
+                                            int is_new, int is_modified,
+                                            int not_updated);
+static int CDECL httrack_wrapper_linkdetected2(t_hts_callbackarg * carg,
+                                               httrackp * opt, char *link,
+                                               const char *start_tag);
+static int CDECL httrack_wrapper_savename(t_hts_callbackarg * carg,
+                                          httrackp * opt,
+                                          const char *adr_complete,
+                                          const char *fil_complete,
+                                          const char *referer_adr,
+                                          const char *referer_fil, char *save);
+static int CDECL httrack_wrapper_sendheader(t_hts_callbackarg * carg,
+                                            httrackp * opt, char *buff,
+                                            const char *adr, const char *fil,
+                                            const char *referer_adr,
+                                            const char *referer_fil,
+                                            htsblk * outgoing);
+static int CDECL httrack_wrapper_receiveheader(t_hts_callbackarg * carg,
+                                               httrackp * opt, char *buff,
+                                               const char *adr, const char *fil,
+                                               const char *referer_adr,
+                                               const char *referer_fil,
+                                               htsblk * incoming);