diff --git a/2048/.frama-c/2048.parse/framac.ast b/2048/.frama-c/2048.parse/framac.ast
index 8e264c0ec87e4854c2a0ade1ba4e7b61a9f3f7f1..62eef212e715a9aba1f3546f7513a1f30a40ff2f 100644
--- a/2048/.frama-c/2048.parse/framac.ast
+++ b/2048/.frama-c/2048.parse/framac.ast
@@ -143,8 +143,8 @@ void getColor(uint8_t value, char *color, size_t length)
         foreground += 2;
       }
     }
-  snprintf_va_1(color,length,"\033[38;5;%d;48;5;%dm",(int)*foreground,
-                (int)*background);
+  snprintf(color,length,"\033[38;5;%d;48;5;%dm",(int)*foreground,
+           (int)*background); /* snprintf_va_1 */
   return;
 }
 
@@ -405,52 +405,52 @@ void drawBoard(uint8_t (* /*[4]*/ board)[4])
   char c;
   char color[40];
   char reset[4] = {(char)'\033', (char)'[', (char)'m', (char)'\000'};
-  printf_va_1("\033[H");
-  printf_va_2("2048.c %17d pts\n\n",(int)score);
+  printf("\033[H"); /* printf_va_1 */
+  printf("2048.c %17d pts\n\n",(int)score); /* printf_va_2 */
   y = (unsigned char)0;
   while ((int)y < 4) {
     x = (unsigned char)0;
     while ((int)x < 4) {
       getColor((*(board + x))[y],color,(unsigned int)40);
-      printf_va_3("%s",color);
-      printf_va_4("       ");
-      printf_va_5("%s",reset);
+      printf("%s",color); /* printf_va_3 */
+      printf("       "); /* printf_va_4 */
+      printf("%s",reset); /* printf_va_5 */
       x = (uint8_t)((int)x + 1);
     }
-    printf_va_6("\n");
+    printf("\n"); /* printf_va_6 */
     x = (unsigned char)0;
     while ((int)x < 4) {
       getColor((*(board + x))[y],color,(unsigned int)40);
-      printf_va_7("%s",color);
+      printf("%s",color); /* printf_va_7 */
       if ((int)(*(board + x))[y] != 0) {
         char s[8];
         size_t tmp;
-        snprintf_va_2(s,(unsigned int)8,"%u",
-                      (unsigned int)1 << (int)(*(board + x))[y]);
+        snprintf(s,(unsigned int)8,"%u",
+                 (unsigned int)1 << (int)(*(board + x))[y]); /* snprintf_va_2 */
         tmp = strlen((char const *)(s));
         uint8_t t = (unsigned char)((size_t)7 - tmp);
-        printf_va_8("%*s%s%*s",(int)t - (int)t / 2,(char *)"",s,(int)t / 2,
-                    (char *)"");
+        printf("%*s%s%*s",(int)t - (int)t / 2,(char *)"",s,(int)t / 2,
+               (char *)""); /* printf_va_8 */
       }
-      else printf_va_9("   \302\267   ");
-      printf_va_10("%s",reset);
+      else printf("   \302\267   "); /* printf_va_9 */
+      printf("%s",reset); /* printf_va_10 */
       x = (uint8_t)((int)x + 1);
     }
-    printf_va_11("\n");
+    printf("\n"); /* printf_va_11 */
     x = (unsigned char)0;
     while ((int)x < 4) {
       getColor((*(board + x))[y],color,(unsigned int)40);
-      printf_va_12("%s",color);
-      printf_va_13("       ");
-      printf_va_14("%s",reset);
+      printf("%s",color); /* printf_va_12 */
+      printf("       "); /* printf_va_13 */
+      printf("%s",reset); /* printf_va_14 */
       x = (uint8_t)((int)x + 1);
     }
-    printf_va_15("\n");
+    printf("\n"); /* printf_va_15 */
     y = (uint8_t)((int)y + 1);
   }
-  printf_va_16("\n");
-  printf_va_17("        \342\206\220,\342\206\221,\342\206\222,\342\206\223 or q        \n");
-  printf_va_18("\033[A");
+  printf("\n"); /* printf_va_16 */
+  printf("        \342\206\220,\342\206\221,\342\206\222,\342\206\223 or q        \n"); /* printf_va_17 */
+  printf("\033[A"); /* printf_va_18 */
   return;
 }
 
@@ -993,34 +993,33 @@ int test(void)
     if ((int)success == 0) {
       i = (unsigned char)0;
       while ((int)i < 4) {
-        printf_va_19("%d ",(int)*(in + i));
+        printf("%d ",(int)*(in + i)); /* printf_va_19 */
         i = (uint8_t)((int)i + 1);
       }
-      printf_va_20("=> ");
+      printf("=> "); /* printf_va_20 */
       i = (unsigned char)0;
       while ((int)i < 4) {
-        printf_va_21("%d ",(int)array[i]);
+        printf("%d ",(int)array[i]); /* printf_va_21 */
         i = (uint8_t)((int)i + 1);
       }
-      printf_va_22("expected ");
+      printf("expected "); /* printf_va_22 */
       i = (unsigned char)0;
       while ((int)i < 4) {
-        printf_va_23("%d ",(int)*(in + i));
+        printf("%d ",(int)*(in + i)); /* printf_va_23 */
         i = (uint8_t)((int)i + 1);
       }
-      printf_va_24("=> ");
+      printf("=> "); /* printf_va_24 */
       i = (unsigned char)0;
       while ((int)i < 4) {
-        printf_va_25("%d ",(int)*(out + i));
+        printf("%d ",(int)*(out + i)); /* printf_va_25 */
         i = (uint8_t)((int)i + 1);
       }
-      printf_va_26("\n");
+      printf("\n"); /* printf_va_26 */
       break;
     }
     t = (uint8_t)((int)t + 1);
   }
-  if (success) printf_va_27("All %hhu tests executed successfully\n",
-                            (int)tests);
+  if (success) printf("All %hhu tests executed successfully\n",(int)tests); /* printf_va_27 */
   __retres = ! success;
   return __retres;
 }
@@ -1051,9 +1050,9 @@ int printf_va_29(char const * __restrict format);
 
 void signal_callback_handler(int signum)
 {
-  printf_va_28("         TERMINATED         \n");
+  printf("         TERMINATED         \n"); /* printf_va_28 */
   setBufferedInput((_Bool)1);
-  printf_va_29("\033[?25h\033[m");
+  printf("\033[?25h\033[m"); /* printf_va_29 */
   exit(signum);
   return;
 }
@@ -1124,7 +1123,7 @@ int main(int argc, char **argv)
   uint8_t board[4][4];
   char c;
   _Bool success;
-  printf_va_30("\033[?25l\033[2J");
+  printf("\033[?25l\033[2J"); /* printf_va_30 */
   signal(2,& signal_callback_handler);
   initBoard(board);
   setBufferedInput((_Bool)0);
@@ -1152,13 +1151,13 @@ int main(int argc, char **argv)
         drawBoard(board);
         tmp_0 = gameEnded(board);
         if (tmp_0) {
-          printf_va_31("         GAME OVER          \n");
+          printf("         GAME OVER          \n"); /* printf_va_31 */
           break;
         }
       }
       if ((int)c == 'q') {
         int tmp_1;
-        printf_va_32("        QUIT? (y/n)         \n");
+        printf("        QUIT? (y/n)         \n"); /* printf_va_32 */
         tmp_1 = getchar();
         c = (char)tmp_1;
         if ((int)c == 'y') break;
@@ -1166,7 +1165,7 @@ int main(int argc, char **argv)
       }
       if ((int)c == 'r') {
         int tmp_2;
-        printf_va_33("       RESTART? (y/n)       \n");
+        printf("       RESTART? (y/n)       \n"); /* printf_va_33 */
         tmp_2 = getchar();
         c = (char)tmp_2;
         if ((int)c == 'y') initBoard(board);
@@ -1175,7 +1174,7 @@ int main(int argc, char **argv)
     }
   }
   setBufferedInput((_Bool)1);
-  printf_va_34("\033[?25h\033[m");
+  printf("\033[?25h\033[m"); /* printf_va_34 */
   __retres = 0;
   return __retres;
 }
diff --git a/basic-cwe-examples/.frama-c/cwe119-precise.parse/framac.ast b/basic-cwe-examples/.frama-c/cwe119-precise.parse/framac.ast
index 8b46b80974ff618311e9d540769922b2c4ff9e25..a9cac3fad3c962586fc468ef7d5bfd7d9b4da4ec 100644
--- a/basic-cwe-examples/.frama-c/cwe119-precise.parse/framac.ast
+++ b/basic-cwe-examples/.frama-c/cwe119-precise.parse/framac.ast
@@ -34,7 +34,7 @@ static void validate_addr_form(char *v)
                "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-0123456789.");
   tmp_0 = strlen((char const *)v);
   if (tmp < tmp_0) {
-    fprintf_va_1(__fc_stderr,"hostname contains invalid characters");
+    fprintf(__fc_stderr,"hostname contains invalid characters"); /* fprintf_va_1 */
     exit(1);
   }
   return;
diff --git a/basic-cwe-examples/.frama-c/cwe119.parse/framac.ast b/basic-cwe-examples/.frama-c/cwe119.parse/framac.ast
index 8b46b80974ff618311e9d540769922b2c4ff9e25..a9cac3fad3c962586fc468ef7d5bfd7d9b4da4ec 100644
--- a/basic-cwe-examples/.frama-c/cwe119.parse/framac.ast
+++ b/basic-cwe-examples/.frama-c/cwe119.parse/framac.ast
@@ -34,7 +34,7 @@ static void validate_addr_form(char *v)
                "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-0123456789.");
   tmp_0 = strlen((char const *)v);
   if (tmp < tmp_0) {
-    fprintf_va_1(__fc_stderr,"hostname contains invalid characters");
+    fprintf(__fc_stderr,"hostname contains invalid characters"); /* fprintf_va_1 */
     exit(1);
   }
   return;
diff --git a/basic-cwe-examples/.frama-c/cwe20-precise.parse/framac.ast b/basic-cwe-examples/.frama-c/cwe20-precise.parse/framac.ast
index c22eddb65afbc3e5515d427c4a409daec68fe163..9b111bb640e6ec60d6ca8957baa4072bce502e9d 100644
--- a/basic-cwe-examples/.frama-c/cwe20-precise.parse/framac.ast
+++ b/basic-cwe-examples/.frama-c/cwe20-precise.parse/framac.ast
@@ -109,16 +109,16 @@ int main(void)
   int n;
   int error;
   board_square_t *board;
-  printf_va_1("Please specify the board height: \n");
-  error = scanf_va_1("%d",& m);
+  printf("Please specify the board height: \n"); /* printf_va_1 */
+  error = scanf("%d",& m); /* scanf_va_1 */
   if (-1 == error) {
-    fprintf_va_1(__fc_stderr,"No integer passed: Die evil hacker!\n");
+    fprintf(__fc_stderr,"No integer passed: Die evil hacker!\n"); /* fprintf_va_1 */
     exit(1);
   }
-  printf_va_2("Please specify the board width: \n");
-  error = scanf_va_2("%d",& n);
+  printf("Please specify the board width: \n"); /* printf_va_2 */
+  error = scanf("%d",& n); /* scanf_va_2 */
   if (-1 == error) {
-    fprintf_va_2(__fc_stderr,"No integer passed: Die evil hacker!\n");
+    fprintf(__fc_stderr,"No integer passed: Die evil hacker!\n"); /* fprintf_va_2 */
     exit(1);
   }
   if (m > 100) goto _LOR;
@@ -126,7 +126,7 @@ int main(void)
     if (n > 100) {
       _LOR:
       {
-        fprintf_va_3(__fc_stderr,"Value too large: Die evil hacker!\n");
+        fprintf(__fc_stderr,"Value too large: Die evil hacker!\n"); /* fprintf_va_3 */
         exit(1);
       }
     }
diff --git a/basic-cwe-examples/.frama-c/cwe20.parse/framac.ast b/basic-cwe-examples/.frama-c/cwe20.parse/framac.ast
index c22eddb65afbc3e5515d427c4a409daec68fe163..9b111bb640e6ec60d6ca8957baa4072bce502e9d 100644
--- a/basic-cwe-examples/.frama-c/cwe20.parse/framac.ast
+++ b/basic-cwe-examples/.frama-c/cwe20.parse/framac.ast
@@ -109,16 +109,16 @@ int main(void)
   int n;
   int error;
   board_square_t *board;
-  printf_va_1("Please specify the board height: \n");
-  error = scanf_va_1("%d",& m);
+  printf("Please specify the board height: \n"); /* printf_va_1 */
+  error = scanf("%d",& m); /* scanf_va_1 */
   if (-1 == error) {
-    fprintf_va_1(__fc_stderr,"No integer passed: Die evil hacker!\n");
+    fprintf(__fc_stderr,"No integer passed: Die evil hacker!\n"); /* fprintf_va_1 */
     exit(1);
   }
-  printf_va_2("Please specify the board width: \n");
-  error = scanf_va_2("%d",& n);
+  printf("Please specify the board width: \n"); /* printf_va_2 */
+  error = scanf("%d",& n); /* scanf_va_2 */
   if (-1 == error) {
-    fprintf_va_2(__fc_stderr,"No integer passed: Die evil hacker!\n");
+    fprintf(__fc_stderr,"No integer passed: Die evil hacker!\n"); /* fprintf_va_2 */
     exit(1);
   }
   if (m > 100) goto _LOR;
@@ -126,7 +126,7 @@ int main(void)
     if (n > 100) {
       _LOR:
       {
-        fprintf_va_3(__fc_stderr,"Value too large: Die evil hacker!\n");
+        fprintf(__fc_stderr,"Value too large: Die evil hacker!\n"); /* fprintf_va_3 */
         exit(1);
       }
     }
diff --git a/cerberus/.frama-c/besson_blazy_wilke_bitfields_1.parse/framac.ast b/cerberus/.frama-c/besson_blazy_wilke_bitfields_1.parse/framac.ast
index 1d384eda66fc4734d44fadec966b84071793b2b9..38c532b6dac78e2f0e59160da7181a22aefe0c95 100644
--- a/cerberus/.frama-c/besson_blazy_wilke_bitfields_1.parse/framac.ast
+++ b/cerberus/.frama-c/besson_blazy_wilke_bitfields_1.parse/framac.ast
@@ -32,7 +32,7 @@ int main(void)
   int a;
   bf.a1 = (int)1;
   a = (int)bf.a1;
-  printf_va_1("a=%i\n",a);
+  printf("a=%i\n",a); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/besson_blazy_wilke_bitfields_1u.parse/framac.ast b/cerberus/.frama-c/besson_blazy_wilke_bitfields_1u.parse/framac.ast
index f28231f78f4cd58f730f1ac0e1c2a65bcd3e0159..697eba3867c45fc3be065092d044429b8dd16ee1 100644
--- a/cerberus/.frama-c/besson_blazy_wilke_bitfields_1u.parse/framac.ast
+++ b/cerberus/.frama-c/besson_blazy_wilke_bitfields_1u.parse/framac.ast
@@ -32,7 +32,7 @@ int main(void)
   unsigned int a;
   bf.a1 = (unsigned int)1;
   a = (unsigned int)bf.a1;
-  printf_va_1("a=%u\n",a);
+  printf("a=%u\n",a); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/besson_blazy_wilkie_Fig_1_adapted.parse/framac.ast b/cerberus/.frama-c/besson_blazy_wilkie_Fig_1_adapted.parse/framac.ast
index 22107c6d877d3fde6bc07faea7cc14ec132770c1..710875784d959ab838db6fef2f29ff5cf56d2251 100644
--- a/cerberus/.frama-c/besson_blazy_wilkie_Fig_1_adapted.parse/framac.ast
+++ b/cerberus/.frama-c/besson_blazy_wilkie_Fig_1_adapted.parse/framac.ast
@@ -57,13 +57,13 @@ int main(void)
   int tmp;
   char const *tmp_0;
   int tmp_1;
-  printf_va_1("status=0x%x\n",(unsigned int)status);
+  printf("status=0x%x\n",(unsigned int)status); /* printf_va_1 */
   status = set(status,0);
   tmp = isset(status,0);
   _Bool b = (_Bool)(tmp != 0);
   if (b) tmp_0 = "true"; else tmp_0 = "false";
   ;
-  printf_va_2("status=0x%x  b=%s\n",(unsigned int)status,(char *)tmp_0);
+  printf("status=0x%x  b=%s\n",(unsigned int)status,(char *)tmp_0); /* printf_va_2 */
   tmp_1 = isset(status,0);
   return tmp_1;
 }
diff --git a/cerberus/.frama-c/cast_struct_and_first_member_1.parse/framac.ast b/cerberus/.frama-c/cast_struct_and_first_member_1.parse/framac.ast
index acc77251ed786d5b7bd5a854464a854e18dfaab2..16e66035b2ce1815b52ebd3a4f5c02134c1e6254 100644
--- a/cerberus/.frama-c/cast_struct_and_first_member_1.parse/framac.ast
+++ b/cerberus/.frama-c/cast_struct_and_first_member_1.parse/framac.ast
@@ -34,7 +34,7 @@ int main(void)
   int *pi = & s.i;
   st *p = (st *)pi;
   p->f = (float)2.0;
-  printf_va_1("s.f=%f  p->f=%f\n",(double)s.f,(double)p->f);
+  printf("s.f=%f  p->f=%f\n",(double)s.f,(double)p->f); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cast_struct_inter_member_1.parse/framac.ast b/cerberus/.frama-c/cast_struct_inter_member_1.parse/framac.ast
index 2e84ef8935b471c219929ce2feaf76cde9f1b1bc..2302dd34503829ca02693ea516e41ab4543dc5db 100644
--- a/cerberus/.frama-c/cast_struct_inter_member_1.parse/framac.ast
+++ b/cerberus/.frama-c/cast_struct_inter_member_1.parse/framac.ast
@@ -37,7 +37,7 @@ int main(void)
   unsigned char *pcf = (pci - 4U) + 0U;
   float *pf = (float *)pcf;
   *pf = (float)2.0;
-  printf_va_1("s.f=%f *pf=%f  s.i=%i\n",(double)s.f,(double)*pf,s.i);
+  printf("s.f=%f *pf=%f  s.i=%i\n",(double)s.f,(double)*pf,s.i); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cast_struct_isomorphic.parse/framac.ast b/cerberus/.frama-c/cast_struct_isomorphic.parse/framac.ast
index b237b5f2086cbf69eded4da2f2128af73d82cf4e..bf3c5e954947638103db2217e33cfb3ddccc52a7 100644
--- a/cerberus/.frama-c/cast_struct_isomorphic.parse/framac.ast
+++ b/cerberus/.frama-c/cast_struct_isomorphic.parse/framac.ast
@@ -38,7 +38,7 @@ int main(void)
   st1 s1 = {.i1 = 1, .f1 = (float)1.0};
   st2 *p2 = (st2 *)(& s1);
   p2->f2 = (float)2.0;
-  printf_va_1("s1.f1=%f  p2->f2=%f\n",(double)s1.f1,(double)p2->f2);
+  printf("s1.f1=%f  p2->f2=%f\n",(double)s1.f1,(double)p2->f2); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cast_struct_same_prefix.parse/framac.ast b/cerberus/.frama-c/cast_struct_same_prefix.parse/framac.ast
index 6c5010b5866ebf7cda263fac4af710de1bd249fb..849382767aa82b9e94e316c122e292d0ca363e8c 100644
--- a/cerberus/.frama-c/cast_struct_same_prefix.parse/framac.ast
+++ b/cerberus/.frama-c/cast_struct_same_prefix.parse/framac.ast
@@ -42,7 +42,7 @@ int main(void)
   st1 s1 = {.i1 = 1, .f1 = (float)1.0, .c1 = (char)'a', .d1 = 1.0};
   st2 *p2 = (st2 *)(& s1);
   p2->f2 = (float)2.0;
-  printf_va_1("s1.f1=%f  p2->f2=%f\n",(double)s1.f1,(double)p2->f2);
+  printf("s1.f1=%f  p2->f2=%f\n",(double)s1.f1,(double)p2->f2); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cast_union_and_member_1.parse/framac.ast b/cerberus/.frama-c/cast_union_and_member_1.parse/framac.ast
index 6b83d785bd7b9c9ce333d4c85ad8225bd62aa1b9..2c3a272019dbba34c626c62ab587adf445c6e325 100644
--- a/cerberus/.frama-c/cast_union_and_member_1.parse/framac.ast
+++ b/cerberus/.frama-c/cast_union_and_member_1.parse/framac.ast
@@ -34,7 +34,7 @@ int main(void)
   int *pi = & u.i;
   un *p = (un *)pi;
   p->f = (float)2.0;
-  printf_va_1("u.f=%f  p->f=%f\n",(double)u.f,(double)p->f);
+  printf("u.f=%f  p->f=%f\n",(double)u.f,(double)p->f); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_01_deconst.parse/framac.ast b/cerberus/.frama-c/cheri_01_deconst.parse/framac.ast
index 8c0059a2dda3eb0550ca130b0209dd922064f2a6..b13855bdf164062bafb0487e1441d0c52cb9d89f 100644
--- a/cerberus/.frama-c/cheri_01_deconst.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_01_deconst.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   int const *p = (int const *)(& x);
   int *q = (int *)p;
   *q = 1;
-  printf_va_1("x=%i  *p=%i  *q=%i\n",x,*p,*q);
+  printf("x=%i  *p=%i  *q=%i\n",x,*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_02_container.parse/framac.ast b/cerberus/.frama-c/cheri_02_container.parse/framac.ast
index e06acd4a93837976f21d7a093e58669ad52ccaa0..f1a36c776d4e412f29f68a779132503791295269 100644
--- a/cerberus/.frama-c/cheri_02_container.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_02_container.parse/framac.ast
@@ -38,8 +38,7 @@ int main(void)
   char *pcst = pcj - (8U - 0U);
   st *ps = (st *)pcst;
   ps->f = (float)22.0;
-  printf_va_1("s.i=%i s.f=%f s.j=%i ps->f=%f\n",s.i,(double)s.f,s.j,
-              (double)ps->f);
+  printf("s.i=%i s.f=%f s.j=%i ps->f=%f\n",s.i,(double)s.f,s.j,(double)ps->f); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_03_ii.parse/framac.ast b/cerberus/.frama-c/cheri_03_ii.parse/framac.ast
index ca2b435e335b379375e5d432bd803d1f98cb5aad..a47d5e5c3eddf25e5f4a5c98ebb0655bdcd51a00 100644
--- a/cerberus/.frama-c/cheri_03_ii.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_03_ii.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   int *q = p + 11;
   q -= 10;
   *q = 1;
-  printf_va_1("x[1]=%i  *q=%i\n",x[1],*q);
+  printf("x[1]=%i  *q=%i\n",x[1],*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_03_ii_char.parse/framac.ast b/cerberus/.frama-c/cheri_03_ii_char.parse/framac.ast
index 06e01224e461ca6aa7e9e1f2f4f7862362cb8582..75bdb8981ef68fa54a5bf4f26f6412f9f43cfea0 100644
--- a/cerberus/.frama-c/cheri_03_ii_char.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_03_ii_char.parse/framac.ast
@@ -31,8 +31,8 @@ int main(void)
   unsigned char *q = p + 11;
   q -= 10;
   *q = (unsigned char)1;
-  printf_va_1("x=0x%x  *p=0x%x  *q=0x%x\n",(unsigned int)x,
-              (unsigned int)((int)*p),(unsigned int)((int)*q));
+  printf("x=0x%x  *p=0x%x  *q=0x%x\n",(unsigned int)x,
+         (unsigned int)((int)*p),(unsigned int)((int)*q)); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_04a_int_uintptr_t.parse/framac.ast b/cerberus/.frama-c/cheri_04a_int_uintptr_t.parse/framac.ast
index 66ea9de9ec151612123012ccbd823a9a14f1cd1f..9d80d3bb7d02414c56d172afe4d86af9f0984339 100644
--- a/cerberus/.frama-c/cheri_04a_int_uintptr_t.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_04a_int_uintptr_t.parse/framac.ast
@@ -31,7 +31,7 @@ int main(void)
   uintptr_t ql = (unsigned int)px;
   int *q = (int *)ql;
   *q = 1;
-  printf_va_1("x=%i  *px=%i  *q=%i\n",x,*px,*q);
+  printf("x=%i  *px=%i  *q=%i\n",x,*px,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_04b_int_unsigned_long.parse/framac.ast b/cerberus/.frama-c/cheri_04b_int_unsigned_long.parse/framac.ast
index b71c146fc1b1a002366a3242070378dc42dbb772..b51057ab925b7c28f3a705a884f10bfc1890b398 100644
--- a/cerberus/.frama-c/cheri_04b_int_unsigned_long.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_04b_int_unsigned_long.parse/framac.ast
@@ -31,7 +31,7 @@ int main(void)
   unsigned long ql = (unsigned long)px;
   int *q = (int *)ql;
   *q = 1;
-  printf_va_1("x=%i  *px=%i  *q=%i\n",x,*px,*q);
+  printf("x=%i  *px=%i  *q=%i\n",x,*px,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_05_ia.parse/framac.ast b/cerberus/.frama-c/cheri_05_ia.parse/framac.ast
index 8850bb0c8db6d796db90b1b9d1fdc2abcc696886..8edd0ae213872b6ffb6bd2541fa2df92d0cccac2 100644
--- a/cerberus/.frama-c/cheri_05_ia.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_05_ia.parse/framac.ast
@@ -33,7 +33,7 @@ int main(void)
   ql -= (uintptr_t)287343;
   int *q = (int *)ql;
   *q = 1;
-  printf_va_1("x=%i  *px=%i  *q=%i\n",x,*px,*q);
+  printf("x=%i  *px=%i  *q=%i\n",x,*px,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_06_mask.parse/framac.ast b/cerberus/.frama-c/cheri_06_mask.parse/framac.ast
index 0288c58ff1c200d8cbe40b78c15f54354a25f23d..6e8b273d9194c3c7e9add07152b85375ed71f549 100644
--- a/cerberus/.frama-c/cheri_06_mask.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_06_mask.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   ;
   if (b) tmp = "true"; else tmp = "false";
   ;
-  printf_va_1("y=%i (r==p)=%s z=%i\n",y,(char *)tmp,z);
+  printf("y=%i (r==p)=%s z=%i\n",y,(char *)tmp,z); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_07_wide.parse/framac.ast b/cerberus/.frama-c/cheri_07_wide.parse/framac.ast
index 0ae528aea8a84ba63e19c5fb9a2d1effa032cd74..c6b19fe7bb281b01ef0fa22af870d95de35e4982 100644
--- a/cerberus/.frama-c/cheri_07_wide.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_07_wide.parse/framac.ast
@@ -48,9 +48,8 @@ int main(void)
   uintptr_t k = j;
   int *q = (int *)k;
   *q = 2;
-  printf_va_1("i=0x%x UINT_MAX=0x%x ULONG_MAX=0x%lx\n",i,4294967295U,
-              4294967295UL);
-  printf_va_2("x=%i  *q=%i\n",x,*q);
+  printf("i=0x%x UINT_MAX=0x%x ULONG_MAX=0x%lx\n",i,4294967295U,4294967295UL); /* printf_va_1 */
+  printf("x=%i  *q=%i\n",x,*q); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/cheri_08_last_word.parse/framac.ast b/cerberus/.frama-c/cheri_08_last_word.parse/framac.ast
index f68cfb5aa0018e23cc55eeb45bd2ac41f69de9b4..29c35503066c9151ccc6944c7f055fe39394b024 100644
--- a/cerberus/.frama-c/cheri_08_last_word.parse/framac.ast
+++ b/cerberus/.frama-c/cheri_08_last_word.parse/framac.ast
@@ -32,7 +32,7 @@ int main(void)
               "cheri_08_last_word.c",4,"sizeof(uint32_t) == 4");
   uint32_t x0 = *((uint32_t *)cp);
   uint32_t x1 = *((uint32_t *)(cp + 4));
-  printf_va_1("x0=%x  x1=%x\n",x0,x1);
+  printf("x0=%x  x1=%x\n",x0,x1); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/compcertMMv2-1.parse/framac.ast b/cerberus/.frama-c/compcertMMv2-1.parse/framac.ast
index 2ea325c66ec39bad6ffdef4e5d483555948ce295..7c6598a3cd1218ef1e76f00001a5e4137846df9c 100644
--- a/cerberus/.frama-c/compcertMMv2-1.parse/framac.ast
+++ b/cerberus/.frama-c/compcertMMv2-1.parse/framac.ast
@@ -26,7 +26,7 @@ int main(void)
   int __retres;
   int x = 3;
   x = 4;
-  printf_va_1("x=%i\n",x);
+  printf("x=%i\n",x); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/compcertMMv2-2.parse/framac.ast b/cerberus/.frama-c/compcertMMv2-2.parse/framac.ast
index 95558ac09eecb7a6ac91cb6ab23ee8e29ff036ac..869204387da4b8b4e129b0541ae27efddd7d468d 100644
--- a/cerberus/.frama-c/compcertMMv2-2.parse/framac.ast
+++ b/cerberus/.frama-c/compcertMMv2-2.parse/framac.ast
@@ -45,9 +45,9 @@ int main(void)
   int __retres;
   s.y = 41;
   *((int *)(& s) + 1) = 42;
-  printf_va_1("s.y=%i ",s.y);
+  printf("s.y=%i ",s.y); /* printf_va_1 */
   *((int *)((char *)(& s) + sizeof(int))) = 43;
-  printf_va_2("s.y=%i\n",s.y);
+  printf("s.y=%i\n",s.y); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/compcertMMv2-3.parse/framac.ast b/cerberus/.frama-c/compcertMMv2-3.parse/framac.ast
index 6a53f76bc86d90c94c57a7e2c3c57332899e8c48..4f973b7a64365e9dd1764c108e69878700a0a354 100644
--- a/cerberus/.frama-c/compcertMMv2-3.parse/framac.ast
+++ b/cerberus/.frama-c/compcertMMv2-3.parse/framac.ast
@@ -37,7 +37,7 @@ int main(void)
   int w;
   p.s.y = 42;
   w = p.d[1];
-  printf_va_1("w=%i\n",w);
+  printf("w=%i\n",w); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/compcertMMv2-4.parse/framac.ast b/cerberus/.frama-c/compcertMMv2-4.parse/framac.ast
index ec4b8adfa141154e21cc9d04737e9be400a1d774..5f050fe82a338c421c18aa1d924391f4d93d2fed 100644
--- a/cerberus/.frama-c/compcertMMv2-4.parse/framac.ast
+++ b/cerberus/.frama-c/compcertMMv2-4.parse/framac.ast
@@ -46,7 +46,7 @@ int main(void)
   unsigned int y;
   unsigned int x = (unsigned int)0x11223344;
   y = bswap(x);
-  printf_va_1("y=0x%x\n",y);
+  printf("y=0x%x\n",y); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/compcertMMv2-5.parse/framac.ast b/cerberus/.frama-c/compcertMMv2-5.parse/framac.ast
index 5d38f98c5731b2eee7b3a443829b0c347ba9c1e4..d82b04431753b95cdafc603369205f644d436116 100644
--- a/cerberus/.frama-c/compcertMMv2-5.parse/framac.ast
+++ b/cerberus/.frama-c/compcertMMv2-5.parse/framac.ast
@@ -41,7 +41,7 @@ int main(void)
   float g;
   float f = (float)(- 1.0);
   g = fabs_single(f);
-  printf_va_1("g=%f\n",(double)g);
+  printf("g=%f\n",(double)g); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/compcertTSO-1.parse/framac.ast b/cerberus/.frama-c/compcertTSO-1.parse/framac.ast
index 03d84a2baea9b8081a2d3e6ce3d3d1ec2f4648db..27fe1f5bff8f0ca3ebb31c0f135b874946a07310 100644
--- a/cerberus/.frama-c/compcertTSO-1.parse/framac.ast
+++ b/cerberus/.frama-c/compcertTSO-1.parse/framac.ast
@@ -48,7 +48,7 @@ int main(void)
   tmp_0 = g();
   _Bool b = (_Bool)(tmp == tmp_0);
   if (b) tmp_1 = "true"; else tmp_1 = "false";
-  printf_va_1("(f()==g())=%s\n",(char *)tmp_1);
+  printf("(f()==g())=%s\n",(char *)tmp_1); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/compcertTSO-2.parse/framac.ast b/cerberus/.frama-c/compcertTSO-2.parse/framac.ast
index 75c01ef53bd9f4059c5fd02990c2fec76768aca9..429e1b6d1c0b8bb32d3a1389c2c3b73ebf00c37d 100644
--- a/cerberus/.frama-c/compcertTSO-2.parse/framac.ast
+++ b/cerberus/.frama-c/compcertTSO-2.parse/framac.ast
@@ -48,7 +48,7 @@ int main(void)
   tmp_0 = g();
   _Bool b = (_Bool)(tmp == tmp_0);
   if (b) tmp_1 = "true"; else tmp_1 = "false";
-  printf_va_1("(f()==g())=%s\n",(char *)tmp_1);
+  printf("(f()==g())=%s\n",(char *)tmp_1); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/effective_type_1.parse/framac.ast b/cerberus/.frama-c/effective_type_1.parse/framac.ast
index 153df44a0d9ca3a0e8e03f706a11be9b2e6a2062..f2dc27bcac16166bffef8b36ebd70d1dd82081ee 100644
--- a/cerberus/.frama-c/effective_type_1.parse/framac.ast
+++ b/cerberus/.frama-c/effective_type_1.parse/framac.ast
@@ -25,7 +25,7 @@ void f(uint32_t *p1, float *p2)
 {
   *p1 = (unsigned int)2;
   *p2 = (float)3.0;
-  printf_va_1("f: *p1 = %u\n",*p1);
+  printf("f: *p1 = %u\n",*p1); /* printf_va_1 */
   return;
 }
 
@@ -54,7 +54,7 @@ int main(void)
   uint32_t *p1 = & i;
   p2 = (float *)p1;
   f(p1,p2);
-  printf_va_2("i=%u  *p1=%u  *p2=%f\n",i,*p1,(double)*p2);
+  printf("i=%u  *p1=%u  *p2=%f\n",i,*p1,(double)*p2); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/effective_type_10.parse/framac.ast b/cerberus/.frama-c/effective_type_10.parse/framac.ast
index 3f394929c5caed5c87c6fee68990c7734641960c..fb90816a76150a2440d0bb56eb380dd5778969f8 100644
--- a/cerberus/.frama-c/effective_type_10.parse/framac.ast
+++ b/cerberus/.frama-c/effective_type_10.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   uint16_t y;
   x = 0x44332211;
   y = *((uint16_t *)(& x));
-  printf_va_1("x=%i  y=0x%x\n",x,(unsigned int)((int)y));
+  printf("x=%i  y=0x%x\n",x,(unsigned int)((int)y)); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/effective_type_2.parse/framac.ast b/cerberus/.frama-c/effective_type_2.parse/framac.ast
index 528783d301a45eaba83e50eb4ed98673dce3e1db..1cc3dc192c52bda2c74045645635982fc4c08a1b 100644
--- a/cerberus/.frama-c/effective_type_2.parse/framac.ast
+++ b/cerberus/.frama-c/effective_type_2.parse/framac.ast
@@ -33,7 +33,7 @@ void f(st1 *s1p, st2 *s2p)
 {
   s1p->i1 = 2;
   s2p->i2 = 3;
-  printf_va_1("f: s1p->i1 = %i\n",s1p->i1);
+  printf("f: s1p->i1 = %i\n",s1p->i1); /* printf_va_1 */
   return;
 }
 
@@ -60,7 +60,7 @@ int main(void)
   st1 *s1p = & s;
   s2p = (st2 *)s1p;
   f(s1p,s2p);
-  printf_va_2("s.i1=%i  s1p->i1=%i  s2p->i2=%i\n",s.i1,s1p->i1,s2p->i2);
+  printf("s.i1=%i  s1p->i1=%i  s2p->i2=%i\n",s.i1,s1p->i1,s2p->i2); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/effective_type_5.parse/framac.ast b/cerberus/.frama-c/effective_type_5.parse/framac.ast
index 59475447cf11f8875039317d13bc8a9b5d4993ed..177e2a6cab96f6780fd426b61fc43987053b5bff 100644
--- a/cerberus/.frama-c/effective_type_5.parse/framac.ast
+++ b/cerberus/.frama-c/effective_type_5.parse/framac.ast
@@ -35,7 +35,7 @@ int main(void)
   *((st1 *)p) = s1;
   float *pf = & ((st1 *)p)->f1;
   float f = *pf;
-  printf_va_1("f=%f\n",(double)f);
+  printf("f=%f\n",(double)f); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/effective_type_6.parse/framac.ast b/cerberus/.frama-c/effective_type_6.parse/framac.ast
index 5bd759c2c5e5ff3caae9bd14d32724b122ad409d..ae1a05a175d7b83c114d66cbbde99120b7e6abb0 100644
--- a/cerberus/.frama-c/effective_type_6.parse/framac.ast
+++ b/cerberus/.frama-c/effective_type_6.parse/framac.ast
@@ -27,7 +27,7 @@ int main(void)
   void *p = malloc(sizeof(float));
   __FC_assert((p != (void *)0) != 0,"effective_type_6.c",2,"p != NULL");
   float f = *((float *)p);
-  printf_va_1("f=%f\n",(double)f);
+  printf("f=%f\n",(double)f); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/effective_type_7.parse/framac.ast b/cerberus/.frama-c/effective_type_7.parse/framac.ast
index 40e11c43290edecc8946f194de8d6d32e06564d1..0ffd37fe701dd4b1ae81aeae53a1dec926acd653 100644
--- a/cerberus/.frama-c/effective_type_7.parse/framac.ast
+++ b/cerberus/.frama-c/effective_type_7.parse/framac.ast
@@ -33,7 +33,7 @@ int main(void)
   __FC_assert((p != (void *)0) != 0,"effective_type_7.c",3,"p != NULL");
   ((st1 *)p)->c1 = (char)'A';
   float f = ((st1 *)p)->f1;
-  printf_va_1("f=%f\n",(double)f);
+  printf("f=%f\n",(double)f); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/effective_type_8.parse/framac.ast b/cerberus/.frama-c/effective_type_8.parse/framac.ast
index e62a6fe3f6207eedac72a6a90c8d544ddd00e31f..016dc44cfe5b3aa2313371b7212717c09a90114f 100644
--- a/cerberus/.frama-c/effective_type_8.parse/framac.ast
+++ b/cerberus/.frama-c/effective_type_8.parse/framac.ast
@@ -44,7 +44,7 @@ int main(void)
   __FC_assert((p != (void *)0) != 0,"effective_type_8.c",7,"p != NULL");
   ((st1 *)p)->c1 = (char)'A';
   ((st2 *)p)->f2 = (float)1.0;
-  printf_va_1("((st2 *)p)->f2=%f\n",(double)((st2 *)p)->f2);
+  printf("((st2 *)p)->f2=%f\n",(double)((st2 *)p)->f2); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/effective_type_9.parse/framac.ast b/cerberus/.frama-c/effective_type_9.parse/framac.ast
index 41bbc0c2fb62cc7a851d11aa3e93872c71c05e54..19f7b81c1e5f3076f7f962227d837fdf7fa96aca 100644
--- a/cerberus/.frama-c/effective_type_9.parse/framac.ast
+++ b/cerberus/.frama-c/effective_type_9.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   st1 s1 = {.c1 = (char)'A', .f1 = (float)1.0};
   *((st1 *)p) = s1;
   float f = ((st2 *)p)->f2;
-  printf_va_1("f=%f\n",(double)f);
+  printf("f=%f\n",(double)f); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/frama-c-2013-03-13-2.parse/framac.ast b/cerberus/.frama-c/frama-c-2013-03-13-2.parse/framac.ast
index 0ac4e9e854a5505ceab4f1816a5a4dbfae0b6cdd..b827d4d087bbafef156024eeeaa9f4e09dacb95a 100644
--- a/cerberus/.frama-c/frama-c-2013-03-13-2.parse/framac.ast
+++ b/cerberus/.frama-c/frama-c-2013-03-13-2.parse/framac.ast
@@ -39,8 +39,8 @@ int main(int c, char **v)
   int __retres;
   unsigned int j;
   if (c == 4) j = (unsigned int)1; else j *= (unsigned int)2;
-  printf_va_1("j:%u ",j);
-  printf_va_2("c:%d\n",c);
+  printf("j:%u ",j); /* printf_va_1 */
+  printf("c:%d\n",c); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/frama-c-2013-03-13-3-uc.parse/framac.ast b/cerberus/.frama-c/frama-c-2013-03-13-3-uc.parse/framac.ast
index f9ace6bda6286dc425446fb3d3a3928a3f60f14c..58dde94cde48f5cc8ed6a7ada5ab3b8fdd65c3ed 100644
--- a/cerberus/.frama-c/frama-c-2013-03-13-3-uc.parse/framac.ast
+++ b/cerberus/.frama-c/frama-c-2013-03-13-3-uc.parse/framac.ast
@@ -40,8 +40,8 @@ int main(int c, char **v)
   unsigned char j;
   unsigned char *p = & j;
   if (c == 4) j = (unsigned char)1; else j = (unsigned char)((int)j * 2);
-  printf_va_1("j:%u ",(unsigned int)((int)j));
-  printf_va_2("c:%d\n",c);
+  printf("j:%u ",(unsigned int)((int)j)); /* printf_va_1 */
+  printf("c:%d\n",c); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/frama-c-2013-03-13-3.parse/framac.ast b/cerberus/.frama-c/frama-c-2013-03-13-3.parse/framac.ast
index 49e7ff8fad0b32904a061a48883bbcba577d14b7..0aa8c8e06f2636552607c0beefb3f058deb7ba4f 100644
--- a/cerberus/.frama-c/frama-c-2013-03-13-3.parse/framac.ast
+++ b/cerberus/.frama-c/frama-c-2013-03-13-3.parse/framac.ast
@@ -40,8 +40,8 @@ int main(int c, char **v)
   unsigned int j;
   unsigned int *p = & j;
   if (c == 4) j = (unsigned int)1; else j *= (unsigned int)2;
-  printf_va_1("j:%u ",j);
-  printf_va_2("c:%d\n",c);
+  printf("j:%u ",j); /* printf_va_1 */
+  printf("c:%d\n",c); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/khmgzv-1.parse/framac.ast b/cerberus/.frama-c/khmgzv-1.parse/framac.ast
index 4d61c17b8156cf941f2fc146cedd7ffeeb49f175..47e11d6253ec37e2c89251992aa620cfc8f6ff35 100644
--- a/cerberus/.frama-c/khmgzv-1.parse/framac.ast
+++ b/cerberus/.frama-c/khmgzv-1.parse/framac.ast
@@ -44,13 +44,13 @@ int main(void)
   int tmp;
   uintptr_t b = (unsigned int)(& x);
   uintptr_t a = (unsigned int)0x60102C;
-  printf_va_1("Addresses: b=0x%X a=0x%X\n",b,a);
+  printf("Addresses: b=0x%X a=0x%X\n",b,a); /* printf_va_1 */
   tmp = memcmp((void const *)(& b),(void const *)(& a),sizeof(b));
   if (tmp == 0) {
     a = (a - b) + ((uintptr_t)2 * b - b);
     int *q = (int *)a;
     *q = 123;
-    printf_va_2("*((int*)b=%d  *q=%d\n",*((int *)b),*q);
+    printf("*((int*)b=%d  *q=%d\n",*((int *)b),*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/khmgzv-2.parse/framac.ast b/cerberus/.frama-c/khmgzv-2.parse/framac.ast
index 4250a80cc7c0c01576d6dde7de04c1a934b14910..84a5ba913e0146b480279a50ee3e38d3cfb12c85 100644
--- a/cerberus/.frama-c/khmgzv-2.parse/framac.ast
+++ b/cerberus/.frama-c/khmgzv-2.parse/framac.ast
@@ -44,12 +44,12 @@ int main(void)
   int tmp;
   uintptr_t b = (unsigned int)(& x);
   uintptr_t a = (unsigned int)0x60102C;
-  printf_va_1("Addresses: b=0x%X a=0x%X\n",b,a);
+  printf("Addresses: b=0x%X a=0x%X\n",b,a); /* printf_va_1 */
   tmp = memcmp((void const *)(& b),(void const *)(& a),sizeof(b));
   if (tmp == 0) {
     int *q = (int *)a;
     *q = 123;
-    printf_va_2("*((int*)b=%d  *q=%d\n",*((int *)b),*q);
+    printf("*((int*)b=%d  *q=%d\n",*((int *)b),*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/klw-itp14-2.parse/framac.ast b/cerberus/.frama-c/klw-itp14-2.parse/framac.ast
index 16d19f12427599618e15d2acb10424800d44a713..18d4062679efd4458c6f2886fd9d283ca06be638 100644
--- a/cerberus/.frama-c/klw-itp14-2.parse/framac.ast
+++ b/cerberus/.frama-c/klw-itp14-2.parse/framac.ast
@@ -32,7 +32,7 @@ int main(void)
   int *q = & y;
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/krebbers_biener_1.parse/framac.ast b/cerberus/.frama-c/krebbers_biener_1.parse/framac.ast
index 15f71a924c5de31017ef3efc3bcc2bf3f4d5c0c8..5d7400615fd124aa146d9e0687a387f761046fd7 100644
--- a/cerberus/.frama-c/krebbers_biener_1.parse/framac.ast
+++ b/cerberus/.frama-c/krebbers_biener_1.parse/framac.ast
@@ -42,7 +42,7 @@ int main(void)
               "krebbers_biener_1.c",9,"sizeof(struct X) == 2 * sizeof(int)");
   unsigned char *p = malloc((unsigned int)3 * sizeof(int));
   tmp_0 = foo((struct X *)(p + sizeof(int)),(struct X *)p);
-  printf_va_1("%i\n",tmp_0);
+  printf("%i\n",tmp_0); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/null_pointer_1.parse/framac.ast b/cerberus/.frama-c/null_pointer_1.parse/framac.ast
index 9bcbfc6130005f02f53a48e0e22531e22146631b..6018c732c2af0e6e53bd903b21831a24a24ff33d 100644
--- a/cerberus/.frama-c/null_pointer_1.parse/framac.ast
+++ b/cerberus/.frama-c/null_pointer_1.parse/framac.ast
@@ -38,7 +38,7 @@ int main(void)
   _Bool b2 = (_Bool)(p == & y);
   if (b2) tmp = "true"; else tmp = "false";
   if (b1) tmp_0 = "true"; else tmp_0 = "false";
-  printf_va_1("(p==NULL)=%s  (p==&y)=%s\n",(char *)tmp_0,(char *)tmp);
+  printf("(p==NULL)=%s  (p==&y)=%s\n",(char *)tmp_0,(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/null_pointer_2.parse/framac.ast b/cerberus/.frama-c/null_pointer_2.parse/framac.ast
index c39e6b1c086807db7219591991f5a2ddff050754..8fdae4b62e62904d8418f9f9f0bfbe47f18e5f6d 100644
--- a/cerberus/.frama-c/null_pointer_2.parse/framac.ast
+++ b/cerberus/.frama-c/null_pointer_2.parse/framac.ast
@@ -48,9 +48,9 @@ int main(void)
   char *q = (char *)0;
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   _Bool b = (_Bool)(tmp == 0);
-  printf_va_1("p=%p q=%p\n",(void *)p,(void *)q);
+  printf("p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   if (b) tmp_0 = "equal"; else tmp_0 = "unequal";
-  printf_va_2("%s\n",(char *)tmp_0);
+  printf("%s\n",(char *)tmp_0); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/null_pointer_3.parse/framac.ast b/cerberus/.frama-c/null_pointer_3.parse/framac.ast
index d17df46e28960d41bacc98ed37eecbdd9293c72a..cdc3347261368541cc6a2d823079986571ab82f8 100644
--- a/cerberus/.frama-c/null_pointer_3.parse/framac.ast
+++ b/cerberus/.frama-c/null_pointer_3.parse/framac.ast
@@ -33,7 +33,7 @@ int main(void)
   tmp_0 = memcmp((void const *)(& p),(void const *)q,sizeof(p));
   _Bool b = (_Bool)(tmp_0 == 0);
   if (b) tmp_1 = "zero"; else tmp_1 = "nonzero";
-  printf_va_1("%s\n",(char *)tmp_1);
+  printf("%s\n",(char *)tmp_1); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/null_pointer_4.parse/framac.ast b/cerberus/.frama-c/null_pointer_4.parse/framac.ast
index f4f71832cec75b0a46e93ced1cedf7ba83d846a5..40cdacd7f72ed619e13a2795904ce2edf2b34b0d 100644
--- a/cerberus/.frama-c/null_pointer_4.parse/framac.ast
+++ b/cerberus/.frama-c/null_pointer_4.parse/framac.ast
@@ -26,7 +26,7 @@ int main(void)
   int __retres;
   int x;
   x = *((int *)0);
-  printf_va_1("x=%i\n",x);
+  printf("x=%i\n",x); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_struct_copy_1.parse/framac.ast b/cerberus/.frama-c/padding_struct_copy_1.parse/framac.ast
index 66cbf5884ae832b33219dcd3625916952c81bdc8..27aca13198d32e11d118c67a0107f991c12b7860 100644
--- a/cerberus/.frama-c/padding_struct_copy_1.parse/framac.ast
+++ b/cerberus/.frama-c/padding_struct_copy_1.parse/framac.ast
@@ -69,11 +69,11 @@ int main(void)
   st s1 = {.c = (char)'A', .u = (unsigned short)0x1234};
   unsigned char *padding1 = (unsigned char *)(& s1) + offset_padding;
   *padding1 = (unsigned char)0xBA;
-  printf_va_1("*padding1=0x%x\n",(unsigned int)((int)*padding1));
+  printf("*padding1=0x%x\n",(unsigned int)((int)*padding1)); /* printf_va_1 */
   unsigned char *padding2 = (unsigned char *)(& s2) + offset_padding;
-  printf_va_2("*padding2=0x%x\n",(unsigned int)((int)*padding2));
+  printf("*padding2=0x%x\n",(unsigned int)((int)*padding2)); /* printf_va_2 */
   f(& s2,& s1);
-  printf_va_3("*padding2=0x%x\n",(unsigned int)((int)*padding2));
+  printf("*padding2=0x%x\n",(unsigned int)((int)*padding2)); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_struct_copy_2.parse/framac.ast b/cerberus/.frama-c/padding_struct_copy_2.parse/framac.ast
index b275a4eff72bfa633356653fcc7859f8bf0254e1..3facb3029084da1a8dae79aa13d03d3c744f821c 100644
--- a/cerberus/.frama-c/padding_struct_copy_2.parse/framac.ast
+++ b/cerberus/.frama-c/padding_struct_copy_2.parse/framac.ast
@@ -69,11 +69,11 @@ int main(void)
   st s1 = {.u = (unsigned short)0x1234, .c = (char)'A'};
   unsigned char *padding1 = (unsigned char *)(& s1) + offset_padding;
   *padding1 = (unsigned char)0xBA;
-  printf_va_1("*padding1=0x%x\n",(unsigned int)((int)*padding1));
+  printf("*padding1=0x%x\n",(unsigned int)((int)*padding1)); /* printf_va_1 */
   unsigned char *padding2 = (unsigned char *)(& s2) + offset_padding;
-  printf_va_2("*padding2=0x%x\n",(unsigned int)((int)*padding2));
+  printf("*padding2=0x%x\n",(unsigned int)((int)*padding2)); /* printf_va_2 */
   f(& s2,& s1);
-  printf_va_3("*padding2=0x%x\n",(unsigned int)((int)*padding2));
+  printf("*padding2=0x%x\n",(unsigned int)((int)*padding2)); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_struct_copy_3.parse/framac.ast b/cerberus/.frama-c/padding_struct_copy_3.parse/framac.ast
index 736d2a23354a8b57f227ae8cdd82d3d9e8ff220a..c2f04a276d50a2b0c514722c8603e20fa8d8287f 100644
--- a/cerberus/.frama-c/padding_struct_copy_3.parse/framac.ast
+++ b/cerberus/.frama-c/padding_struct_copy_3.parse/framac.ast
@@ -70,11 +70,11 @@ int main(void)
   st s1 = {.c = (char)'A', .u = (unsigned short)0x1234};
   unsigned char *padding1 = (unsigned char *)(& s1) + offset_padding;
   *padding1 = (unsigned char)0xBA;
-  printf_va_1("*padding1=0x%x\n",(unsigned int)((int)*padding1));
+  printf("*padding1=0x%x\n",(unsigned int)((int)*padding1)); /* printf_va_1 */
   unsigned char *padding2 = (unsigned char *)(& s2) + offset_padding;
-  printf_va_2("*padding2=0x%x\n",(unsigned int)((int)*padding2));
+  printf("*padding2=0x%x\n",(unsigned int)((int)*padding2)); /* printf_va_2 */
   f(& s2,& s1);
-  printf_va_3("*padding2=0x%x\n",(unsigned int)((int)*padding2));
+  printf("*padding2=0x%x\n",(unsigned int)((int)*padding2)); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_struct_copy_of_representation_bytes.parse/framac.ast b/cerberus/.frama-c/padding_struct_copy_of_representation_bytes.parse/framac.ast
index 22176e6f1c282cb9e8a6978833ebeab340c2abcd..85ac5b3c072ceb4ecccd6b35a4a3376cca9a4250 100644
--- a/cerberus/.frama-c/padding_struct_copy_of_representation_bytes.parse/framac.ast
+++ b/cerberus/.frama-c/padding_struct_copy_of_representation_bytes.parse/framac.ast
@@ -35,7 +35,7 @@ int main(void)
   memcpy((void *)(& s2.c),(void const *)(& s1.c),sizeof(char));
   memset((void *)(& s2.c + sizeof(char)),'X',(4U - 0U) - sizeof(char));
   memcpy((void *)(& s2.f),(void const *)(& s1.f),sizeof(float));
-  printf_va_1("s2.c=%c s2.f=%f\n",(int)s2.c,(double)s2.f);
+  printf("s2.c=%c s2.f=%f\n",(int)s2.c,(double)s2.f); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_struct_members_copy.parse/framac.ast b/cerberus/.frama-c/padding_struct_members_copy.parse/framac.ast
index 9188f90563207a1f66061017c36ee8a60c78372b..51652e2b6f6943a148efc75e37c142854161f964 100644
--- a/cerberus/.frama-c/padding_struct_members_copy.parse/framac.ast
+++ b/cerberus/.frama-c/padding_struct_members_copy.parse/framac.ast
@@ -63,12 +63,12 @@ int main(void)
   st s1 = {.c = (char)'A', .u = (unsigned short)0x1234};
   unsigned char *padding1 = (unsigned char *)(& s1) + offset_padding;
   *padding1 = (unsigned char)0xBA;
-  printf_va_1("*padding1=0x%x\n",(unsigned int)((int)*padding1));
+  printf("*padding1=0x%x\n",(unsigned int)((int)*padding1)); /* printf_va_1 */
   unsigned char *padding2 = (unsigned char *)(& s2) + offset_padding;
-  printf_va_2("*padding2=0x%x\n",(unsigned int)((int)*padding2));
+  printf("*padding2=0x%x\n",(unsigned int)((int)*padding2)); /* printf_va_2 */
   s2.c = s1.c;
   s2.u = s1.u;
-  printf_va_3("*padding2=0x%x\n",(unsigned int)((int)*padding2));
+  printf("*padding2=0x%x\n",(unsigned int)((int)*padding2)); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_subunion_1.parse/framac.ast b/cerberus/.frama-c/padding_subunion_1.parse/framac.ast
index 67360a129117d2185d66037ea1946211ee760008..f8e57f4fd45e4048b10aa582693c10ab5bd33a95 100644
--- a/cerberus/.frama-c/padding_subunion_1.parse/framac.ast
+++ b/cerberus/.frama-c/padding_subunion_1.parse/framac.ast
@@ -39,7 +39,7 @@ int main(void)
   int __retres;
   un *u = malloc(sizeof(st1));
   u->s1.c1 = (char)'a';
-  printf_va_1("u->s1.c1=0x%x\n",(unsigned int)((int)u->s1.c1));
+  printf("u->s1.c1=0x%x\n",(unsigned int)((int)u->s1.c1)); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_subunion_2.parse/framac.ast b/cerberus/.frama-c/padding_subunion_2.parse/framac.ast
index d0789ac0fee3516e6b5c1c05fbc0559defbe6529..ad7d0b693b3d4953f876c630812ab4e985539a3e 100644
--- a/cerberus/.frama-c/padding_subunion_2.parse/framac.ast
+++ b/cerberus/.frama-c/padding_subunion_2.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   *pc = (char)'B';
   pu->s1.c1 = (char)'A';
   unsigned char c = (unsigned char)*pc;
-  printf_va_1("c=0x%x\n",(unsigned int)((int)c));
+  printf("c=0x%x\n",(unsigned int)((int)c)); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_unspecified_value_1.parse/framac.ast b/cerberus/.frama-c/padding_unspecified_value_1.parse/framac.ast
index 71dfd64c3886e02188fa46568f8c10be49bf6b66..040d1578da6ea0dd4bda2e2bdbdc99d41cb34e9d 100644
--- a/cerberus/.frama-c/padding_unspecified_value_1.parse/framac.ast
+++ b/cerberus/.frama-c/padding_unspecified_value_1.parse/framac.ast
@@ -36,7 +36,7 @@ int main(void)
     unsigned char *p = (unsigned char *)(& s) + offset_padding;
     *p = (unsigned char)'A';
     unsigned char c1 = *p;
-    printf_va_1("c1=%c\n",(int)c1);
+    printf("c1=%c\n",(int)c1); /* printf_va_1 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/padding_unspecified_value_2.parse/framac.ast b/cerberus/.frama-c/padding_unspecified_value_2.parse/framac.ast
index 622c8bf7404560d8fa3e69996a12f1fe3407f2a1..a03caa446b2a7d2a40b0b1ded378525a4ed35347 100644
--- a/cerberus/.frama-c/padding_unspecified_value_2.parse/framac.ast
+++ b/cerberus/.frama-c/padding_unspecified_value_2.parse/framac.ast
@@ -38,7 +38,7 @@ int main(void)
     st __constr_expr_0 = {.c = (char)'E', .f = (float)1.0, .i = 1};
     s = __constr_expr_0;
     unsigned char c2 = *p;
-    printf_va_1("c2=0x%x\n",(unsigned int)((int)c2));
+    printf("c2=0x%x\n",(unsigned int)((int)c2)); /* printf_va_1 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/padding_unspecified_value_3.parse/framac.ast b/cerberus/.frama-c/padding_unspecified_value_3.parse/framac.ast
index 4e1eff97505554467414697228348e24bb30f6d6..49659087143baaa12b34f77e9372bc5ce4e3f624 100644
--- a/cerberus/.frama-c/padding_unspecified_value_3.parse/framac.ast
+++ b/cerberus/.frama-c/padding_unspecified_value_3.parse/framac.ast
@@ -38,7 +38,7 @@ int main(void)
   st __constr_expr_0 = {.c = (char)'E', .u = (unsigned short)1};
   s = __constr_expr_0;
   unsigned char c = *p;
-  printf_va_1("c=0x%x\n",(unsigned int)((int)c));
+  printf("c=0x%x\n",(unsigned int)((int)c)); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_unspecified_value_4.parse/framac.ast b/cerberus/.frama-c/padding_unspecified_value_4.parse/framac.ast
index 30c23eb68f766edabe16460af81f660dea4cc827..a284f844c66496601252c5cb98a8a2c3b2cd5ac2 100644
--- a/cerberus/.frama-c/padding_unspecified_value_4.parse/framac.ast
+++ b/cerberus/.frama-c/padding_unspecified_value_4.parse/framac.ast
@@ -38,7 +38,7 @@ int main(void)
   st s2 = {.c = (char)'E', .u = (unsigned short)1};
   s = s2;
   unsigned char c = *p;
-  printf_va_1("c=0x%x\n",(unsigned int)((int)c));
+  printf("c=0x%x\n",(unsigned int)((int)c)); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/padding_unspecified_value_5.parse/framac.ast b/cerberus/.frama-c/padding_unspecified_value_5.parse/framac.ast
index bc65becc2ca0fcae82c7b134ba0fc89155735b70..5cfd99684945ad1874400445706536307a61cb8c 100644
--- a/cerberus/.frama-c/padding_unspecified_value_5.parse/framac.ast
+++ b/cerberus/.frama-c/padding_unspecified_value_5.parse/framac.ast
@@ -37,7 +37,7 @@ int main(void)
     *p = (unsigned char)'C';
     s.i = 42;
     unsigned char c3 = *p;
-    printf_va_1("c3=%c\n",(int)c3);
+    printf("c3=%c\n",(int)c3); /* printf_va_1 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/padding_unspecified_value_6.parse/framac.ast b/cerberus/.frama-c/padding_unspecified_value_6.parse/framac.ast
index 153ddb1aa6d20224cf1df4df9bd5d11d5801e6d1..e85f5558553f55025717b4fbc79b6756dcbb0cbb 100644
--- a/cerberus/.frama-c/padding_unspecified_value_6.parse/framac.ast
+++ b/cerberus/.frama-c/padding_unspecified_value_6.parse/framac.ast
@@ -44,7 +44,7 @@ int main(void)
     *p = (unsigned char)'D';
     g(& s.c,& s.f);
     unsigned char c4 = *p;
-    printf_va_1("c4=%c\n",(int)c4);
+    printf("c4=%c\n",(int)c4); /* printf_va_1 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/padding_unspecified_value_7.parse/framac.ast b/cerberus/.frama-c/padding_unspecified_value_7.parse/framac.ast
index 1159004de472ca91bd8455821932a6f852ac1f0c..f125c6606822450c568257817eacfdec4e1f4f59 100644
--- a/cerberus/.frama-c/padding_unspecified_value_7.parse/framac.ast
+++ b/cerberus/.frama-c/padding_unspecified_value_7.parse/framac.ast
@@ -39,7 +39,7 @@ int main(void)
     s.f = (float)1.0;
     s.i = 42;
     unsigned char c3 = *p;
-    printf_va_1("c3=%c\n",(int)c3);
+    printf("c3=%c\n",(int)c3); /* printf_va_1 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/padding_unspecified_value_8.parse/framac.ast b/cerberus/.frama-c/padding_unspecified_value_8.parse/framac.ast
index ddff1480c38cb75b357a16fccb558a04ddf48058..a04ae39e9d18ea4062164be102fc39fc172de63b 100644
--- a/cerberus/.frama-c/padding_unspecified_value_8.parse/framac.ast
+++ b/cerberus/.frama-c/padding_unspecified_value_8.parse/framac.ast
@@ -39,7 +39,7 @@ int main(void)
     s.f = (float)1.0;
     s.i = 42;
     unsigned char c3 = *p;
-    printf_va_1("c3=0x%x\n",(unsigned int)((int)c3));
+    printf("c3=0x%x\n",(unsigned int)((int)c3)); /* printf_va_1 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/pointer_add_wrap_1.parse/framac.ast b/cerberus/.frama-c/pointer_add_wrap_1.parse/framac.ast
index ad460c7d16a9710d06cc229725ef5bac9c38156b..9593fe2bc6e972a3c27c2a7a0d599fc72f8db6d0 100644
--- a/cerberus/.frama-c/pointer_add_wrap_1.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_add_wrap_1.parse/framac.ast
@@ -45,8 +45,8 @@ int main(void)
   unsigned long long h = 1ull << 63;
   unsigned char *q1 = p + h;
   unsigned char *q2 = q1 + h;
-  printf_va_1("Addresses: p =%p  q1=%p\n",(void *)p,(void *)q1);
-  printf_va_2("Addresses: q2=%p  h =0x%llx\n",(void *)q2,h);
+  printf("Addresses: p =%p  q1=%p\n",(void *)p,(void *)q1); /* printf_va_1 */
+  printf("Addresses: q2=%p  h =0x%llx\n",(void *)q2,h); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_add_wrap_2.parse/framac.ast b/cerberus/.frama-c/pointer_add_wrap_2.parse/framac.ast
index 34018c3579910e408749fe5d848cd9d0576da682..1484f691c6372774662bdf8db8815b7db14061e4 100644
--- a/cerberus/.frama-c/pointer_add_wrap_2.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_add_wrap_2.parse/framac.ast
@@ -61,10 +61,10 @@ int main(void)
   unsigned char *q1 = p + h;
   unsigned char *q2 = q1 + h;
   *q2 = (unsigned char)1;
-  printf_va_1("Addresses: p =%p  q1=%p\n",(void *)p,(void *)q1);
-  printf_va_2("Addresses: q2=%p  h =0x%llx\n",(void *)q2,h);
-  printf_va_3("x=0x%x  *p=0x%x  *q2=0x%x\n",(unsigned int)((int)x),
-              (unsigned int)((int)*p),(unsigned int)((int)*q2));
+  printf("Addresses: p =%p  q1=%p\n",(void *)p,(void *)q1); /* printf_va_1 */
+  printf("Addresses: q2=%p  h =0x%llx\n",(void *)q2,h); /* printf_va_2 */
+  printf("x=0x%x  *p=0x%x  *q2=0x%x\n",(unsigned int)((int)x),
+         (unsigned int)((int)*p),(unsigned int)((int)*q2)); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_arith_algebraic_properties_1_global.parse/framac.ast b/cerberus/.frama-c/pointer_arith_algebraic_properties_1_global.parse/framac.ast
index cb2dc8ceb308441d9817af1adf94385a0c195df1..444cc5cd41df52b6e6c937662d1205b007c33c2d 100644
--- a/cerberus/.frama-c/pointer_arith_algebraic_properties_1_global.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_arith_algebraic_properties_1_global.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   int *p =
     (int *)((unsigned int)(x) + (unsigned int)(& y[1])) - (unsigned int)(y);
   *p = 11;
-  printf_va_1("x[1]=%d *p=%d\n",x[1],*p);
+  printf("x[1]=%d *p=%d\n",x[1],*p); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_arith_algebraic_properties_2_auto.parse/framac.ast b/cerberus/.frama-c/pointer_arith_algebraic_properties_2_auto.parse/framac.ast
index 93ed6c5e2fe12498a89cd395c81fa6bff0c1c47f..a84f0c31461f309fa364f9376c359f8654f41ced 100644
--- a/cerberus/.frama-c/pointer_arith_algebraic_properties_2_auto.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_arith_algebraic_properties_2_auto.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   int *p =
     (int *)((unsigned int)(x) + ((unsigned int)(& y[1]) - (unsigned int)(y)));
   *p = 11;
-  printf_va_1("x[1]=%d *p=%d\n",x[1],*p);
+  printf("x[1]=%d *p=%d\n",x[1],*p); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_arith_algebraic_properties_2_global.parse/framac.ast b/cerberus/.frama-c/pointer_arith_algebraic_properties_2_global.parse/framac.ast
index 85a3938f230c7fd9a09d73b5272d106606e01002..8f4b656c53907a467cebb1fcaf44681b52474f68 100644
--- a/cerberus/.frama-c/pointer_arith_algebraic_properties_2_global.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_arith_algebraic_properties_2_global.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   int *p =
     (int *)((unsigned int)(x) + ((unsigned int)(& y[1]) - (unsigned int)(y)));
   *p = 11;
-  printf_va_1("x[1]=%d *p=%d\n",x[1],*p);
+  printf("x[1]=%d *p=%d\n",x[1],*p); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_arith_algebraic_properties_3_auto.parse/framac.ast b/cerberus/.frama-c/pointer_arith_algebraic_properties_3_auto.parse/framac.ast
index 9f257c752a7459f9c8b8315b48090cfecb9fb923..9ae2354d6d08bd37c5ab6f870779b417b6df9703 100644
--- a/cerberus/.frama-c/pointer_arith_algebraic_properties_3_auto.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_arith_algebraic_properties_3_auto.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   int *p =
     (int *)(((unsigned int)(x) + (unsigned int)(& y[1])) - (unsigned int)(y));
   *p = 11;
-  printf_va_1("x[1]=%d *p=%d\n",x[1],*p);
+  printf("x[1]=%d *p=%d\n",x[1],*p); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_arith_algebraic_properties_3_global.parse/framac.ast b/cerberus/.frama-c/pointer_arith_algebraic_properties_3_global.parse/framac.ast
index a705a5155cd6f6cec53aa4df2b33c0a2ef069c79..049594249e18bddd24539684282399861681f77e 100644
--- a/cerberus/.frama-c/pointer_arith_algebraic_properties_3_global.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_arith_algebraic_properties_3_global.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   int *p =
     (int *)(((unsigned int)(x) + (unsigned int)(& y[1])) - (unsigned int)(y));
   *p = 11;
-  printf_va_1("x[1]=%d *p=%d\n",x[1],*p);
+  printf("x[1]=%d *p=%d\n",x[1],*p); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_7b.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_7b.parse/framac.ast
index 7f2fee9f38978ced35efa19c3723fd50e96e9581..c1b56575e8a8ccbbd3c6020800afe116d523222d 100644
--- a/cerberus/.frama-c/pointer_comparison_7b.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_7b.parse/framac.ast
@@ -70,16 +70,16 @@ int main(void)
   {
     int j = 1;
     pj = & j;
-    printf_va_1("pj=%p  &pj=%p\n",(void *)pj,(void *)(& pj));
+    printf("pj=%p  &pj=%p\n",(void *)pj,(void *)(& pj)); /* printf_va_1 */
   }
   {
     int k = 2;
     pk = & k;
-    printf_va_2("pk=%p  \n",(void *)pk);
+    printf("pk=%p  \n",(void *)pk); /* printf_va_2 */
     *pj = 3;
-    printf_va_3("k=%i\n",k);
+    printf("k=%i\n",k); /* printf_va_3 */
   }
-  printf_va_4("pj=%p  &pj=%p\n",(void *)pj,(void *)(& pj));
+  printf("pj=%p  &pj=%p\n",(void *)pj,(void *)(& pj)); /* printf_va_4 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_7c.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_7c.parse/framac.ast
index 16fc0c615fa186ceb51bcadfb79d7c91ea207256..2d3086d4a3a9fa7a1d54453e6d9f76696d4a0c43 100644
--- a/cerberus/.frama-c/pointer_comparison_7c.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_7c.parse/framac.ast
@@ -71,16 +71,16 @@ int main(void)
   {
     int j = 1;
     pj = & j;
-    printf_va_1("pj=%p  &pj=%p\n",(void *)pj,(void *)(& pj));
+    printf("pj=%p  &pj=%p\n",(void *)pj,(void *)(& pj)); /* printf_va_1 */
   }
   {
     int k = 2;
     pk = & k;
-    printf_va_2("pk=%p  &pk=%p\n",(void *)pk,(void *)(& pk));
+    printf("pk=%p  &pk=%p\n",(void *)pk,(void *)(& pk)); /* printf_va_2 */
     *pj = 3;
-    printf_va_3("k=%i\n",k);
+    printf("k=%i\n",k); /* printf_va_3 */
   }
-  printf_va_4("pj=%p  &pj=%p\n",(void *)pj,(void *)(& pj));
+  printf("pj=%p  &pj=%p\n",(void *)pj,(void *)(& pj)); /* printf_va_4 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_eq_1_auto.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_eq_1_auto.parse/framac.ast
index c0edaaedf703c00682ba0a71ea06926a895d5334..389d2371cf0911521f0de8ff7759458705ca559f 100644
--- a/cerberus/.frama-c/pointer_comparison_eq_1_auto.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_eq_1_auto.parse/framac.ast
@@ -32,7 +32,7 @@ int main(void)
   float *q = & f;
   _Bool b = (_Bool)((void *)p == (void *)q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_eq_1_global.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_eq_1_global.parse/framac.ast
index 68ffd134aac82aac0c4c99c9c9a661ff30df3e45..9d81789a58aeebde0ae2f3fa2e0153378ab53ab0 100644
--- a/cerberus/.frama-c/pointer_comparison_eq_1_global.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_eq_1_global.parse/framac.ast
@@ -32,7 +32,7 @@ int main(void)
   float *q = & f;
   _Bool b = (_Bool)((void *)p == (void *)q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_eq_2_auto.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_eq_2_auto.parse/framac.ast
index 51a7c9fe6b2622a6d405f05cc9c480f31d831d75..4875b16ca722796954830c5acee3c129b8ca3a07 100644
--- a/cerberus/.frama-c/pointer_comparison_eq_2_auto.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_eq_2_auto.parse/framac.ast
@@ -32,7 +32,7 @@ int main(void)
   float *q = & f;
   _Bool b = (_Bool)((void *)p == (void *)q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_eq_2_global.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_eq_2_global.parse/framac.ast
index bd57ad90b09fcdd21cacd9b3632f27d41b372889..3c78c084f99084c281299bf9f6e536c2189f7313 100644
--- a/cerberus/.frama-c/pointer_comparison_eq_2_global.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_eq_2_global.parse/framac.ast
@@ -32,7 +32,7 @@ int main(void)
   float *q = & f;
   _Bool b = (_Bool)((void *)p == (void *)q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_eq_zombie_1.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_eq_zombie_1.parse/framac.ast
index 60ad445635b2dd62dd97b13001a13f19aa54484e..4e85b9f9c5c23a03df170d92163cac7a979de485 100644
--- a/cerberus/.frama-c/pointer_comparison_eq_zombie_1.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_eq_zombie_1.parse/framac.ast
@@ -45,10 +45,10 @@ int main(void)
   int *pj = malloc(sizeof(int));
   *pj = 1;
   if (& i == pj) tmp_0 = "true"; else tmp_0 = "false";
-  printf_va_1("(&i==pj)=%s\n",(char *)tmp_0);
+  printf("(&i==pj)=%s\n",(char *)tmp_0); /* printf_va_1 */
   free((void *)pj);
   if (& i == pj) tmp_1 = "true"; else tmp_1 = "false";
-  printf_va_2("(&i==pj)=%s\n",(char *)tmp_1);
+  printf("(&i==pj)=%s\n",(char *)tmp_1); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_eq_zombie_2.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_eq_zombie_2.parse/framac.ast
index 8a8141cbacde63e753f7ae3e549f46b697d5dd17..998c1e3c64f0c78bc4978cdc4400647db3976568 100644
--- a/cerberus/.frama-c/pointer_comparison_eq_zombie_2.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_eq_zombie_2.parse/framac.ast
@@ -47,10 +47,10 @@ int main(void)
     int j = 1;
     pj = & j;
     if (& i == pj) tmp = "true"; else tmp = "false";
-    printf_va_1("(&i==pj)=%s\n",(char *)tmp);
+    printf("(&i==pj)=%s\n",(char *)tmp); /* printf_va_1 */
   }
   if (& i == pj) tmp_0 = "true"; else tmp_0 = "false";
-  printf_va_2("(&i==pj)=%s\n",(char *)tmp_0);
+  printf("(&i==pj)=%s\n",(char *)tmp_0); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_rel_1_auto.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_rel_1_auto.parse/framac.ast
index 563a10709f092652014d9f03278149445637849f..fc0553677bfe5fa39b6b33ac5ef361fd3e51e53d 100644
--- a/cerberus/.frama-c/pointer_comparison_rel_1_auto.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_rel_1_auto.parse/framac.ast
@@ -49,10 +49,10 @@ int main(void)
   int *q = & y;
   _Bool b1 = (_Bool)(p < q);
   _Bool b2 = (_Bool)(p > q);
-  printf_va_1("Addresses: p=%p  q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p  q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   if (b2) tmp = "true"; else tmp = "false";
   if (b1) tmp_0 = "true"; else tmp_0 = "false";
-  printf_va_2("(p<q) = %s  (p>q) = %s\n",(char *)tmp_0,(char *)tmp);
+  printf("(p<q) = %s  (p>q) = %s\n",(char *)tmp_0,(char *)tmp); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_rel_1_global.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_rel_1_global.parse/framac.ast
index 71bd7c9d6ef3f30cb3e36de2c8e958df62c7020e..434a6de72fb0e708d598aa0151ec196bbc778a33 100644
--- a/cerberus/.frama-c/pointer_comparison_rel_1_global.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_rel_1_global.parse/framac.ast
@@ -49,10 +49,10 @@ int main(void)
   int *q = & y;
   _Bool b1 = (_Bool)(p < q);
   _Bool b2 = (_Bool)(p > q);
-  printf_va_1("Addresses: p=%p  q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p  q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   if (b2) tmp = "true"; else tmp = "false";
   if (b1) tmp_0 = "true"; else tmp_0 = "false";
-  printf_va_2("(p<q) = %s  (p>q) = %s\n",(char *)tmp_0,(char *)tmp);
+  printf("(p<q) = %s  (p>q) = %s\n",(char *)tmp_0,(char *)tmp); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_rel_different_type_members.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_rel_different_type_members.parse/framac.ast
index b99f54136389f5f24336b9a6c32388029fbf3da3..ce521db6d72fcdef9ec4784db7e8b8b8533f22be 100644
--- a/cerberus/.frama-c/pointer_comparison_rel_different_type_members.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_rel_different_type_members.parse/framac.ast
@@ -49,9 +49,9 @@ int main(void)
   int *p = & s.i;
   float *q = & s.f;
   _Bool b = (_Bool)((void *)p < (void *)q);
-  printf_va_1("Addresses: p=%p  q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p  q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_2("(p<q) = %s\n",(char *)tmp);
+  printf("(p<q) = %s\n",(char *)tmp); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_comparison_rel_substruct.parse/framac.ast b/cerberus/.frama-c/pointer_comparison_rel_substruct.parse/framac.ast
index ec952bdff4a3ac31c81f6c43af657d9933bd3f62..d573598fef85f27323ecefab25154cfec0d7143d 100644
--- a/cerberus/.frama-c/pointer_comparison_rel_substruct.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_comparison_rel_substruct.parse/framac.ast
@@ -54,9 +54,9 @@ int main(void)
   int *p = & s.i2;
   int *q = & s.s2.i1;
   _Bool b = (_Bool)(p < q);
-  printf_va_1("Addresses: p=%p  q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p  q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_2("(p<q) = %s\n",(char *)tmp);
+  printf("(p<q) = %s\n",(char *)tmp); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_copy_memcpy.parse/framac.ast b/cerberus/.frama-c/pointer_copy_memcpy.parse/framac.ast
index 634323aef172824ba7d3b400d413e4109b490e88..8f4bd8b6ebe0d20bdd6c5b2fc6f9a0b2084313fb 100644
--- a/cerberus/.frama-c/pointer_copy_memcpy.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_copy_memcpy.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   int *p = & x;
   memcpy((void *)(& q),(void const *)(& p),sizeof(p));
   *q = 11;
-  printf_va_1("*p=%d  *q=%d\n",*p,*q);
+  printf("*p=%d  *q=%d\n",*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_copy_user_ctrlflow_bitwise.parse/framac.ast b/cerberus/.frama-c/pointer_copy_user_ctrlflow_bitwise.parse/framac.ast
index fa00c9efbebc0c998d27cdf1266868f342248072..ad9743983725fcfd6010f6a66f5fa0aeac0dd1e6 100644
--- a/cerberus/.frama-c/pointer_copy_user_ctrlflow_bitwise.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_copy_user_ctrlflow_bitwise.parse/framac.ast
@@ -41,7 +41,7 @@ int main(void)
   }
   int *q = (int *)j;
   *q = 11;
-  printf_va_1("*p=%d  *q=%d\n",*p,*q);
+  printf("*p=%d  *q=%d\n",*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_copy_user_ctrlflow_bytewise.parse/framac.ast b/cerberus/.frama-c/pointer_copy_user_ctrlflow_bytewise.parse/framac.ast
index 046c91d73f657c98af3e5dd4c889c6665f88ae8a..8b8e53e1f5409d7dcd4d28ef0ccac482b01147f6 100644
--- a/cerberus/.frama-c/pointer_copy_user_ctrlflow_bytewise.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_copy_user_ctrlflow_bytewise.parse/framac.ast
@@ -565,7 +565,7 @@ int main(void)
   int *p = & x;
   user_memcpy2((unsigned char *)(& q),(unsigned char *)(& p),sizeof(p));
   *q = 11;
-  printf_va_1("*p=%d  *q=%d\n",*p,*q);
+  printf("*p=%d  *q=%d\n",*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_copy_user_ctrlflow_bytewise_abbrev.parse/framac.ast b/cerberus/.frama-c/pointer_copy_user_ctrlflow_bytewise_abbrev.parse/framac.ast
index cf3e4bb47e76a2061197d36269d058bd18cb3de6..7b7be198c6efb363bcbf76b0bae86d7e957a9985 100644
--- a/cerberus/.frama-c/pointer_copy_user_ctrlflow_bytewise_abbrev.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_copy_user_ctrlflow_bytewise_abbrev.parse/framac.ast
@@ -62,7 +62,7 @@ int main(void)
   int *p = & x;
   user_memcpy2((unsigned char *)(& q),(unsigned char *)(& p),sizeof(p));
   *q = 11;
-  printf_va_1("*p=%d  *q=%d\n",*p,*q);
+  printf("*p=%d  *q=%d\n",*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_copy_user_dataflow_direct_bitwise.parse/framac.ast b/cerberus/.frama-c/pointer_copy_user_dataflow_direct_bitwise.parse/framac.ast
index 4fbb3c831c108ad7af376dd3820465a528f06651..8b1b3f4f1ac208771fde1fb828c3d6b0543d0483 100644
--- a/cerberus/.frama-c/pointer_copy_user_dataflow_direct_bitwise.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_copy_user_dataflow_direct_bitwise.parse/framac.ast
@@ -41,7 +41,7 @@ int main(void)
   }
   int *q = (int *)j;
   *q = 11;
-  printf_va_1("*p=%d  *q=%d\n",*p,*q);
+  printf("*p=%d  *q=%d\n",*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_copy_user_dataflow_direct_bytewise.parse/framac.ast b/cerberus/.frama-c/pointer_copy_user_dataflow_direct_bytewise.parse/framac.ast
index 8c5c11e0d60409d6f1560221ac8086d20a215916..eda060255ee1cc90e9d77761aac26b47b8c002e1 100644
--- a/cerberus/.frama-c/pointer_copy_user_dataflow_direct_bytewise.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_copy_user_dataflow_direct_bytewise.parse/framac.ast
@@ -41,7 +41,7 @@ int main(void)
   int *p = & x;
   user_memcpy((unsigned char *)(& q),(unsigned char *)(& p),sizeof(p));
   *q = 11;
-  printf_va_1("*p=%d  *q=%d\n",*p,*q);
+  printf("*p=%d  *q=%d\n",*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_copy_user_dataflow_indirect_bytewise.parse/framac.ast b/cerberus/.frama-c/pointer_copy_user_dataflow_indirect_bytewise.parse/framac.ast
index 76c2f28e0782f568498fd253b5ea6d3014dd465a..7933fa52226e227ba584984bae7b8449baf0ca6a 100644
--- a/cerberus/.frama-c/pointer_copy_user_dataflow_indirect_bytewise.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_copy_user_dataflow_indirect_bytewise.parse/framac.ast
@@ -41,7 +41,7 @@ int main(void)
   int *p = & x;
   user_memcpy2((unsigned char *)(& q),(unsigned char *)(& p),sizeof(p));
   *q = 11;
-  printf_va_1("*p=%d  *q=%d\n",*p,*q);
+  printf("*p=%d  *q=%d\n",*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_offset_constant_8_malloc.parse/framac.ast b/cerberus/.frama-c/pointer_offset_constant_8_malloc.parse/framac.ast
index 66013a963ef82022d508ba88ee6110a305d3f1e5..0fad389f4c7ee3bc6875dd67a77a1752600585d5 100644
--- a/cerberus/.frama-c/pointer_offset_constant_8_malloc.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_offset_constant_8_malloc.parse/framac.ast
@@ -51,12 +51,11 @@ int main(void)
   unsigned char *p2 = p1 + offset;
   int *p = (int *)p2;
   int *q = (int *)yp;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp_1 = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp_1 == 0) {
     *p = 11;
-    printf_va_2("*xp=%d *yp=%d *p=%d *q=%d\n",*((int *)xp),*((int *)yp),*p,
-                *q);
+    printf("*xp=%d *yp=%d *p=%d *q=%d\n",*((int *)xp),*((int *)yp),*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/pointer_offset_from_subtraction_1_auto.parse/framac.ast b/cerberus/.frama-c/pointer_offset_from_subtraction_1_auto.parse/framac.ast
index e3a0febfaa9311932565e9d9ebbcb5bdbfaf22c1..b703efc843e8ca569910f5d94b731fa71f7eba82 100644
--- a/cerberus/.frama-c/pointer_offset_from_subtraction_1_auto.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_offset_from_subtraction_1_auto.parse/framac.ast
@@ -47,13 +47,13 @@ int main(void)
   intptr_t ux = (int)(& x);
   intptr_t uy = (int)(& y);
   intptr_t offset = uy - ux;
-  printf_va_1("Addresses: &x=%i &y=%i offset=%i \n",ux,uy,offset);
+  printf("Addresses: &x=%i &y=%i offset=%i \n",ux,uy,offset); /* printf_va_1 */
   int *p = (int *)(ux + offset);
   int *q = & y;
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/pointer_offset_from_subtraction_1_global.parse/framac.ast b/cerberus/.frama-c/pointer_offset_from_subtraction_1_global.parse/framac.ast
index 6784d56b4b71a83a22de2fc932ec75772f50ecae..974c2894d59d567d40fdac9abcb78b38a39534e4 100644
--- a/cerberus/.frama-c/pointer_offset_from_subtraction_1_global.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_offset_from_subtraction_1_global.parse/framac.ast
@@ -47,13 +47,13 @@ int main(void)
   intptr_t ux = (int)(& x);
   intptr_t uy = (int)(& y);
   intptr_t offset = uy - ux;
-  printf_va_1("Addresses: &x=%i &y=%i offset=%i \n",ux,uy,offset);
+  printf("Addresses: &x=%i &y=%i offset=%i \n",ux,uy,offset); /* printf_va_1 */
   int *p = (int *)(ux + offset);
   int *q = & y;
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/pointer_offset_from_subtraction_1_malloc.parse/framac.ast b/cerberus/.frama-c/pointer_offset_from_subtraction_1_malloc.parse/framac.ast
index 82ac3604708be01a15b9e120eda292c7190bed8b..679f213f9a2923afc033a6fe2d319501bfa06326 100644
--- a/cerberus/.frama-c/pointer_offset_from_subtraction_1_malloc.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_offset_from_subtraction_1_malloc.parse/framac.ast
@@ -51,12 +51,11 @@ int main(void)
   unsigned char *p2 = p1 + offset;
   int *p = (int *)p2;
   int *q = (int *)yp;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp_1 = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp_1 == 0) {
     *p = 11;
-    printf_va_2("*xp=%d *yp=%d *p=%d *q=%d\n",*((int *)xp),*((int *)yp),*p,
-                *q);
+    printf("*xp=%d *yp=%d *p=%d *q=%d\n",*((int *)xp),*((int *)yp),*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/pointer_offset_from_subtraction_2_auto.parse/framac.ast b/cerberus/.frama-c/pointer_offset_from_subtraction_2_auto.parse/framac.ast
index f5796419f556abaf4a56ca6adfdcffb623a8f929..a18880e458cbdb17654f01bd434552bd6b98eccc 100644
--- a/cerberus/.frama-c/pointer_offset_from_subtraction_2_auto.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_offset_from_subtraction_2_auto.parse/framac.ast
@@ -67,8 +67,8 @@ int main(void)
   intptr_t uz = (int)(& z);
   intptr_t uw = (int)(& w);
   intptr_t offsetzw = uw - uz;
-  printf_va_1("Addresses: &x=%i &y=%i offsetxy=%i \n",ux,uy,offsetxy);
-  printf_va_2("Addresses: &z=%i &w=%i offsetzw=%i \n",uz,uw,offsetzw);
+  printf("Addresses: &x=%i &y=%i offsetxy=%i \n",ux,uy,offsetxy); /* printf_va_1 */
+  printf("Addresses: &z=%i &w=%i offsetzw=%i \n",uz,uw,offsetzw); /* printf_va_2 */
   __FC_assert((offsetzw == offsetxy) != 0,
               "pointer_offset_from_subtraction_2_auto.c",13,
               "offsetzw==offsetxy");
@@ -77,7 +77,7 @@ int main(void)
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_3("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_3 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/pointer_offset_from_subtraction_2_global.parse/framac.ast b/cerberus/.frama-c/pointer_offset_from_subtraction_2_global.parse/framac.ast
index dbdfd3bd0096886b7b9f276262edf46b15f3eb9f..5b2b30afad67bb9d0cbb8515a7fd55e72b898168 100644
--- a/cerberus/.frama-c/pointer_offset_from_subtraction_2_global.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_offset_from_subtraction_2_global.parse/framac.ast
@@ -67,8 +67,8 @@ int main(void)
   intptr_t uz = (int)(& z);
   intptr_t uw = (int)(& w);
   intptr_t offsetzw = uw - uz;
-  printf_va_1("Addresses: &x=%i &y=%i offsetxy=%i \n",ux,uy,offsetxy);
-  printf_va_2("Addresses: &z=%i &w=%i offsetzw=%i \n",uz,uw,offsetzw);
+  printf("Addresses: &x=%i &y=%i offsetxy=%i \n",ux,uy,offsetxy); /* printf_va_1 */
+  printf("Addresses: &z=%i &w=%i offsetzw=%i \n",uz,uw,offsetzw); /* printf_va_2 */
   __FC_assert((offsetzw == offsetxy) != 0,
               "pointer_offset_from_subtraction_2_global.c",13,
               "offsetzw==offsetxy");
@@ -77,7 +77,7 @@ int main(void)
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_3("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_3 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/pointer_offset_xor_auto.parse/framac.ast b/cerberus/.frama-c/pointer_offset_xor_auto.parse/framac.ast
index cfc87959bbcb826cdcc53c8e7b1a845531802bcd..8d39f9ef50cde7588465b2ecb0fc81fdc98b8228 100644
--- a/cerberus/.frama-c/pointer_offset_xor_auto.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_offset_xor_auto.parse/framac.ast
@@ -43,7 +43,7 @@ int main(void)
   ;
   ;
   ;
-  printf_va_1("x=%i y=%i *r=%i (r==p)=%s\n",x,y,*r,(char *)tmp);
+  printf("x=%i y=%i *r=%i (r==p)=%s\n",x,y,*r,(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_offset_xor_global.parse/framac.ast b/cerberus/.frama-c/pointer_offset_xor_global.parse/framac.ast
index b6b2f6311b98b02fcfdcf2a16aa63d5cd0d0cfb7..bb43b147073041f62d298d6f5b0b59e97568a870 100644
--- a/cerberus/.frama-c/pointer_offset_xor_global.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_offset_xor_global.parse/framac.ast
@@ -43,7 +43,7 @@ int main(void)
   ;
   ;
   ;
-  printf_va_1("x=%i y=%i *r=%i (r==p)=%s\n",x,y,*r,(char *)tmp);
+  printf("x=%i y=%i *r=%i (r==p)=%s\n",x,y,*r,(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_stability_1.parse/framac.ast b/cerberus/.frama-c/pointer_stability_1.parse/framac.ast
index a96a3930bb275ece69729dcd9338ff0fed9c1e31..f43e8f7186cd1f8fc495256219681097e34c3f67 100644
--- a/cerberus/.frama-c/pointer_stability_1.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_stability_1.parse/framac.ast
@@ -31,7 +31,7 @@ int main(void)
   uintptr_t j = (unsigned int)(& x);
   _Bool b = (_Bool)(i == j);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(i==j)=%s\n",(char *)tmp);
+  printf("(i==j)=%s\n",(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/pointer_stability_2.parse/framac.ast b/cerberus/.frama-c/pointer_stability_2.parse/framac.ast
index 907b80b8c6a537ec0bfb6daa3b8a02bdead5f567..b3a03b956b528c9b734a4a6de84b1968e52cd04f 100644
--- a/cerberus/.frama-c/pointer_stability_2.parse/framac.ast
+++ b/cerberus/.frama-c/pointer_stability_2.parse/framac.ast
@@ -31,7 +31,7 @@ int main(void)
   int *q = & x;
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q)=%s\n",(char *)tmp);
+  printf("(p==q)=%s\n",(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_basic_auto_xy.parse/framac.ast b/cerberus/.frama-c/provenance_basic_auto_xy.parse/framac.ast
index 61e1b8753f7b981bfafe543f92b7018ec5f5294f..f9f7409394ab38647e4ab162e014d4b0b3e6f681 100644
--- a/cerberus/.frama-c/provenance_basic_auto_xy.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_auto_xy.parse/framac.ast
@@ -45,11 +45,11 @@ int main(void)
   int y = 2;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_auto_yx.parse/framac.ast b/cerberus/.frama-c/provenance_basic_auto_yx.parse/framac.ast
index a83ca1aaf343a18e35c43b371cbe115321b024c1..b79b9ca380c60dc3734943f4401fae59af9f7045 100644
--- a/cerberus/.frama-c/provenance_basic_auto_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_auto_yx.parse/framac.ast
@@ -45,11 +45,11 @@ int main(void)
   int x = 1;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_global_xy.parse/framac.ast b/cerberus/.frama-c/provenance_basic_global_xy.parse/framac.ast
index afef853d592b875ba25564f6307852d12afab223..c669ee0cee0f6d4b43dc3bd315643e74197a8104 100644
--- a/cerberus/.frama-c/provenance_basic_global_xy.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_global_xy.parse/framac.ast
@@ -45,11 +45,11 @@ int main(void)
   int tmp;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_global_yx.parse/framac.ast b/cerberus/.frama-c/provenance_basic_global_yx.parse/framac.ast
index 090ee49a80087473857155d33d0abe82060c1f34..9eb4b196d1599c361e2341573db7e6c33051a8fc 100644
--- a/cerberus/.frama-c/provenance_basic_global_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_global_yx.parse/framac.ast
@@ -45,11 +45,11 @@ int main(void)
   int tmp;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_malloc_offset+12.parse/framac.ast b/cerberus/.frama-c/provenance_basic_malloc_offset+12.parse/framac.ast
index 2603b6e8e779491f3f2ee766ac246d65f595e538..612aa8fbed5608ef4bab69c2d806c9b1e221daee 100644
--- a/cerberus/.frama-c/provenance_basic_malloc_offset+12.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_malloc_offset+12.parse/framac.ast
@@ -48,11 +48,11 @@ int main(void)
   *yp = 2;
   int *p = xp + 16;
   int *q = yp;
-  printf_va_1("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q);
+  printf("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q); /* printf_va_1 */
   tmp_1 = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp_1 == 0) {
     *p = 11;
-    printf_va_2("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q);
+    printf("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_malloc_offset+2.parse/framac.ast b/cerberus/.frama-c/provenance_basic_malloc_offset+2.parse/framac.ast
index dfde8a2e4d45d9ddfd5b68f3ca3c63b6645eab6f..904a6e2eeaa9efefc415d447dffd6e9352adaed5 100644
--- a/cerberus/.frama-c/provenance_basic_malloc_offset+2.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_malloc_offset+2.parse/framac.ast
@@ -48,11 +48,11 @@ int main(void)
   *yp = 2;
   int *p = xp + 2;
   int *q = yp;
-  printf_va_1("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q);
+  printf("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q); /* printf_va_1 */
   tmp_1 = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp_1 == 0) {
     *p = 11;
-    printf_va_2("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q);
+    printf("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_malloc_offset+4.parse/framac.ast b/cerberus/.frama-c/provenance_basic_malloc_offset+4.parse/framac.ast
index 2d25a7bcdac29141f2f578ab42f2ed9f61c5cf3e..0dc717e3ea67a13891f13f99b13ab8b4cbd03ba2 100644
--- a/cerberus/.frama-c/provenance_basic_malloc_offset+4.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_malloc_offset+4.parse/framac.ast
@@ -48,11 +48,11 @@ int main(void)
   *yp = 2;
   int *p = xp + 4;
   int *q = yp;
-  printf_va_1("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q);
+  printf("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q); /* printf_va_1 */
   tmp_1 = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp_1 == 0) {
     *p = 11;
-    printf_va_2("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q);
+    printf("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_malloc_offset+8.parse/framac.ast b/cerberus/.frama-c/provenance_basic_malloc_offset+8.parse/framac.ast
index 647792924c1f901032fab7bdfd85fd0dc9fe94b2..5dfe1a642ce09fbe02bf31ee9ba9a3e10eae5e41 100644
--- a/cerberus/.frama-c/provenance_basic_malloc_offset+8.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_malloc_offset+8.parse/framac.ast
@@ -48,11 +48,11 @@ int main(void)
   *yp = 2;
   int *p = xp + 8;
   int *q = yp;
-  printf_va_1("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q);
+  printf("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q); /* printf_va_1 */
   tmp_1 = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp_1 == 0) {
     *p = 11;
-    printf_va_2("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q);
+    printf("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_malloc_offset-4.parse/framac.ast b/cerberus/.frama-c/provenance_basic_malloc_offset-4.parse/framac.ast
index e80841c323c8f6cb624ba056d0aac040cc116b79..4c65073fbca7307332d9e7a6114e44ba328b2e0c 100644
--- a/cerberus/.frama-c/provenance_basic_malloc_offset-4.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_malloc_offset-4.parse/framac.ast
@@ -48,11 +48,11 @@ int main(void)
   *yp = 2;
   int *p = xp - 4;
   int *q = yp;
-  printf_va_1("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q);
+  printf("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q); /* printf_va_1 */
   tmp_1 = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp_1 == 0) {
     *p = 11;
-    printf_va_2("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q);
+    printf("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_mixed_auto.parse/framac.ast b/cerberus/.frama-c/provenance_basic_mixed_auto.parse/framac.ast
index 0d49809498a4de9a9be7e289b24a6e5e1625a18a..d324045ba52d6e49c569e18a34f308cd882fb82e 100644
--- a/cerberus/.frama-c/provenance_basic_mixed_auto.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_mixed_auto.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   intptr_t ux = (int)(& x);
   intptr_t uy = (int)(& y);
   intptr_t offset = 4;
-  printf_va_1("Addresses: &x=%i &y=%i\n",ux,uy);
+  printf("Addresses: &x=%i &y=%i\n",ux,uy); /* printf_va_1 */
   int *q = & y;
   if (q != (int *)0) {
     int tmp;
@@ -53,7 +53,7 @@ int main(void)
     tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
     if (tmp == 0) {
       *p = 11;
-      printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+      printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
     }
   }
   __retres = 0;
diff --git a/cerberus/.frama-c/provenance_basic_mixed_auto_offset+4.parse/framac.ast b/cerberus/.frama-c/provenance_basic_mixed_auto_offset+4.parse/framac.ast
index 0d49809498a4de9a9be7e289b24a6e5e1625a18a..d324045ba52d6e49c569e18a34f308cd882fb82e 100644
--- a/cerberus/.frama-c/provenance_basic_mixed_auto_offset+4.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_mixed_auto_offset+4.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   intptr_t ux = (int)(& x);
   intptr_t uy = (int)(& y);
   intptr_t offset = 4;
-  printf_va_1("Addresses: &x=%i &y=%i\n",ux,uy);
+  printf("Addresses: &x=%i &y=%i\n",ux,uy); /* printf_va_1 */
   int *q = & y;
   if (q != (int *)0) {
     int tmp;
@@ -53,7 +53,7 @@ int main(void)
     tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
     if (tmp == 0) {
       *p = 11;
-      printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+      printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
     }
   }
   __retres = 0;
diff --git a/cerberus/.frama-c/provenance_basic_mixed_auto_offset-4.parse/framac.ast b/cerberus/.frama-c/provenance_basic_mixed_auto_offset-4.parse/framac.ast
index 831fa4b5918503d441a3e3fbd392e82025b40bd2..90e900a4b3cf68d7284063d4445280c6d7a89557 100644
--- a/cerberus/.frama-c/provenance_basic_mixed_auto_offset-4.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_mixed_auto_offset-4.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   intptr_t ux = (int)(& x);
   intptr_t uy = (int)(& y);
   intptr_t offset = -4;
-  printf_va_1("Addresses: &x=%i &y=%i\n",ux,uy);
+  printf("Addresses: &x=%i &y=%i\n",ux,uy); /* printf_va_1 */
   int *q = & y;
   if (q != (int *)0) {
     int tmp;
@@ -53,7 +53,7 @@ int main(void)
     tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
     if (tmp == 0) {
       *p = 11;
-      printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+      printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
     }
   }
   __retres = 0;
diff --git a/cerberus/.frama-c/provenance_basic_mixed_auto_offset-64.parse/framac.ast b/cerberus/.frama-c/provenance_basic_mixed_auto_offset-64.parse/framac.ast
index 0d5de05feefaa896d1b7f17af2045b7b88403e11..0974564612977070aa4395128798f09ff038836f 100644
--- a/cerberus/.frama-c/provenance_basic_mixed_auto_offset-64.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_mixed_auto_offset-64.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   intptr_t ux = (int)(& x);
   intptr_t uy = (int)(& y);
   intptr_t offset = -64;
-  printf_va_1("Addresses: &x=%i &y=%i\n",ux,uy);
+  printf("Addresses: &x=%i &y=%i\n",ux,uy); /* printf_va_1 */
   int *q = & y;
   if (q != (int *)0) {
     int tmp;
@@ -53,7 +53,7 @@ int main(void)
     tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
     if (tmp == 0) {
       *p = 11;
-      printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+      printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
     }
   }
   __retres = 0;
diff --git a/cerberus/.frama-c/provenance_basic_mixed_global_offset+4.parse/framac.ast b/cerberus/.frama-c/provenance_basic_mixed_global_offset+4.parse/framac.ast
index 0d49809498a4de9a9be7e289b24a6e5e1625a18a..d324045ba52d6e49c569e18a34f308cd882fb82e 100644
--- a/cerberus/.frama-c/provenance_basic_mixed_global_offset+4.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_mixed_global_offset+4.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   intptr_t ux = (int)(& x);
   intptr_t uy = (int)(& y);
   intptr_t offset = 4;
-  printf_va_1("Addresses: &x=%i &y=%i\n",ux,uy);
+  printf("Addresses: &x=%i &y=%i\n",ux,uy); /* printf_va_1 */
   int *q = & y;
   if (q != (int *)0) {
     int tmp;
@@ -53,7 +53,7 @@ int main(void)
     tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
     if (tmp == 0) {
       *p = 11;
-      printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+      printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
     }
   }
   __retres = 0;
diff --git a/cerberus/.frama-c/provenance_basic_mixed_global_offset-4.parse/framac.ast b/cerberus/.frama-c/provenance_basic_mixed_global_offset-4.parse/framac.ast
index 831fa4b5918503d441a3e3fbd392e82025b40bd2..90e900a4b3cf68d7284063d4445280c6d7a89557 100644
--- a/cerberus/.frama-c/provenance_basic_mixed_global_offset-4.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_mixed_global_offset-4.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   intptr_t ux = (int)(& x);
   intptr_t uy = (int)(& y);
   intptr_t offset = -4;
-  printf_va_1("Addresses: &x=%i &y=%i\n",ux,uy);
+  printf("Addresses: &x=%i &y=%i\n",ux,uy); /* printf_va_1 */
   int *q = & y;
   if (q != (int *)0) {
     int tmp;
@@ -53,7 +53,7 @@ int main(void)
     tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
     if (tmp == 0) {
       *p = 11;
-      printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+      printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
     }
   }
   __retres = 0;
diff --git a/cerberus/.frama-c/provenance_basic_mixed_global_offset-64.parse/framac.ast b/cerberus/.frama-c/provenance_basic_mixed_global_offset-64.parse/framac.ast
index 0d5de05feefaa896d1b7f17af2045b7b88403e11..0974564612977070aa4395128798f09ff038836f 100644
--- a/cerberus/.frama-c/provenance_basic_mixed_global_offset-64.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_mixed_global_offset-64.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   intptr_t ux = (int)(& x);
   intptr_t uy = (int)(& y);
   intptr_t offset = -64;
-  printf_va_1("Addresses: &x=%i &y=%i\n",ux,uy);
+  printf("Addresses: &x=%i &y=%i\n",ux,uy); /* printf_va_1 */
   int *q = & y;
   if (q != (int *)0) {
     int tmp;
@@ -53,7 +53,7 @@ int main(void)
     tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
     if (tmp == 0) {
       *p = 11;
-      printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+      printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
     }
   }
   __retres = 0;
diff --git a/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_xy.parse/framac.ast b/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_xy.parse/framac.ast
index 7a62cba41d644e73f4bc249440e26db720ec76e8..115f5d716c070db06dd1bdd9d3bd2eec8f89ce16 100644
--- a/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_xy.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_xy.parse/framac.ast
@@ -49,11 +49,11 @@ int main(void)
   intptr_t offset = 4;
   int *p = (int *)(ux + offset);
   int *q = & y;
-  printf_va_1("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy);
+  printf("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_yx.parse/framac.ast b/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_yx.parse/framac.ast
index 5a97bcf843dc10a91306e59391254d0145e4ca87..cb14e11e355c962f289785a8c3bf64286f1f6933 100644
--- a/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_yx.parse/framac.ast
@@ -49,11 +49,11 @@ int main(void)
   intptr_t offset = 4;
   int *p = (int *)(ux + offset);
   int *q = & y;
-  printf_va_1("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy);
+  printf("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_yx_offset-16.parse/framac.ast b/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_yx_offset-16.parse/framac.ast
index 39b1d0cee097ec5b5b39027460117408da2361a5..98472c040739f9350abcb39a5d21b238e17b8376 100644
--- a/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_yx_offset-16.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_using_intptr_t_auto_yx_offset-16.parse/framac.ast
@@ -49,11 +49,11 @@ int main(void)
   intptr_t offset = -16;
   int *p = (int *)(ux + offset);
   int *q = & y;
-  printf_va_1("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy);
+  printf("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_using_intptr_t_global_xy.parse/framac.ast b/cerberus/.frama-c/provenance_basic_using_intptr_t_global_xy.parse/framac.ast
index db71aae31f01aeed551cf5fc74239a191e7ba2d7..f2cb5f81381e1e5d81dd51305a658f24c505c0e2 100644
--- a/cerberus/.frama-c/provenance_basic_using_intptr_t_global_xy.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_using_intptr_t_global_xy.parse/framac.ast
@@ -49,11 +49,11 @@ int main(void)
   intptr_t offset = 4;
   int *p = (int *)(ux + offset);
   int *q = & y;
-  printf_va_1("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy);
+  printf("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_using_intptr_t_global_xy_offset64.parse/framac.ast b/cerberus/.frama-c/provenance_basic_using_intptr_t_global_xy_offset64.parse/framac.ast
index 1a38caf190882204da060b188b8229b44d9bc10b..194856215d5020c131b63951e91448adae40a77b 100644
--- a/cerberus/.frama-c/provenance_basic_using_intptr_t_global_xy_offset64.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_using_intptr_t_global_xy_offset64.parse/framac.ast
@@ -49,11 +49,11 @@ int main(void)
   intptr_t offset = 64;
   int *p = (int *)(ux + offset);
   int *q = & y;
-  printf_va_1("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy);
+  printf("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_using_intptr_t_global_yx.parse/framac.ast b/cerberus/.frama-c/provenance_basic_using_intptr_t_global_yx.parse/framac.ast
index 8b5b711b90add0532869f70e96859c469f58470d..1d01a47abf3ea9299d2089312b84f51f6182d523 100644
--- a/cerberus/.frama-c/provenance_basic_using_intptr_t_global_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_using_intptr_t_global_yx.parse/framac.ast
@@ -49,11 +49,11 @@ int main(void)
   intptr_t offset = 4;
   int *p = (int *)(ux + offset);
   int *q = & y;
-  printf_va_1("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy);
+  printf("Addresses: &x=%i p=%p &y=%i\n",ux,(void *)p,uy); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q);
+    printf("x=%d  y=%d  *p=%d  *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_using_intptr_t_malloc_offset_-16.parse/framac.ast b/cerberus/.frama-c/provenance_basic_using_intptr_t_malloc_offset_-16.parse/framac.ast
index 1a38e8043e12a53d3071eea6cc3ddada7effaa46..aeaeda8ed0cbc9e220dcbacd1f997056311b30c5 100644
--- a/cerberus/.frama-c/provenance_basic_using_intptr_t_malloc_offset_-16.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_using_intptr_t_malloc_offset_-16.parse/framac.ast
@@ -48,11 +48,11 @@ int main(void)
   *yp = 2;
   int *p = (int *)((unsigned int)xp - (unsigned int)16);
   int *q = yp;
-  printf_va_1("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q);
+  printf("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q); /* printf_va_1 */
   tmp_1 = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp_1 == 0) {
     *p = 11;
-    printf_va_2("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q);
+    printf("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_basic_using_intptr_t_malloc_offset_8.parse/framac.ast b/cerberus/.frama-c/provenance_basic_using_intptr_t_malloc_offset_8.parse/framac.ast
index 384cd07b77bc65f7d4faf3c456093647779148f8..ae2b1d8581d048d9f3cfb0949a435d11431a17f9 100644
--- a/cerberus/.frama-c/provenance_basic_using_intptr_t_malloc_offset_8.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_basic_using_intptr_t_malloc_offset_8.parse/framac.ast
@@ -48,11 +48,11 @@ int main(void)
   *yp = 2;
   int *p = (int *)((unsigned int)xp + (unsigned int)8);
   int *q = yp;
-  printf_va_1("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q);
+  printf("Addresses: xp=%p p=%p q=%p\n",(void *)xp,(void *)p,(void *)q); /* printf_va_1 */
   tmp_1 = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp_1 == 0) {
     *p = 11;
-    printf_va_2("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q);
+    printf("*xp=%d *yp=%d *p=%d *q=%d\n",*xp,*yp,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_equality_auto_cu_yx_a.parse/framac.ast b/cerberus/.frama-c/provenance_equality_auto_cu_yx_a.parse/framac.ast
index 94a9d06fc46ac81d5879b5b14c5150a7d2c4fe0d..46f700c999be4da2576285d4927ba4bb1185efb1 100644
--- a/cerberus/.frama-c/provenance_equality_auto_cu_yx_a.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_auto_cu_yx_a.parse/framac.ast
@@ -34,7 +34,7 @@ int main(void)
   int x = 1;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   f(p,q);
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_equality_auto_cu_yx_b.parse/framac.ast b/cerberus/.frama-c/provenance_equality_auto_cu_yx_b.parse/framac.ast
index afc83c5ebc09cf77828ed8a0864e5bd7d379ecff..d97c4d188ea1a3950cda726e31381dccea672d85 100644
--- a/cerberus/.frama-c/provenance_equality_auto_cu_yx_b.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_auto_cu_yx_b.parse/framac.ast
@@ -27,7 +27,7 @@ void main(int *p, int *q)
   char const *tmp;
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   return;
 }
 
diff --git a/cerberus/.frama-c/provenance_equality_auto_fn_yx.parse/framac.ast b/cerberus/.frama-c/provenance_equality_auto_fn_yx.parse/framac.ast
index 306d767f33975cbaa45b8d916b4b3f2049506264..c0a0b886ae4395d75fab918b93bb0e1c8b1cb098 100644
--- a/cerberus/.frama-c/provenance_equality_auto_fn_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_auto_fn_yx.parse/framac.ast
@@ -27,7 +27,7 @@ void f(int *p, int *q)
   char const *tmp;
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   return;
 }
 
@@ -52,7 +52,7 @@ int main(void)
   int x = 1;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_2("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_2 */
   f(p,q);
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_equality_auto_yx.parse/framac.ast b/cerberus/.frama-c/provenance_equality_auto_yx.parse/framac.ast
index e5c59300c434a733ea101fcd18e92b913b8f78c8..c850876a95e281635eab7ada9c2d32f6a1dbccac 100644
--- a/cerberus/.frama-c/provenance_equality_auto_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_auto_yx.parse/framac.ast
@@ -44,10 +44,10 @@ int main(void)
   int x = 1;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_2("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_equality_global_cu_xy_a.parse/framac.ast b/cerberus/.frama-c/provenance_equality_global_cu_xy_a.parse/framac.ast
index 9fed0e30f857079dfaf8460506a62045fc7fd103..5f867c7cd3085be194028d02220f3ad8fd049999 100644
--- a/cerberus/.frama-c/provenance_equality_global_cu_xy_a.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_global_cu_xy_a.parse/framac.ast
@@ -36,7 +36,7 @@ int main(void)
   int __retres;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   f(p,q);
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_equality_global_cu_xy_b.parse/framac.ast b/cerberus/.frama-c/provenance_equality_global_cu_xy_b.parse/framac.ast
index afc83c5ebc09cf77828ed8a0864e5bd7d379ecff..d97c4d188ea1a3950cda726e31381dccea672d85 100644
--- a/cerberus/.frama-c/provenance_equality_global_cu_xy_b.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_global_cu_xy_b.parse/framac.ast
@@ -27,7 +27,7 @@ void main(int *p, int *q)
   char const *tmp;
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   return;
 }
 
diff --git a/cerberus/.frama-c/provenance_equality_global_cu_yx_a.parse/framac.ast b/cerberus/.frama-c/provenance_equality_global_cu_yx_a.parse/framac.ast
index fd15d70308333880cb4f3dd30b01d5399a4f6340..9c53789b03e5bfe873aab580634346e508bfb59a 100644
--- a/cerberus/.frama-c/provenance_equality_global_cu_yx_a.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_global_cu_yx_a.parse/framac.ast
@@ -34,7 +34,7 @@ int main(void)
   int __retres;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   f(p,q);
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_equality_global_cu_yx_b.parse/framac.ast b/cerberus/.frama-c/provenance_equality_global_cu_yx_b.parse/framac.ast
index afc83c5ebc09cf77828ed8a0864e5bd7d379ecff..d97c4d188ea1a3950cda726e31381dccea672d85 100644
--- a/cerberus/.frama-c/provenance_equality_global_cu_yx_b.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_global_cu_yx_b.parse/framac.ast
@@ -27,7 +27,7 @@ void main(int *p, int *q)
   char const *tmp;
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   return;
 }
 
diff --git a/cerberus/.frama-c/provenance_equality_global_fn_xy.parse/framac.ast b/cerberus/.frama-c/provenance_equality_global_fn_xy.parse/framac.ast
index c80dd93c96330db76c66d29524c0c01336fbc110..23d13740da15faca2391bf320ef0785149e8c804 100644
--- a/cerberus/.frama-c/provenance_equality_global_fn_xy.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_global_fn_xy.parse/framac.ast
@@ -29,7 +29,7 @@ void f(int *p, int *q)
   char const *tmp;
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   return;
 }
 
@@ -52,7 +52,7 @@ int main(void)
   int __retres;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_2("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_2 */
   f(p,q);
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_equality_global_fn_yx.parse/framac.ast b/cerberus/.frama-c/provenance_equality_global_fn_yx.parse/framac.ast
index c5c42d2770ec91fda503ba3dd7408d6c3ce4539a..eca396e210837985abdb43f09a3c486f00c56f9a 100644
--- a/cerberus/.frama-c/provenance_equality_global_fn_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_global_fn_yx.parse/framac.ast
@@ -34,7 +34,7 @@ void f(int *p, int *q)
   char const *tmp;
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_1 */
   return;
 }
 
@@ -57,7 +57,7 @@ int main(void)
   int __retres;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_2("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_2 */
   f(p,q);
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_equality_global_xy.parse/framac.ast b/cerberus/.frama-c/provenance_equality_global_xy.parse/framac.ast
index 53d50171250abf0417f03361d768c14231a5122f..f70c248999e99a96c1c39be0c29b281b83c5d72f 100644
--- a/cerberus/.frama-c/provenance_equality_global_xy.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_global_xy.parse/framac.ast
@@ -44,10 +44,10 @@ int main(void)
   char const *tmp;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_2("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_equality_global_yx.parse/framac.ast b/cerberus/.frama-c/provenance_equality_global_yx.parse/framac.ast
index 482319253c8dda79c9d43457d9b550f7fad5c049..7d0cb97e2433736fa893c453a0c4beb0f43198a3 100644
--- a/cerberus/.frama-c/provenance_equality_global_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_global_yx.parse/framac.ast
@@ -44,10 +44,10 @@ int main(void)
   char const *tmp;
   int *p = & x + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_2("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_equality_uintptr_t_global_xy.parse/framac.ast b/cerberus/.frama-c/provenance_equality_uintptr_t_global_xy.parse/framac.ast
index cb616240fad22fad9819ede6dba9e4f36b5181a5..42e1acd4b61916e034cea7929e1231c018e27330 100644
--- a/cerberus/.frama-c/provenance_equality_uintptr_t_global_xy.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_uintptr_t_global_xy.parse/framac.ast
@@ -45,10 +45,10 @@ int main(void)
   char const *tmp;
   uintptr_t p = (unsigned int)(& x + 1);
   uintptr_t q = (unsigned int)(& y);
-  printf_va_1("Addresses: p=%x q=%x\n",p,q);
+  printf("Addresses: p=%x q=%x\n",p,q); /* printf_va_1 */
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_2("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_equality_uintptr_t_global_yx.parse/framac.ast b/cerberus/.frama-c/provenance_equality_uintptr_t_global_yx.parse/framac.ast
index 4aa00523367c14982d5c4d204ddffcbd9d4cdfd2..87b6755e27aac2da94bff65bc8d57d6bbc3f90d2 100644
--- a/cerberus/.frama-c/provenance_equality_uintptr_t_global_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_equality_uintptr_t_global_yx.parse/framac.ast
@@ -45,10 +45,10 @@ int main(void)
   char const *tmp;
   uintptr_t p = (unsigned int)(& x + 1);
   uintptr_t q = (unsigned int)(& y);
-  printf_va_1("Addresses: p=%x q=%x\n",p,q);
+  printf("Addresses: p=%x q=%x\n",p,q); /* printf_va_1 */
   _Bool b = (_Bool)(p == q);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_2("(p==q) = %s\n",(char *)tmp);
+  printf("(p==q) = %s\n",(char *)tmp); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_multiple_1_global.parse/framac.ast b/cerberus/.frama-c/provenance_multiple_1_global.parse/framac.ast
index 475421d06ebc99910bfe97689462414f7ae18334..9639a9f568638572e7c3fafc657df78d4418a664 100644
--- a/cerberus/.frama-c/provenance_multiple_1_global.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_multiple_1_global.parse/framac.ast
@@ -29,7 +29,7 @@ int main(void)
   int __retres;
   int *p = & x[& x[1] - x];
   *p = 11;
-  printf_va_1("x[1]=%d *p=%d\n",x[1],*p);
+  printf("x[1]=%d *p=%d\n",x[1],*p); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_multiple_2_global.parse/framac.ast b/cerberus/.frama-c/provenance_multiple_2_global.parse/framac.ast
index 0aef31b11ab4e9a79f634b684afd62e933739cf4..39fa72680667930279db9e9b7a359349e25b7b86 100644
--- a/cerberus/.frama-c/provenance_multiple_2_global.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_multiple_2_global.parse/framac.ast
@@ -29,7 +29,7 @@ int main(void)
   int __retres;
   int *p = & x[& y[1] - y];
   *p = 11;
-  printf_va_1("x[1]=%d *p=%d\n",x[1],*p);
+  printf("x[1]=%d *p=%d\n",x[1],*p); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_multiple_3_global_yx.parse/framac.ast b/cerberus/.frama-c/provenance_multiple_3_global_yx.parse/framac.ast
index 506527c72d74e86f19ed9d8f4778a176044f68fa..001987f13223a2aa74b3a396a417ae74d15ff824 100644
--- a/cerberus/.frama-c/provenance_multiple_3_global_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_multiple_3_global_yx.parse/framac.ast
@@ -45,11 +45,11 @@ int main(void)
   int tmp;
   int *p = (& x[1] + (& y[1] - & y[1])) + 1;
   int *q = y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("y[0]=%d *p=%d *q=%d\n",y[0],*p,*q);
+    printf("y[0]=%d *p=%d *q=%d\n",y[0],*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_multiple_4_global_yx.parse/framac.ast b/cerberus/.frama-c/provenance_multiple_4_global_yx.parse/framac.ast
index 4a4a2a80893e5a7c3f8c394d2c61e9f33fb981a8..d3b5a1c04eea19317b0252a8e809b5346eb693ae 100644
--- a/cerberus/.frama-c/provenance_multiple_4_global_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_multiple_4_global_yx.parse/framac.ast
@@ -45,11 +45,11 @@ int main(void)
   int tmp;
   int *p = (& x[1] + (& y[1] - y)) + 0;
   int *q = y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("y[0]=%d *p=%d *q=%d\n",y[0],*p,*q);
+    printf("y[0]=%d *p=%d *q=%d\n",y[0],*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_multiple_5_auto.parse/framac.ast b/cerberus/.frama-c/provenance_multiple_5_auto.parse/framac.ast
index ec9f42f19c618afa289bc17771ac1ce49c74ce23..2def482fda4af9f269876c40a1f25f85ae185877 100644
--- a/cerberus/.frama-c/provenance_multiple_5_auto.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_multiple_5_auto.parse/framac.ast
@@ -45,11 +45,11 @@ int main(void)
   int y = 2;
   int *p = (& x + (& y - & y)) + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_multiple_5_global.parse/framac.ast b/cerberus/.frama-c/provenance_multiple_5_global.parse/framac.ast
index 5fed31e15e65b9267eee6245d22459c18a20f62d..e35165033596de43755e6ec4d866c425c61dab5e 100644
--- a/cerberus/.frama-c/provenance_multiple_5_global.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_multiple_5_global.parse/framac.ast
@@ -45,11 +45,11 @@ int main(void)
   int tmp;
   int *p = (& x + (& y - & y)) + 1;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_roundtrip_via_intptr_t.parse/framac.ast b/cerberus/.frama-c/provenance_roundtrip_via_intptr_t.parse/framac.ast
index fdcfd9a1f5714e4f880483e03c7b68eb7234ef2c..490f75164b7ab9ffff5a8c5afe7c25d11248823c 100644
--- a/cerberus/.frama-c/provenance_roundtrip_via_intptr_t.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_roundtrip_via_intptr_t.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   intptr_t i = (int)p;
   int *q = (int *)i;
   *q = 11;
-  printf_va_1("*p=%d  *q=%d\n",*p,*q);
+  printf("*p=%d  *q=%d\n",*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_roundtrip_via_unsigned_long.parse/framac.ast b/cerberus/.frama-c/provenance_roundtrip_via_unsigned_long.parse/framac.ast
index ad2d62ef53d8221b25891ef61a11cedbb0ed3ccc..7dae65c9248e20c68e7ec24be8dc2d56b63c8f8e 100644
--- a/cerberus/.frama-c/provenance_roundtrip_via_unsigned_long.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_roundtrip_via_unsigned_long.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   unsigned long i = (unsigned long)p;
   int *q = (int *)i;
   *q = 11;
-  printf_va_1("*p=%d  *q=%d\n",*p,*q);
+  printf("*p=%d  *q=%d\n",*p,*q); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_tag_bits_via_uintptr_t_1.parse/framac.ast b/cerberus/.frama-c/provenance_tag_bits_via_uintptr_t_1.parse/framac.ast
index 37b2a326c0c47235703659cadc1f906a1fcd191a..9cca31df8c42cb826f0863311353743d32704b90 100644
--- a/cerberus/.frama-c/provenance_tag_bits_via_uintptr_t_1.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_tag_bits_via_uintptr_t_1.parse/framac.ast
@@ -45,7 +45,7 @@ int main(void)
   if (b) tmp = "true"; else tmp = "false";
   ;
   ;
-  printf_va_1("x=%i *r=%i (r==p)=%s\n",x,*r,(char *)tmp);
+  printf("x=%i *r=%i (r==p)=%s\n",x,*r,(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_tag_bits_via_uintptr_t_1_no_assert.parse/framac.ast b/cerberus/.frama-c/provenance_tag_bits_via_uintptr_t_1_no_assert.parse/framac.ast
index c5bae058e5fb850945043a59e9cbb3af7d8ca588..03c10ee5c03c45d31d4143740615366719e04824 100644
--- a/cerberus/.frama-c/provenance_tag_bits_via_uintptr_t_1_no_assert.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_tag_bits_via_uintptr_t_1_no_assert.parse/framac.ast
@@ -43,7 +43,7 @@ int main(void)
   if (b) tmp = "true"; else tmp = "false";
   ;
   ;
-  printf_va_1("x=%i *r=%i (r==p)=%s\n",x,*r,(char *)tmp);
+  printf("x=%i *r=%i (r==p)=%s\n",x,*r,(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_union_punning_1_global.parse/framac.ast b/cerberus/.frama-c/provenance_union_punning_1_global.parse/framac.ast
index 80114284f44dcb6853f57ce9ff53ce49356c451b..7446e3fcdc610c3d57cf3e29d9e741a0e5341c02 100644
--- a/cerberus/.frama-c/provenance_union_punning_1_global.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_union_punning_1_global.parse/framac.ast
@@ -50,9 +50,9 @@ int main(void)
   uintptr_t i = (unsigned int)px;
   u.ui = i;
   int *p = u.p;
-  printf_va_1("Addresses: p=%p &x=%p\n",(void *)p,(void *)(& x));
+  printf("Addresses: p=%p &x=%p\n",(void *)p,(void *)(& x)); /* printf_va_1 */
   *p = 11;
-  printf_va_2("x=%d *p=%d\n",x,*p);
+  printf("x=%d *p=%d\n",x,*p); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_union_punning_2_auto_xy.parse/framac.ast b/cerberus/.frama-c/provenance_union_punning_2_auto_xy.parse/framac.ast
index 99de5807a070e8265662bf532f017525f7ed9810..f54fcd131133fb941bdc6d40b2440e7e5ad7551c 100644
--- a/cerberus/.frama-c/provenance_union_punning_2_auto_xy.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_union_punning_2_auto_xy.parse/framac.ast
@@ -55,11 +55,11 @@ int main(void)
   u.ui = i;
   int *p = u.p;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_union_punning_2_auto_yx.parse/framac.ast b/cerberus/.frama-c/provenance_union_punning_2_auto_yx.parse/framac.ast
index b3c520cd2e7d96d526c0a7bf8ed31260e61b4880..ec4a794c29833dd6cd391970786305c8c2d3a81a 100644
--- a/cerberus/.frama-c/provenance_union_punning_2_auto_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_union_punning_2_auto_yx.parse/framac.ast
@@ -55,11 +55,11 @@ int main(void)
   u.ui = i;
   int *p = u.p;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_union_punning_2_global_xy.parse/framac.ast b/cerberus/.frama-c/provenance_union_punning_2_global_xy.parse/framac.ast
index 99de5807a070e8265662bf532f017525f7ed9810..f54fcd131133fb941bdc6d40b2440e7e5ad7551c 100644
--- a/cerberus/.frama-c/provenance_union_punning_2_global_xy.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_union_punning_2_global_xy.parse/framac.ast
@@ -55,11 +55,11 @@ int main(void)
   u.ui = i;
   int *p = u.p;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_union_punning_2_global_yx.parse/framac.ast b/cerberus/.frama-c/provenance_union_punning_2_global_yx.parse/framac.ast
index 536dda3099630aacd3a35258361357d8e63b37d4..d6730e3cc76fd8c98c1fc11c5f9be67de32df5cd 100644
--- a/cerberus/.frama-c/provenance_union_punning_2_global_yx.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_union_punning_2_global_yx.parse/framac.ast
@@ -55,11 +55,11 @@ int main(void)
   u.ui = i;
   int *p = u.p;
   int *q = & y;
-  printf_va_1("Addresses: p=%p q=%p\n",(void *)p,(void *)q);
+  printf("Addresses: p=%p q=%p\n",(void *)p,(void *)q); /* printf_va_1 */
   tmp = memcmp((void const *)(& p),(void const *)(& q),sizeof(p));
   if (tmp == 0) {
     *p = 11;
-    printf_va_2("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q);
+    printf("x=%d y=%d *p=%d *q=%d\n",x,y,*p,*q); /* printf_va_2 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_via_io_auto.parse/framac.ast b/cerberus/.frama-c/provenance_via_io_auto.parse/framac.ast
index 977c20c612e6fb6b38bf6d8fcd843355606112fd..fbf9f815c8e0c3b04cd586ed5a46544fef9056ff 100644
--- a/cerberus/.frama-c/provenance_via_io_auto.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_via_io_auto.parse/framac.ast
@@ -96,15 +96,15 @@ int main(void)
   uintptr_t i = (unsigned int)p;
   uintptr_t j = (unsigned int)q;
   FILE *f = fopen("pointer_from_int_6.tmp","w+b");
-  printf_va_1("Addresses: i=%u j=%u\n",i,j);
-  fprintf_va_1(f,"%u\n",j);
+  printf("Addresses: i=%u j=%u\n",i,j); /* printf_va_1 */
+  fprintf(f,"%u\n",j); /* fprintf_va_1 */
   rewind(f);
   int n = fscanf_va_1(f,"%u\n",(unsigned int *)(& k));
   if (n == 1) {
     int tmp_1;
     char const *tmp_2;
     char const *tmp_3;
-    printf_va_2("Addresses: k=%u\n",k);
+    printf("Addresses: k=%u\n",k); /* printf_va_2 */
     int *r = (int *)k;
     *r = 12;
     _Bool b1 = (_Bool)(r == q);
@@ -115,8 +115,8 @@ int main(void)
     ;
     ;
     ;
-    printf_va_3("x=%i y=%i *r=%i b1=%s b2=%s\n",x,y,*r,(char *)tmp_3,
-                (char *)tmp_2);
+    printf("x=%i y=%i *r=%i b1=%s b2=%s\n",x,y,*r,(char *)tmp_3,
+           (char *)tmp_2); /* printf_va_3 */
   }
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/provenance_via_io_bytewise_global.parse/framac.ast b/cerberus/.frama-c/provenance_via_io_bytewise_global.parse/framac.ast
index b89b8a5b9cd34cf33701f290eba596857c74d8c0..8d0bc20c22defce08a5e64a1a71a88a947a003ba 100644
--- a/cerberus/.frama-c/provenance_via_io_bytewise_global.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_via_io_bytewise_global.parse/framac.ast
@@ -64,7 +64,7 @@ int main(void)
   char const *tmp_4;
   int *p = & x;
   FILE *f = fopen("provenance_via_io_bytewise_global.tmp","w+b");
-  printf_va_1("Addresses: p=%p\n",(void *)p);
+  printf("Addresses: p=%p\n",(void *)p); /* printf_va_1 */
   tmp_0 = fwrite((void const *)(& p),(unsigned int)1,sizeof(int *),f);
   int nw = (int)tmp_0;
   if ((unsigned int)nw != sizeof(int *)) exit(1);
@@ -72,7 +72,7 @@ int main(void)
   tmp_1 = fread((void *)(& r),(unsigned int)1,sizeof(int *),f);
   int nr = (int)tmp_1;
   if ((unsigned int)nr != sizeof(int *)) exit(1);
-  printf_va_2("Addresses: r=%p\n",(void *)r);
+  printf("Addresses: r=%p\n",(void *)r); /* printf_va_2 */
   *r = 12;
   _Bool b1 = (_Bool)(r == p);
   tmp_2 = memcmp((void const *)(& r),(void const *)(& p),sizeof(r));
@@ -81,7 +81,7 @@ int main(void)
   if (b1) tmp_4 = "true"; else tmp_4 = "false";
   ;
   ;
-  printf_va_3("x=%i *r=%i b1=%s b2=%s\n",x,*r,(char *)tmp_4,(char *)tmp_3);
+  printf("x=%i *r=%i b1=%s b2=%s\n",x,*r,(char *)tmp_4,(char *)tmp_3); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_via_io_global.parse/framac.ast b/cerberus/.frama-c/provenance_via_io_global.parse/framac.ast
index 9cfa41aa11fc8391886eac49ded2f73fa46b3d5c..f43a13fad85dd0ea0353897b68e69d5c41460351 100644
--- a/cerberus/.frama-c/provenance_via_io_global.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_via_io_global.parse/framac.ast
@@ -99,12 +99,12 @@ int main(void)
   uintptr_t i = (unsigned int)p;
   uintptr_t j = (unsigned int)q;
   FILE *f = fopen("provenance_via_io_global.tmp","w+b");
-  printf_va_1("Addresses: i=%u j=%u \n",i,j);
-  fprintf_va_1(f,"%u\n",j);
+  printf("Addresses: i=%u j=%u \n",i,j); /* printf_va_1 */
+  fprintf(f,"%u\n",j); /* fprintf_va_1 */
   rewind(f);
   int n = fscanf_va_1(f,"%u\n",(unsigned int *)(& k));
   if (n != 1) exit(1);
-  printf_va_2("Addresses: k=%u\n",k);
+  printf("Addresses: k=%u\n",k); /* printf_va_2 */
   int *r = (int *)k;
   *r = 12;
   _Bool b1 = (_Bool)(r == q);
@@ -115,8 +115,7 @@ int main(void)
   ;
   ;
   ;
-  printf_va_3("x=%i y=%i *r=%i b1=%s b2=%s\n",x,y,*r,(char *)tmp_3,
-              (char *)tmp_2);
+  printf("x=%i y=%i *r=%i b1=%s b2=%s\n",x,y,*r,(char *)tmp_3,(char *)tmp_2); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_via_io_percentp_global.parse/framac.ast b/cerberus/.frama-c/provenance_via_io_percentp_global.parse/framac.ast
index a418fe81a3278677e63f922116a7893395c2e050..78279db1814a4839780922d1e9d3aa62c39bb2d9 100644
--- a/cerberus/.frama-c/provenance_via_io_percentp_global.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_via_io_percentp_global.parse/framac.ast
@@ -93,13 +93,13 @@ int main(void)
   char const *tmp_3;
   int *p = & x;
   FILE *f = fopen("provenance_via_io_percentp_global.tmp","w+b");
-  printf_va_1("Addresses: p=%p\n",(void *)p);
-  fprintf_va_1(f,"%p\n",(void *)p);
+  printf("Addresses: p=%p\n",(void *)p); /* printf_va_1 */
+  fprintf(f,"%p\n",(void *)p); /* fprintf_va_1 */
   rewind(f);
   int n = fscanf_va_1(f,"%p\n",& rv);
   int *r = (int *)rv;
   if (n != 1) exit(1);
-  printf_va_2("Addresses: r=%p\n",(void *)r);
+  printf("Addresses: r=%p\n",(void *)r); /* printf_va_2 */
   *r = 12;
   _Bool b1 = (_Bool)(r == p);
   tmp_1 = memcmp((void const *)(& r),(void const *)(& p),sizeof(r));
@@ -108,7 +108,7 @@ int main(void)
   if (b1) tmp_3 = "true"; else tmp_3 = "false";
   ;
   ;
-  printf_va_3("x=%i *r=%i b1=%s b2=%s\n",x,*r,(char *)tmp_3,(char *)tmp_2);
+  printf("x=%i *r=%i b1=%s b2=%s\n",x,*r,(char *)tmp_3,(char *)tmp_2); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/provenance_via_io_uintptr_t_global.parse/framac.ast b/cerberus/.frama-c/provenance_via_io_uintptr_t_global.parse/framac.ast
index 3e8a220dc2812c3b1feb64d0b9a049b60130fe7c..4324c577654c885a6bf7ebe135b034d5e081ff68 100644
--- a/cerberus/.frama-c/provenance_via_io_uintptr_t_global.parse/framac.ast
+++ b/cerberus/.frama-c/provenance_via_io_uintptr_t_global.parse/framac.ast
@@ -94,12 +94,12 @@ int main(void)
   int *p = & x;
   uintptr_t i = (unsigned int)p;
   FILE *f = fopen("provenance_via_io_uintptr_t_global.tmp","w+b");
-  printf_va_1("Addresses: i=%u \n",i);
-  fprintf_va_1(f,"%u\n",i);
+  printf("Addresses: i=%u \n",i); /* printf_va_1 */
+  fprintf(f,"%u\n",i); /* fprintf_va_1 */
   rewind(f);
   int n = fscanf_va_1(f,"%u\n",(unsigned int *)(& k));
   if (n != 1) exit(1);
-  printf_va_2("Addresses: k=%u\n",k);
+  printf("Addresses: k=%u\n",k); /* printf_va_2 */
   int *r = (int *)k;
   *r = 12;
   _Bool b1 = (_Bool)(r == p);
@@ -109,7 +109,7 @@ int main(void)
   if (b1) tmp_3 = "true"; else tmp_3 = "false";
   ;
   ;
-  printf_va_3("x=%i *r=%i b1=%s b2=%s\n",x,*r,(char *)tmp_3,(char *)tmp_2);
+  printf("x=%i *r=%i b1=%s b2=%s\n",x,*r,(char *)tmp_3,(char *)tmp_2); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/read_union_same_prefix_visible.parse/framac.ast b/cerberus/.frama-c/read_union_same_prefix_visible.parse/framac.ast
index e9dcccd026ee91c61c8c85ad51dbdf85d47827a2..a75c1139d773520a76420ed2a25dee6620890442 100644
--- a/cerberus/.frama-c/read_union_same_prefix_visible.parse/framac.ast
+++ b/cerberus/.frama-c/read_union_same_prefix_visible.parse/framac.ast
@@ -43,7 +43,7 @@ int main(void)
   int __retres;
   un u = {.m1 = {.i1 = 1, .f1 = (float)1.0, .c1 = (char)'a'}};
   int i = u.m2.i2;
-  printf_va_1("i=%i\n",i);
+  printf("i=%i\n",i); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/read_via_invalid_1.parse/framac.ast b/cerberus/.frama-c/read_via_invalid_1.parse/framac.ast
index 516cf7bfd96ef1f893dd659a7924d0018125b264..433abc49247730d1a68bdc522ae4f7320f040a84 100644
--- a/cerberus/.frama-c/read_via_invalid_1.parse/framac.ast
+++ b/cerberus/.frama-c/read_via_invalid_1.parse/framac.ast
@@ -26,7 +26,7 @@ int main(void)
   int __retres;
   int x;
   x = *((int *)0x654321);
-  printf_va_1("x=%i\n",x);
+  printf("x=%i\n",x); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/signalling_nan_1.parse/framac.ast b/cerberus/.frama-c/signalling_nan_1.parse/framac.ast
index f466552b0176edaf6ad2c665a9d297978d5dd341..cd367439abb2c3e927878e80af59a58b1b698f70 100644
--- a/cerberus/.frama-c/signalling_nan_1.parse/framac.ast
+++ b/cerberus/.frama-c/signalling_nan_1.parse/framac.ast
@@ -79,7 +79,7 @@ int main(void)
   int __retres;
   union a_union u;
   int i;
-  printf_va_1("sizeof(long double)=%ld\n",(long)sizeof(long double));
+  printf("sizeof(long double)=%ld\n",(long)sizeof(long double)); /* printf_va_1 */
   i = 0;
   while (i < 10) {
     u.cs[i] = snan[9 - i];
@@ -87,13 +87,13 @@ int main(void)
   }
   i = 0;
   while (i < 10) {
-    printf_va_2("0x%x ",(unsigned int)((int)u.cs[9 - i]));
+    printf("0x%x ",(unsigned int)((int)u.cs[9 - i])); /* printf_va_2 */
     i ++;
   }
-  printf_va_3("\n");
+  printf("\n"); /* printf_va_3 */
   long double ld = u.ld;
   ld += (long double)1.0;
-  printf_va_4("ld=%Lf\n",ld);
+  printf("ld=%Lf\n",ld); /* printf_va_4 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/struct_initialise_members.parse/framac.ast b/cerberus/.frama-c/struct_initialise_members.parse/framac.ast
index 38a86b8256ee6a2113aa945dbd4ca6aa6b3c88c0..c162e0830c4ae2b70d38549b484c5bf1fdece7a4 100644
--- a/cerberus/.frama-c/struct_initialise_members.parse/framac.ast
+++ b/cerberus/.frama-c/struct_initialise_members.parse/framac.ast
@@ -42,7 +42,7 @@ int main(void)
   st s2;
   f(& s1.c,& s1.f);
   s2 = s1;
-  printf_va_1("s2.c=0x%x  s2.f=%f\n",(unsigned int)((int)s2.c),(double)s2.f);
+  printf("s2.c=0x%x  s2.f=%f\n",(unsigned int)((int)s2.c),(double)s2.f); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/struct_inter_submember_1.parse/framac.ast b/cerberus/.frama-c/struct_inter_submember_1.parse/framac.ast
index 7a6f9ca1c43ea83f77b1daf0706888becd627d9d..245f221935485f30cb184789b8b1b02424d551a4 100644
--- a/cerberus/.frama-c/struct_inter_submember_1.parse/framac.ast
+++ b/cerberus/.frama-c/struct_inter_submember_1.parse/framac.ast
@@ -38,7 +38,7 @@ int main(void)
   d = & s.b[2] - & s.a[0];
   p = & s.a[0] + d;
   *p = 11;
-  printf_va_1("d=%td  s.b[2]=%d  *p=%d\n",d,s.b[2],*p);
+  printf("d=%td  s.b[2]=%d  *p=%d\n",d,s.b[2],*p); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/tkn-1.parse/framac.ast b/cerberus/.frama-c/tkn-1.parse/framac.ast
index 95153a3653254aedb7f192a9471e901d9c0fb3da..f4b014019365623c2a75f0004a77537cc750299a 100644
--- a/cerberus/.frama-c/tkn-1.parse/framac.ast
+++ b/cerberus/.frama-c/tkn-1.parse/framac.ast
@@ -33,7 +33,7 @@ int main(void)
 {
   int __retres;
   a[i] = f();
-  printf_va_1("%i\n",a[0]);
+  printf("%i\n",a[0]); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/tkn-2.parse/framac.ast b/cerberus/.frama-c/tkn-2.parse/framac.ast
index 6434cf5e2fff11883026fec4a2ea76c0b7595f64..ab1ee6c3c21d3bbd5c49c3fa11d704678e7ec0bb 100644
--- a/cerberus/.frama-c/tkn-2.parse/framac.ast
+++ b/cerberus/.frama-c/tkn-2.parse/framac.ast
@@ -60,9 +60,9 @@ int main(void)
   a[0] = (unsigned long)(& a[1]);
   a[1] = (unsigned long)(& a[2]);
   a[2] = (unsigned long)0;
-  printf_va_1("a[0]=%lu a[1]=%lu a[2]=%lu\n",a[0],a[1],a[2]);
+  printf("a[0]=%lu a[1]=%lu a[2]=%lu\n",a[0],a[1],a[2]); /* printf_va_1 */
   b = reverse(a);
-  printf_va_2("a[0]=%lu a[1]=%lu a[2]=%lu b=%lu\n",a[0],a[1],a[2],b);
+  printf("a[0]=%lu a[1]=%lu a[2]=%lu b=%lu\n",a[0],a[1],a[2],b); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/tkn-3-commented.parse/framac.ast b/cerberus/.frama-c/tkn-3-commented.parse/framac.ast
index 572b02f5038b36891b9030519b1043f98f0b5079..469dc1e168498f0243b869966767f2c3284bd264 100644
--- a/cerberus/.frama-c/tkn-3-commented.parse/framac.ast
+++ b/cerberus/.frama-c/tkn-3-commented.parse/framac.ast
@@ -95,12 +95,12 @@ int printf_va_3(char const * __restrict format, void *param0);
 void print_free_list(word_t *p)
 {
   word_t *q = p;
-  printf_va_1("free list: ");
+  printf("free list: "); /* printf_va_1 */
   while (q != (word_t *)0) {
-    printf_va_2("%p ",(void *)q);
+    printf("%p ",(void *)q); /* printf_va_2 */
     q = (word_t *)*q;
   }
-  printf_va_3("%p\n",(void *)q);
+  printf("%p\n",(void *)q); /* printf_va_3 */
   return;
 }
 
@@ -142,7 +142,7 @@ int main(void)
   a = alloc((unsigned long)2048);
   b = alloc((unsigned long)2048);
   c = alloc((unsigned long)65536);
-  printf_va_4("a=%p b=%p c=%p\n",a,b,c);
+  printf("a=%p b=%p c=%p\n",a,b,c); /* printf_va_4 */
   print_free_list(kfree_list);
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/tkn-3.parse/framac.ast b/cerberus/.frama-c/tkn-3.parse/framac.ast
index 7fdad30d9093021462d328cdad69ed22164577ed..2bf1139bb2d9a8261ce884847c844b6ad5e387a2 100644
--- a/cerberus/.frama-c/tkn-3.parse/framac.ast
+++ b/cerberus/.frama-c/tkn-3.parse/framac.ast
@@ -95,12 +95,12 @@ int printf_va_3(char const * __restrict format, void *param0);
 void print_free_list(word_t *p)
 {
   word_t *q = p;
-  printf_va_1("free list: ");
+  printf("free list: "); /* printf_va_1 */
   while (q != (word_t *)0) {
-    printf_va_2("%p ",(void *)q);
+    printf("%p ",(void *)q); /* printf_va_2 */
     q = (word_t *)*q;
   }
-  printf_va_3("%p\n",(void *)q);
+  printf("%p\n",(void *)q); /* printf_va_3 */
   return;
 }
 
@@ -143,7 +143,7 @@ int main(void)
   a = alloc((unsigned long)1024);
   b = alloc((unsigned long)2048);
   c = alloc((unsigned long)65536);
-  printf_va_4("a=%p b=%p c=%p\n",a,b,c);
+  printf("a=%p b=%p c=%p\n",a,b,c); /* printf_va_4 */
   print_free_list(kfree_list);
   __retres = 0;
   return __retres;
diff --git a/cerberus/.frama-c/ubc_addr_null_1.parse/framac.ast b/cerberus/.frama-c/ubc_addr_null_1.parse/framac.ast
index e7610d4518bea6e164c774acdd0d754699819b4b..7a5a13d5391d8ac2081fa404e02b8b94ca77ceed 100644
--- a/cerberus/.frama-c/ubc_addr_null_1.parse/framac.ast
+++ b/cerberus/.frama-c/ubc_addr_null_1.parse/framac.ast
@@ -31,7 +31,7 @@ int main(void)
   int __retres;
   struct s *f = (struct s *)0;
   uint8_t *p = & f->b;
-  printf_va_1("p=%p  offsetof(struct s,b)=0x%zx\n",(void *)p,1U);
+  printf("p=%p  offsetof(struct s,b)=0x%zx\n",(void *)p,1U); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/union_punning_gcc_1.parse/framac.ast b/cerberus/.frama-c/union_punning_gcc_1.parse/framac.ast
index 4e26a9a08715f3a7654c25abf2e67cdddc865edd..4714ce35a93e0244750c73b76c7281a1abf3a04c 100644
--- a/cerberus/.frama-c/union_punning_gcc_1.parse/framac.ast
+++ b/cerberus/.frama-c/union_punning_gcc_1.parse/framac.ast
@@ -31,7 +31,7 @@ int main(void)
   union a_union t;
   t.d = 3.1415;
   int j = t.i;
-  printf_va_1("j=%d\n",j);
+  printf("j=%d\n",j); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/union_punning_gcc_2.parse/framac.ast b/cerberus/.frama-c/union_punning_gcc_2.parse/framac.ast
index eddcc08d40fc9bbfa1d69f87126bd3148be71c10..cf79cd6a691638700ea0d227e7f5015b874ddb49 100644
--- a/cerberus/.frama-c/union_punning_gcc_2.parse/framac.ast
+++ b/cerberus/.frama-c/union_punning_gcc_2.parse/framac.ast
@@ -33,7 +33,7 @@ int main(void)
   t.d = 3.1415;
   ip = & t.i;
   int j = *ip;
-  printf_va_1("j=%d\n",j);
+  printf("j=%d\n",j); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/union_punning_gcc_3.parse/framac.ast b/cerberus/.frama-c/union_punning_gcc_3.parse/framac.ast
index f25e685a620fc327ceb9715e0bb72e44bc99806d..bfca302c83ee9bf8a321f1c57b9fff2a9479d78e 100644
--- a/cerberus/.frama-c/union_punning_gcc_3.parse/framac.ast
+++ b/cerberus/.frama-c/union_punning_gcc_3.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   int __retres;
   double d = 3.1415;
   int j = ((union a_union *)(& d))->i;
-  printf_va_1("j=%d\n",j);
+  printf("j=%d\n",j); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_control_flow_choice.parse/framac.ast b/cerberus/.frama-c/unspecified_value_control_flow_choice.parse/framac.ast
index bf94175316dfafa5df19c23f8f3ca97684964ffc..c02efda5c475bbb1be6560466a9333f1da7c2697 100644
--- a/cerberus/.frama-c/unspecified_value_control_flow_choice.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_control_flow_choice.parse/framac.ast
@@ -37,7 +37,8 @@ int main(void)
   int __retres;
   unsigned char c;
   unsigned char *p = & c;
-  if ((int)c == 'a') printf_va_1("equal\n"); else printf_va_2("nonequal\n");
+  if ((int)c == 'a') printf("equal\n"); /* printf_va_1 */
+  else printf("nonequal\n"); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_library_call_argument.parse/framac.ast b/cerberus/.frama-c/unspecified_value_library_call_argument.parse/framac.ast
index 284aee386be33c2e8b7959cf31eea5f90be0382b..adbf20bbc5a1b8a14153161a5ffb665ad946997c 100644
--- a/cerberus/.frama-c/unspecified_value_library_call_argument.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_library_call_argument.parse/framac.ast
@@ -26,7 +26,7 @@ int main(void)
   int __retres;
   unsigned char c;
   unsigned char *p = & c;
-  printf_va_1("char 0x%x\n",(unsigned int)c);
+  printf("char 0x%x\n",(unsigned int)c); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_representation_bytes_1.parse/framac.ast b/cerberus/.frama-c/unspecified_value_representation_bytes_1.parse/framac.ast
index 4868857b318355ae953848b73eb6804281a5e911..f3e358034f811e8ca893e1ed4eff4b496707f926 100644
--- a/cerberus/.frama-c/unspecified_value_representation_bytes_1.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_representation_bytes_1.parse/framac.ast
@@ -43,8 +43,8 @@ int main(void)
   int __retres;
   int i;
   unsigned char c = *((unsigned char *)(& i));
-  printf_va_1("i=0x%x  c=0x%x\n",(unsigned int)i,(unsigned int)((int)c));
-  printf_va_2("i=0x%x  c=0x%x\n",(unsigned int)i,(unsigned int)((int)c));
+  printf("i=0x%x  c=0x%x\n",(unsigned int)i,(unsigned int)((int)c)); /* printf_va_1 */
+  printf("i=0x%x  c=0x%x\n",(unsigned int)i,(unsigned int)((int)c)); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_representation_bytes_2.parse/framac.ast b/cerberus/.frama-c/unspecified_value_representation_bytes_2.parse/framac.ast
index 7ed9be5004899223074c07f66864f10c05590260..39c9e207af4ac425556e6dcad2fcd6bceb06f452 100644
--- a/cerberus/.frama-c/unspecified_value_representation_bytes_2.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_representation_bytes_2.parse/framac.ast
@@ -64,11 +64,11 @@ int main(void)
 {
   int __retres;
   int i;
-  printf_va_1("i=0x%x\n",(unsigned int)i);
-  printf_va_2("i=0x%x\n",(unsigned int)i);
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_1 */
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_2 */
   *((unsigned char *)(& i) + 1) = (unsigned char)0x22;
-  printf_va_3("i=0x%x\n",(unsigned int)i);
-  printf_va_4("i=0x%x\n",(unsigned int)i);
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_3 */
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_4 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_representation_bytes_3.parse/framac.ast b/cerberus/.frama-c/unspecified_value_representation_bytes_3.parse/framac.ast
index 75837050caa54c537e11db4c0efe6712be58c45e..eb72f38aefaa925170a99a0fd6605ac3c049abd7 100644
--- a/cerberus/.frama-c/unspecified_value_representation_bytes_3.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_representation_bytes_3.parse/framac.ast
@@ -39,8 +39,8 @@ int main(void)
   int __retres;
   int i;
   *((unsigned char *)(& i) + 1) = (unsigned char)0x22;
-  printf_va_1("i=0x%x\n",(unsigned int)i);
-  printf_va_2("i=0x%x\n",(unsigned int)i);
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_1 */
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_2 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_representation_bytes_4.parse/framac.ast b/cerberus/.frama-c/unspecified_value_representation_bytes_4.parse/framac.ast
index 075f304a9a169a7ef0995a5bcc16f1d13fe07d1b..240ba293c04dea044c178475ffa80f887cec9565 100644
--- a/cerberus/.frama-c/unspecified_value_representation_bytes_4.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_representation_bytes_4.parse/framac.ast
@@ -64,12 +64,12 @@ int main(void)
 {
   int __retres;
   int i;
-  printf_va_1("i=0x%x\n",(unsigned int)i);
-  printf_va_2("i=0x%x\n",(unsigned int)i);
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_1 */
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_2 */
   unsigned char *cp = (unsigned char *)(& i);
   *(cp + 1) = (unsigned char)0x22;
-  printf_va_3("*cp=0x%x\n",(unsigned int)((int)*cp));
-  printf_va_4("*cp=0x%x\n",(unsigned int)((int)*cp));
+  printf("*cp=0x%x\n",(unsigned int)((int)*cp)); /* printf_va_3 */
+  printf("*cp=0x%x\n",(unsigned int)((int)*cp)); /* printf_va_4 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_stability.parse/framac.ast b/cerberus/.frama-c/unspecified_value_stability.parse/framac.ast
index e1be7a01f0ef20b28b016c67d48566b536ba7e65..554e08ffb1156412d151b58978e969bc140abe2b 100644
--- a/cerberus/.frama-c/unspecified_value_stability.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_stability.parse/framac.ast
@@ -65,10 +65,10 @@ int main(void)
   int __retres;
   int i;
   int *p = & i;
-  printf_va_1("i=0x%x\n",(unsigned int)i);
-  printf_va_2("i=0x%x\n",(unsigned int)i);
-  printf_va_3("i=0x%x\n",(unsigned int)i);
-  printf_va_4("i=0x%x\n",(unsigned int)i);
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_1 */
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_2 */
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_3 */
+  printf("i=0x%x\n",(unsigned int)i); /* printf_va_4 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_strictness_and_1.parse/framac.ast b/cerberus/.frama-c/unspecified_value_strictness_and_1.parse/framac.ast
index 0a43736442ee176c0178c758f4c40df75f73b4ec..60adab0d95162fea0fd9f743faf5f15a991f48cd 100644
--- a/cerberus/.frama-c/unspecified_value_strictness_and_1.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_strictness_and_1.parse/framac.ast
@@ -30,7 +30,7 @@ int main(void)
   unsigned char *p = & c;
   unsigned char c2 = (unsigned char)((int)c | 1);
   unsigned char c3 = (unsigned char)((int)c2 & 1);
-  printf_va_1("c=%i  c2=%i  c3=%i\n",(int)c,(int)c2,(int)c3);
+  printf("c=%i  c2=%i  c3=%i\n",(int)c,(int)c2,(int)c3); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_strictness_int.parse/framac.ast b/cerberus/.frama-c/unspecified_value_strictness_int.parse/framac.ast
index 6a25fc0a2f762df7259795a66a5f866ff1737603..73af1e981a60011bafef51d9a2eb2a168b1b2eea 100644
--- a/cerberus/.frama-c/unspecified_value_strictness_int.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_strictness_int.parse/framac.ast
@@ -31,7 +31,7 @@ int main(void)
   int j = i - i;
   _Bool b = (_Bool)(j == j);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("b=%s\n",(char *)tmp);
+  printf("b=%s\n",(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_strictness_mod_1.parse/framac.ast b/cerberus/.frama-c/unspecified_value_strictness_mod_1.parse/framac.ast
index 8ddfaff454d83b1a23330e5f0e5fda4920d9e4c2..3f676fb0a32c19ce6a3271e2341c26e58405ffef 100644
--- a/cerberus/.frama-c/unspecified_value_strictness_mod_1.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_strictness_mod_1.parse/framac.ast
@@ -28,7 +28,7 @@ int main(void)
   unsigned char c;
   unsigned char *p = & c;
   unsigned char c2 = (unsigned char)((int)c % 2);
-  printf_va_1("c=%i  c2=%i\n",(int)c,(int)c2);
+  printf("c=%i  c2=%i\n",(int)c,(int)c2); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_strictness_mod_2.parse/framac.ast b/cerberus/.frama-c/unspecified_value_strictness_mod_2.parse/framac.ast
index 9f08fed6bb3f393b2d89719afcfc431f73f730a7..d6de588cfefbca223461927d23a7ba813e2b4dcc 100644
--- a/cerberus/.frama-c/unspecified_value_strictness_mod_2.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_strictness_mod_2.parse/framac.ast
@@ -28,7 +28,7 @@ int main(void)
   unsigned char c;
   unsigned char *p = & c;
   unsigned char c2 = (unsigned char)((int)c % 2 + (1 - (int)c));
-  printf_va_1("c=%i  c2=%i\n",(int)c,(int)c2);
+  printf("c=%i  c2=%i\n",(int)c,(int)c2); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_strictness_unsigned_char.parse/framac.ast b/cerberus/.frama-c/unspecified_value_strictness_unsigned_char.parse/framac.ast
index 5f59cf45451bbaf4797cfe445c30c623a5b84dd5..5715e4113faa44aefc5e0a971f500acee5c94bf8 100644
--- a/cerberus/.frama-c/unspecified_value_strictness_unsigned_char.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_strictness_unsigned_char.parse/framac.ast
@@ -31,7 +31,7 @@ int main(void)
   int j = (int)c - (int)c;
   _Bool b = (_Bool)(j == j);
   if (b) tmp = "true"; else tmp = "false";
-  printf_va_1("b=%s\n",(char *)tmp);
+  printf("b=%s\n",(char *)tmp); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/unspecified_value_struct_copy.parse/framac.ast b/cerberus/.frama-c/unspecified_value_struct_copy.parse/framac.ast
index c11947b905c416c0d7f8200a384e2e4c44e416ca..e310892bfa07aa961406f25bc0b32bdfa456eedd 100644
--- a/cerberus/.frama-c/unspecified_value_struct_copy.parse/framac.ast
+++ b/cerberus/.frama-c/unspecified_value_struct_copy.parse/framac.ast
@@ -33,7 +33,7 @@ int main(void)
   st s2;
   s1.i1 = 1;
   s2 = s1;
-  printf_va_1("s2.i1=%i\n",s2.i1);
+  printf("s2.i1=%i\n",s2.i1); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/cerberus/.frama-c/write_union_same_prefix_visible.parse/framac.ast b/cerberus/.frama-c/write_union_same_prefix_visible.parse/framac.ast
index f504f8ce27b8d5b1d41bba165dd68df0d75dced1..3c4d53e32a8cd58fc170e1590c2e5d32c78c575b 100644
--- a/cerberus/.frama-c/write_union_same_prefix_visible.parse/framac.ast
+++ b/cerberus/.frama-c/write_union_same_prefix_visible.parse/framac.ast
@@ -44,7 +44,7 @@ int main(void)
   int __retres;
   un u = {.m1 = {.i1 = 1, .f1 = (float)1.0, .c1 = (char)'a'}};
   u.m2.i2 = 2;
-  printf_va_1("u.m1.i1=%i  u.m2.i2=%i\n",u.m1.i1,u.m2.i2);
+  printf("u.m1.i1=%i  u.m2.i2=%i\n",u.m1.i1,u.m2.i2); /* printf_va_1 */
   __retres = 0;
   return __retres;
 }
diff --git a/chrony/.frama-c/chrony-ntp-core.parse/framac.ast b/chrony/.frama-c/chrony-ntp-core.parse/framac.ast
index f9b5056686fc09953dfb2a9feba8e0b0969b3605..b5b9c7300aeedd64b5f17df032f86b52828e5fc5 100644
--- a/chrony/.frama-c/chrony-ntp-core.parse/framac.ast
+++ b/chrony/.frama-c/chrony-ntp-core.parse/framac.ast
@@ -896,7 +896,7 @@ int printf_va_1(char const * __restrict format, int param0);
 
 void TST_Fail(int line)
 {
-  printf_va_1("FAIL (on line %d)\n",line);
+  printf("FAIL (on line %d)\n",line); /* printf_va_1 */
   exit(1);
   return;
 }
@@ -962,10 +962,11 @@ int main(int argc, char **argv)
         int tmp;
         tmp = strcmp((char const *)*(argv + i),"-s");
         if (tmp) {
-          _LAND: {
-                   fprintf_va_1(__fc_stderr,"Unknown option\n");
-                   exit(1);
-                 }
+          _LAND:
+          {
+            fprintf(__fc_stderr,"Unknown option\n"); /* fprintf_va_1 */
+            exit(1);
+          }
         }
         else 
           if (i + 1 < argc) {
@@ -983,12 +984,12 @@ int main(int argc, char **argv)
   if (seed) tmp_1 = (long)seed;
   else tmp_1 = tv.tv_sec ^ (long)(tv.tv_usec << 10);
   srandom((unsigned int)tmp_1);
-  printf_va_2("Testing %-30s ",test_name);
+  printf("Testing %-30s ",test_name); /* printf_va_2 */
   fflush(__fc_stdout);
   LOG_Initialise();
   test_unit();
   LOG_Finalise();
-  printf_va_3("PASS\n");
+  printf("PASS\n"); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
@@ -3022,11 +3023,11 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                         }
                                                         else {
                                                           int tmp_16;
-                                                          tmp_16 = sscanf_va_1
+                                                          tmp_16 = sscanf
                                                           ((char const *)line,
                                                            "%d%n",
                                                            & src->params.version,
-                                                           & n);
+                                                           & n); /* sscanf_va_1 */
                                                           if (tmp_16 != 1) {
                                                             __retres = 0;
                                                             goto return_label;
@@ -3035,11 +3036,11 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                       }
                                                       else {
                                                         int tmp_15;
-                                                        tmp_15 = sscanf_va_2
+                                                        tmp_15 = sscanf
                                                         ((char const *)line,
                                                          "%d%n",
                                                          & src->params.presend_minpoll,
-                                                         & n);
+                                                         & n); /* sscanf_va_2 */
                                                         if (tmp_15 != 1) {
                                                           __retres = 0;
                                                           goto return_label;
@@ -3048,11 +3049,11 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                     }
                                                     else {
                                                       int tmp_14;
-                                                      tmp_14 = sscanf_va_3
+                                                      tmp_14 = sscanf
                                                       ((char const *)line,
                                                        "%d%n",
                                                        & src->params.poll_target,
-                                                       & n);
+                                                       & n); /* sscanf_va_3 */
                                                       if (tmp_14 != 1) {
                                                         __retres = 0;
                                                         goto return_label;
@@ -3061,9 +3062,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                   }
                                                   else {
                                                     int tmp_13;
-                                                    tmp_13 = sscanf_va_4
-                                                    ((char const *)line,
-                                                     "%hu%n",& src->port,& n);
+                                                    tmp_13 = sscanf((char const *)line,
+                                                                    "%hu%n",
+                                                                    & src->port,
+                                                                    & n); /* sscanf_va_4 */
                                                     if (tmp_13 != 1) {
                                                       __retres = 0;
                                                       goto return_label;
@@ -3072,10 +3074,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                 }
                                                 else {
                                                   int tmp_12;
-                                                  tmp_12 = sscanf_va_5
-                                                  ((char const *)line,
-                                                   "%lf%n",
-                                                   & src->params.offset,& n);
+                                                  tmp_12 = sscanf((char const *)line,
+                                                                  "%lf%n",
+                                                                  & src->params.offset,
+                                                                  & n); /* sscanf_va_5 */
                                                   if (tmp_12 != 1) {
                                                     __retres = 0;
                                                     goto return_label;
@@ -3084,10 +3086,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                               }
                                               else {
                                                 int tmp_11;
-                                                tmp_11 = sscanf_va_6((char const *)line,
-                                                                    "%d%n",
-                                                                    & src->params.min_stratum,
-                                                                    & n);
+                                                tmp_11 = sscanf((char const *)line,
+                                                                "%d%n",
+                                                                & src->params.min_stratum,
+                                                                & n); /* sscanf_va_6 */
                                                 if (tmp_11 != 1) {
                                                   __retres = 0;
                                                   goto return_label;
@@ -3096,10 +3098,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                             }
                                             else {
                                               int tmp_10;
-                                              tmp_10 = sscanf_va_7((char const *)line,
-                                                                   "%d%n",
-                                                                   & src->params.min_samples,
-                                                                   & n);
+                                              tmp_10 = sscanf((char const *)line,
+                                                              "%d%n",
+                                                              & src->params.min_samples,
+                                                              & n); /* sscanf_va_7 */
                                               if (tmp_10 != 1) {
                                                 __retres = 0;
                                                 goto return_label;
@@ -3108,10 +3110,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                           }
                                           else {
                                             int tmp_9;
-                                            tmp_9 = sscanf_va_8((char const *)line,
-                                                                "%d%n",
-                                                                & src->params.minpoll,
-                                                                & n);
+                                            tmp_9 = sscanf((char const *)line,
+                                                           "%d%n",
+                                                           & src->params.minpoll,
+                                                           & n); /* sscanf_va_8 */
                                             if (tmp_9 != 1) {
                                               __retres = 0;
                                               goto return_label;
@@ -3120,10 +3122,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                         }
                                         else {
                                           int tmp_8;
-                                          tmp_8 = sscanf_va_9((char const *)line,
-                                                              "%lf%n",
-                                                              & src->params.min_delay,
-                                                              & n);
+                                          tmp_8 = sscanf((char const *)line,
+                                                         "%lf%n",
+                                                         & src->params.min_delay,
+                                                         & n); /* sscanf_va_9 */
                                           if (tmp_8 != 1) {
                                             __retres = 0;
                                             goto return_label;
@@ -3132,10 +3134,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                       }
                                       else {
                                         int tmp_7;
-                                        tmp_7 = sscanf_va_10((char const *)line,
-                                                             "%d%n",
-                                                             & src->params.max_sources,
-                                                             & n);
+                                        tmp_7 = sscanf((char const *)line,
+                                                       "%d%n",
+                                                       & src->params.max_sources,
+                                                       & n); /* sscanf_va_10 */
                                         if (tmp_7 != 1) {
                                           __retres = 0;
                                           goto return_label;
@@ -3144,10 +3146,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                     }
                                     else {
                                       int tmp_6;
-                                      tmp_6 = sscanf_va_11((char const *)line,
-                                                           "%d%n",
-                                                           & src->params.max_samples,
-                                                           & n);
+                                      tmp_6 = sscanf((char const *)line,
+                                                     "%d%n",
+                                                     & src->params.max_samples,
+                                                     & n); /* sscanf_va_11 */
                                       if (tmp_6 != 1) {
                                         __retres = 0;
                                         goto return_label;
@@ -3156,10 +3158,8 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                   }
                                   else {
                                     int tmp_5;
-                                    tmp_5 = sscanf_va_12((char const *)line,
-                                                         "%d%n",
-                                                         & src->params.maxpoll,
-                                                         & n);
+                                    tmp_5 = sscanf((char const *)line,"%d%n",
+                                                   & src->params.maxpoll,& n); /* sscanf_va_12 */
                                     if (tmp_5 != 1) {
                                       __retres = 0;
                                       goto return_label;
@@ -3168,10 +3168,9 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                 }
                                 else {
                                   int tmp_4;
-                                  tmp_4 = sscanf_va_13((char const *)line,
-                                                       "%lf%n",
-                                                       & src->params.max_delay_dev_ratio,
-                                                       & n);
+                                  tmp_4 = sscanf((char const *)line,"%lf%n",
+                                                 & src->params.max_delay_dev_ratio,
+                                                 & n); /* sscanf_va_13 */
                                   if (tmp_4 != 1) {
                                     __retres = 0;
                                     goto return_label;
@@ -3180,10 +3179,9 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                               }
                               else {
                                 int tmp_3;
-                                tmp_3 = sscanf_va_14((char const *)line,
-                                                     "%lf%n",
-                                                     & src->params.max_delay_ratio,
-                                                     & n);
+                                tmp_3 = sscanf((char const *)line,"%lf%n",
+                                               & src->params.max_delay_ratio,
+                                               & n); /* sscanf_va_14 */
                                 if (tmp_3 != 1) {
                                   __retres = 0;
                                   goto return_label;
@@ -3192,10 +3190,8 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                             }
                             else {
                               int tmp_2;
-                              tmp_2 = sscanf_va_15((char const *)line,
-                                                   "%lf%n",
-                                                   & src->params.max_delay,
-                                                   & n);
+                              tmp_2 = sscanf((char const *)line,"%lf%n",
+                                             & src->params.max_delay,& n); /* sscanf_va_15 */
                               if (tmp_2 != 1) {
                                 __retres = 0;
                                 goto return_label;
@@ -3204,9 +3200,8 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                           }
                           else {
                             int tmp_1;
-                            tmp_1 = sscanf_va_16((char const *)line,"%d%n",
-                                                 & src->params.filter_length,
-                                                 & n);
+                            tmp_1 = sscanf((char const *)line,"%d%n",
+                                           & src->params.filter_length,& n); /* sscanf_va_16 */
                             if (tmp_1 != 1) {
                               __retres = 0;
                               goto return_label;
@@ -3215,8 +3210,8 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                         }
                         else {
                           int tmp_0;
-                          tmp_0 = sscanf_va_17((char const *)line,"%lf%n",
-                                               & src->params.asymmetry,& n);
+                          tmp_0 = sscanf((char const *)line,"%lf%n",
+                                         & src->params.asymmetry,& n); /* sscanf_va_17 */
                           if (tmp_0 != 1) {
                             __retres = 0;
                             goto return_label;
@@ -3225,9 +3220,9 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                       }
                       else {
                         int tmp;
-                        tmp = sscanf_va_18((char const *)line,"%u%n",
-                                           (unsigned int *)(& src->params.authkey),
-                                           & n);
+                        tmp = sscanf((char const *)line,"%u%n",
+                                     (unsigned int *)(& src->params.authkey),
+                                     & n); /* sscanf_va_18 */
                         if (tmp != 1) {
                           __retres = 0;
                           goto return_label;
@@ -3320,7 +3315,7 @@ int CPS_ParseLocal(char *line, int *stratum, int *orphan, double *distance)
         }
         else {
           int tmp_0;
-          tmp_0 = sscanf_va_19((char const *)line,"%lf%n",distance,& n);
+          tmp_0 = sscanf((char const *)line,"%lf%n",distance,& n); /* sscanf_va_19 */
           if (tmp_0 != 1) {
             __retres = 0;
             goto return_label;
@@ -3334,7 +3329,7 @@ int CPS_ParseLocal(char *line, int *stratum, int *orphan, double *distance)
     }
     else {
       int tmp;
-      tmp = sscanf_va_20((char const *)line,"%d%n",stratum,& n);
+      tmp = sscanf((char const *)line,"%d%n",stratum,& n); /* sscanf_va_20 */
       if (tmp != 1) {
         __retres = 0;
         goto return_label;
@@ -3473,7 +3468,7 @@ int CPS_ParseKey(char *line, uint32_t *id, char const **hash, char **key)
       __retres = 0;
       goto return_label;
     }
-  tmp = sscanf_va_21((char const *)s1,"%u",(unsigned int *)id);
+  tmp = sscanf((char const *)s1,"%u",(unsigned int *)id); /* sscanf_va_21 */
   if (tmp != 1) {
     __retres = 0;
     goto return_label;
@@ -4542,7 +4537,7 @@ static int parse_int(char *line, int *result)
   int __retres;
   int tmp;
   check_number_of_args(line,1);
-  tmp = sscanf_va_22((char const *)line,"%d",result);
+  tmp = sscanf((char const *)line,"%d",result); /* sscanf_va_22 */
   if (tmp != 1) {
     command_parse_error();
     __retres = 0;
@@ -4570,7 +4565,7 @@ static int parse_double(char *line, double *result)
   int __retres;
   int tmp;
   check_number_of_args(line,1);
-  tmp = sscanf_va_23((char const *)line,"%lf",result);
+  tmp = sscanf((char const *)line,"%lf",result); /* sscanf_va_23 */
   if (tmp != 1) {
     command_parse_error();
     __retres = 0;
@@ -4633,7 +4628,7 @@ static void parse_ratelimit(char *line, int *enabled_0, int *interval,
     int tmp_2;
     opt = line;
     line = CPS_SplitWord(line);
-    tmp = sscanf_va_24((char const *)line,"%d%n",& val,& n);
+    tmp = sscanf((char const *)line,"%d%n",& val,& n); /* sscanf_va_24 */
     if (tmp != 1) {
       command_parse_error();
       goto return_label;
@@ -5066,10 +5061,9 @@ static void parse_refclock(char *line)
                                       }
                                       else {
                                         int tmp_13;
-                                        tmp_13 = sscanf_va_25((char const *)line,
-                                                              "%lf%n",
-                                                              & pulse_width,
-                                                              & n);
+                                        tmp_13 = sscanf((char const *)line,
+                                                        "%lf%n",
+                                                        & pulse_width,& n); /* sscanf_va_25 */
                                         if (tmp_13 != 1) break;
                                       }
                                     }
@@ -5080,9 +5074,8 @@ static void parse_refclock(char *line)
                                   }
                                   else {
                                     int tmp_12;
-                                    tmp_12 = sscanf_va_26((char const *)line,
-                                                          "%d%n",& stratum,
-                                                          & n);
+                                    tmp_12 = sscanf((char const *)line,
+                                                    "%d%n",& stratum,& n); /* sscanf_va_26 */
                                     if (tmp_12 != 1) break;
                                     else 
                                       if (stratum >= 16) break;
@@ -5092,17 +5085,15 @@ static void parse_refclock(char *line)
                                 }
                                 else {
                                   int tmp_11;
-                                  tmp_11 = sscanf_va_27((char const *)line,
-                                                        "%lf%n",
-                                                        & max_dispersion,& n);
+                                  tmp_11 = sscanf((char const *)line,"%lf%n",
+                                                  & max_dispersion,& n); /* sscanf_va_27 */
                                   if (tmp_11 != 1) break;
                                 }
                               }
                               else {
                                 int tmp_10;
-                                tmp_10 = sscanf_va_28((char const *)line,
-                                                      "%lf%n",& precision,
-                                                      & n);
+                                tmp_10 = sscanf((char const *)line,"%lf%n",
+                                                & precision,& n); /* sscanf_va_28 */
                                 if (tmp_10 != 1) break;
                               }
                             }
@@ -5113,68 +5104,66 @@ static void parse_refclock(char *line)
                           }
                           else {
                             int tmp_9;
-                            tmp_9 = sscanf_va_29((char const *)line,"%lf%n",
-                                                 & delay,& n);
+                            tmp_9 = sscanf((char const *)line,"%lf%n",
+                                           & delay,& n); /* sscanf_va_29 */
                             if (tmp_9 != 1) break;
                           }
                         }
                         else {
                           int tmp_8;
-                          tmp_8 = sscanf_va_30((char const *)line,"%lf%n",
-                                               & offset,& n);
+                          tmp_8 = sscanf((char const *)line,"%lf%n",& offset,
+                                         & n); /* sscanf_va_30 */
                           if (tmp_8 != 1) break;
                         }
                       }
                       else {
                         int tmp_7;
-                        tmp_7 = sscanf_va_31((char const *)line,"%d%n",
-                                             & max_samples_0,& n);
+                        tmp_7 = sscanf((char const *)line,"%d%n",
+                                       & max_samples_0,& n); /* sscanf_va_31 */
                         if (tmp_7 != 1) break;
                       }
                     }
                     else {
                       int tmp_6;
-                      tmp_6 = sscanf_va_32((char const *)line,"%d%n",
-                                           & max_lock_age,& n);
+                      tmp_6 = sscanf((char const *)line,"%d%n",
+                                     & max_lock_age,& n); /* sscanf_va_32 */
                       if (tmp_6 != 1) break;
                     }
                   }
                   else {
                     int tmp_5;
-                    tmp_5 = sscanf_va_33((char const *)line,"%d%n",
-                                         & min_samples_0,& n);
+                    tmp_5 = sscanf((char const *)line,"%d%n",& min_samples_0,
+                                   & n); /* sscanf_va_33 */
                     if (tmp_5 != 1) break;
                   }
                 }
                 else {
                   int tmp_4;
-                  tmp_4 = sscanf_va_34((char const *)line,"%d%n",& pps_rate,
-                                       & n);
+                  tmp_4 = sscanf((char const *)line,"%d%n",& pps_rate,& n); /* sscanf_va_34 */
                   if (tmp_4 != 1) break;
                 }
               }
               else {
                 int tmp_3;
-                tmp_3 = sscanf_va_35((char const *)line,"%d%n",
-                                     & filter_length,& n);
+                tmp_3 = sscanf((char const *)line,"%d%n",& filter_length,& n); /* sscanf_va_35 */
                 if (tmp_3 != 1) break;
               }
             }
             else {
               int tmp_2;
-              tmp_2 = sscanf_va_36((char const *)line,"%d%n",& dpoll,& n);
+              tmp_2 = sscanf((char const *)line,"%d%n",& dpoll,& n); /* sscanf_va_36 */
               if (tmp_2 != 1) break;
             }
           }
           else {
             int tmp_1;
-            tmp_1 = sscanf_va_37((char const *)line,"%d%n",& poll,& n);
+            tmp_1 = sscanf((char const *)line,"%d%n",& poll,& n); /* sscanf_va_37 */
             if (tmp_1 != 1) break;
           }
         }
         else {
           int tmp_0;
-          tmp_0 = sscanf_va_38((char const *)line,"%4s%n",(char *)(ref),& n);
+          tmp_0 = sscanf((char const *)line,"%4s%n",(char *)(ref),& n); /* sscanf_va_38 */
           if (tmp_0 != 1) break;
           lock_ref_id = ((((unsigned int)ref[0] << 24) | (unsigned int)(
                           (int)ref[1] << 16)) | (unsigned int)((int)ref[2] << 8)) | (unsigned int)ref[3];
@@ -5182,7 +5171,7 @@ static void parse_refclock(char *line)
       }
       else {
         int tmp;
-        tmp = sscanf_va_39((char const *)line,"%4s%n",(char *)(ref),& n);
+        tmp = sscanf((char const *)line,"%4s%n",(char *)(ref),& n); /* sscanf_va_39 */
         if (tmp != 1) break;
         ref_id = ((((unsigned int)ref[0] << 24) | (unsigned int)((int)ref[1] << 16)) | (unsigned int)(
                   (int)ref[2] << 8)) | (unsigned int)ref[3];
@@ -5303,7 +5292,7 @@ static void parse_initstepslew(char *line)
   if (restarted) goto return_label;
   ARR_SetSize(init_sources,(unsigned int)0);
   p = CPS_SplitWord(line);
-  tmp = sscanf_va_40((char const *)line,"%lf",& init_slew_threshold);
+  tmp = sscanf((char const *)line,"%lf",& init_slew_threshold); /* sscanf_va_40 */
   if (tmp != 1) {
     command_parse_error();
     goto return_label;
@@ -5371,7 +5360,7 @@ static void parse_clientloglimit(char *line)
 {
   int tmp;
   check_number_of_args(line,1);
-  tmp = sscanf_va_41((char const *)line,"%lu",& client_log_limit);
+  tmp = sscanf((char const *)line,"%lu",& client_log_limit); /* sscanf_va_41 */
   if (tmp != 1) command_parse_error();
   return;
 }
@@ -5397,8 +5386,7 @@ static void parse_fallbackdrift(char *line)
 {
   int tmp;
   check_number_of_args(line,2);
-  tmp = sscanf_va_42((char const *)line,"%d %d",& fb_drift_min,
-                     & fb_drift_max);
+  tmp = sscanf((char const *)line,"%d %d",& fb_drift_min,& fb_drift_max); /* sscanf_va_42 */
   if (tmp != 2) command_parse_error();
   return;
 }
@@ -5424,8 +5412,8 @@ static void parse_makestep(char *line)
 {
   int tmp;
   check_number_of_args(line,2);
-  tmp = sscanf_va_43((char const *)line,"%lf %d",& make_step_threshold,
-                     & make_step_limit);
+  tmp = sscanf((char const *)line,"%lf %d",& make_step_threshold,
+               & make_step_limit); /* sscanf_va_43 */
   if (tmp != 2) {
     make_step_limit = 0;
     command_parse_error();
@@ -5460,8 +5448,8 @@ static void parse_maxchange(char *line)
 {
   int tmp;
   check_number_of_args(line,3);
-  tmp = sscanf_va_44((char const *)line,"%lf %d %d",& max_offset,
-                     & max_offset_delay,& max_offset_ignore);
+  tmp = sscanf((char const *)line,"%lf %d %d",& max_offset,
+               & max_offset_delay,& max_offset_ignore); /* sscanf_va_44 */
   if (tmp != 3) {
     max_offset_delay = -1;
     command_parse_error();
@@ -5490,7 +5478,7 @@ static void parse_mailonchange(char *line)
   address = line;
   line = CPS_SplitWord(line);
   free((void *)mail_user_on_change);
-  tmp = sscanf_va_45((char const *)line,"%lf",& mail_change_threshold);
+  tmp = sscanf((char const *)line,"%lf",& mail_change_threshold); /* sscanf_va_45 */
   if (tmp == 1) mail_user_on_change = Strdup((char const *)address);
   else {
     mail_user_on_change = (char *)0;
@@ -5574,7 +5562,7 @@ static void parse_allow_deny(char *line, ARR_Instance restrictions, int allow)
     if (tmp_4) goto _LOR;
     else {
       int tmp_5;
-      tmp_5 = sscanf_va_46((char const *)p,"%lu.%lu.%lu.%lu",& a,& b,& c,& d);
+      tmp_5 = sscanf((char const *)p,"%lu.%lu.%lu.%lu",& a,& b,& c,& d); /* sscanf_va_46 */
       n = (unsigned long)tmp_5;
       if (n >= (unsigned long)1) {
         _LOR:
@@ -5619,8 +5607,8 @@ static void parse_allow_deny(char *line, ARR_Instance restrictions, int allow)
           if (slashpos) {
             int specified_subnet_bits;
             int n_0;
-            n_0 = sscanf_va_47((char const *)(slashpos + 1),"%d",
-                               & specified_subnet_bits);
+            n_0 = sscanf((char const *)(slashpos + 1),"%d",
+                         & specified_subnet_bits); /* sscanf_va_47 */
             if (n_0 == 1) new_node->subnet_bits = specified_subnet_bits;
             else command_parse_error();
           }
@@ -5736,7 +5724,7 @@ static void parse_broadcast(char *line)
   int tmp_0;
   p = line;
   line = CPS_SplitWord(line);
-  tmp = sscanf_va_48((char const *)p,"%d",& interval);
+  tmp = sscanf((char const *)p,"%d",& interval); /* sscanf_va_48 */
   if (tmp != 1) {
     command_parse_error();
     goto return_label;
@@ -5752,7 +5740,7 @@ static void parse_broadcast(char *line)
   line = CPS_SplitWord(line);
   if (*p) {
     int tmp_1;
-    tmp_1 = sscanf_va_49((char const *)p,"%d",& port);
+    tmp_1 = sscanf((char const *)p,"%d",& port); /* sscanf_va_49 */
     if (tmp_1 != 1) goto _LOR;
     else 
       if (*line) {
@@ -5794,8 +5782,8 @@ static void parse_smoothtime(char *line)
   char *tmp_1;
   tmp = get_number_of_args(line);
   if (tmp != 3) check_number_of_args(line,2);
-  tmp_0 = sscanf_va_50((char const *)line,"%lf %lf",& smooth_max_freq,
-                       & smooth_max_wander);
+  tmp_0 = sscanf((char const *)line,"%lf %lf",& smooth_max_freq,
+                 & smooth_max_wander); /* sscanf_va_50 */
   if (tmp_0 != 2) {
     smooth_max_freq = 0.0;
     command_parse_error();
@@ -5872,7 +5860,7 @@ static void parse_tempcomp(char *line)
   if (point_form) {
     int tmp_0;
     char *tmp_1;
-    tmp_0 = sscanf_va_51((char const *)line,"%lf",& tempcomp_interval);
+    tmp_0 = sscanf((char const *)line,"%lf",& tempcomp_interval); /* sscanf_va_51 */
     if (tmp_0 != 1) {
       command_parse_error();
       goto return_label;
@@ -5882,9 +5870,9 @@ static void parse_tempcomp(char *line)
   }
   else {
     int tmp_2;
-    tmp_2 = sscanf_va_52((char const *)line,"%lf %lf %lf %lf %lf",
-                         & tempcomp_interval,& tempcomp_T0,& tempcomp_k0,
-                         & tempcomp_k1,& tempcomp_k2);
+    tmp_2 = sscanf((char const *)line,"%lf %lf %lf %lf %lf",
+                   & tempcomp_interval,& tempcomp_T0,& tempcomp_k0,
+                   & tempcomp_k1,& tempcomp_k2); /* sscanf_va_52 */
     if (tmp_2 != 5) {
       command_parse_error();
       goto return_label;
@@ -6071,8 +6059,7 @@ static void parse_hwtimestamp(char *line)
                   else {
                     int tmp_5;
                     int tmp_8;
-                    tmp_5 = sscanf_va_53((char const *)line,"%4s%n",filter,
-                                         & n);
+                    tmp_5 = sscanf((char const *)line,"%4s%n",filter,& n); /* sscanf_va_53 */
                     if (tmp_5 != 1) break;
                     tmp_8 = strcasecmp((char const *)(filter),"none");
                     if (tmp_8) {
@@ -6091,43 +6078,41 @@ static void parse_hwtimestamp(char *line)
                 }
                 else {
                   int tmp_4;
-                  tmp_4 = sscanf_va_54((char const *)line,"%lf%n",
-                                       & iface->tx_comp,& n);
+                  tmp_4 = sscanf((char const *)line,"%lf%n",& iface->tx_comp,
+                                 & n); /* sscanf_va_54 */
                   if (tmp_4 != 1) break;
                 }
               }
               else {
                 int tmp_3;
-                tmp_3 = sscanf_va_55((char const *)line,"%lf%n",
-                                     & iface->rx_comp,& n);
+                tmp_3 = sscanf((char const *)line,"%lf%n",& iface->rx_comp,
+                               & n); /* sscanf_va_55 */
                 if (tmp_3 != 1) break;
               }
             }
             else {
               int tmp_2;
-              tmp_2 = sscanf_va_56((char const *)line,"%lf%n",
-                                   & iface->precision,& n);
+              tmp_2 = sscanf((char const *)line,"%lf%n",& iface->precision,
+                             & n); /* sscanf_va_56 */
               if (tmp_2 != 1) break;
             }
           }
           else {
             int tmp_1;
-            tmp_1 = sscanf_va_57((char const *)line,"%d%n",
-                                 & iface->min_samples,& n);
+            tmp_1 = sscanf((char const *)line,"%d%n",& iface->min_samples,
+                           & n); /* sscanf_va_57 */
             if (tmp_1 != 1) break;
           }
         }
         else {
           int tmp_0;
-          tmp_0 = sscanf_va_58((char const *)line,"%d%n",& iface->minpoll,
-                               & n);
+          tmp_0 = sscanf((char const *)line,"%d%n",& iface->minpoll,& n); /* sscanf_va_58 */
           if (tmp_0 != 1) break;
         }
       }
       else {
         int tmp;
-        tmp = sscanf_va_59((char const *)line,"%d%n",& iface->max_samples,
-                           & n);
+        tmp = sscanf((char const *)line,"%d%n",& iface->max_samples,& n); /* sscanf_va_59 */
         if (tmp != 1) break;
       }
     }
@@ -8412,7 +8397,7 @@ int DNS_IPAddress2Name(IPAddr *ip_addr, char *name, int len)
   }
   if (host) result = host->h_name;
   if (result == (char *)0) result = UTI_IPToString(ip_addr);
-  tmp = snprintf_va_1(name,(unsigned long)len,"%s",result);
+  tmp = snprintf(name,(unsigned long)len,"%s",result); /* snprintf_va_1 */
   ;
   if (tmp >= len) {
     __retres = 0;
@@ -8524,7 +8509,7 @@ static int prepare_socket(int family, int port_number, int client_only)
   UTI_FdSetCloexec(sock_fd);
   if (! client_only) {
     int tmp_4;
-    tmp_4 = __va_fcntl_int(sock_fd,4,0x800);
+    tmp_4 = fcntl(sock_fd,4,0x800); /* __va_fcntl_int */
     if (tmp_4) ;
   }
   memset((void *)(& my_addr),0,sizeof(my_addr));
@@ -9154,7 +9139,7 @@ void REF_Initialise(void)
     in = fopen((char const *)drift_file_0,"r");
     if (in) {
       int tmp;
-      tmp = fscanf_va_1(in,"%lf%lf",& file_freq_ppm,& file_skew_ppm);
+      tmp = fscanf(in,"%lf%lf",& file_freq_ppm,& file_skew_ppm); /* fscanf_va_1 */
       if (tmp == 2) {
         our_frequency_ppm = file_freq_ppm;
         our_skew = 1.0e-6 * file_skew_ppm;
@@ -9351,7 +9336,7 @@ static void update_drift_file(double freq_ppm, double skew)
     }
     goto return_label;
   }
-  r1 = fprintf_va_2(out,"%20.6f %20.6f\n",freq_ppm,1.0e6 * skew);
+  r1 = fprintf(out,"%20.6f %20.6f\n",freq_ppm,1.0e6 * skew); /* fprintf_va_2 */
   r2 = fclose(out);
   if (r1 < 0) goto _LOR;
   else 
@@ -9569,18 +9554,17 @@ static void maybe_log_offset(double offset, time_t now)
   }
   if (do_mail_change) 
     if (abs_offset > mail_change_threshold_0) {
-      snprintf_va_2(buffer,sizeof(buffer),"%s -t",
-                    (char *)"/usr/lib/sendmail");
+      snprintf(buffer,sizeof(buffer),"%s -t",(char *)"/usr/lib/sendmail"); /* snprintf_va_2 */
       p = popen((char const *)(buffer),"w");
       if (p) {
         int tmp;
         tmp = gethostname(host,sizeof(host));
         if (tmp < 0) strcpy(host,"<UNKNOWN>");
         host[sizeof(host) - (unsigned long)1] = (char)'\000';
-        fprintf_va_3(p,"To: %s\n",mail_change_user);
-        fprintf_va_4(p,
-                     "Subject: chronyd reports change to system clock on node [%s]\n",
-                     host);
+        fprintf(p,"To: %s\n",mail_change_user); /* fprintf_va_3 */
+        fprintf(p,
+                "Subject: chronyd reports change to system clock on node [%s]\n",
+                host); /* fprintf_va_4 */
         fputs("\n",p);
         tm = localtime((time_t const *)(& now));
         if (tm) {
@@ -9589,9 +9573,9 @@ static void maybe_log_offset(double offset, time_t now)
                    (struct tm const *)tm);
           fputs((char const *)(buffer),p);
         }
-        fprintf_va_5(p,
-                     "\n\nchronyd started to apply an adjustment of %.3f seconds to it,\n  which exceeded the reporting threshold of %.3f seconds\n\n",
-                     - offset,mail_change_threshold_0);
+        fprintf(p,
+                "\n\nchronyd started to apply an adjustment of %.3f seconds to it,\n  which exceeded the reporting threshold of %.3f seconds\n\n",
+                - offset,mail_change_threshold_0); /* fprintf_va_5 */
         pclose(p);
       }
       else {
@@ -13130,16 +13114,15 @@ static FILE *open_dumpfile(SRC_Instance inst, char const *mode_0)
     char *tmp;
     tmp = source_to_string(inst);
     ;
-    tmp_0 = snprintf_va_3(filename,sizeof(filename),"%s/%s.dat",dumpdir_0,
-                          tmp);
+    tmp_0 = snprintf(filename,sizeof(filename),"%s/%s.dat",dumpdir_0,tmp); /* snprintf_va_3 */
     if ((unsigned long)tmp_0 >= sizeof(filename)) goto _LOR; else goto _LAND;
   }
   else {
     _LAND: ;
     if (inst->type != (unsigned int)SRC_NTP) {
       int tmp_1;
-      tmp_1 = snprintf_va_4(filename,sizeof(filename),"%s/refid:%08x.dat",
-                            dumpdir_0,inst->ref_id);
+      tmp_1 = snprintf(filename,sizeof(filename),"%s/refid:%08x.dat",
+                       dumpdir_0,inst->ref_id); /* snprintf_va_4 */
       if ((unsigned long)tmp_1 >= sizeof(filename)) {
         _LOR:
         {
@@ -13269,7 +13252,7 @@ void SRC_RemoveDumpFiles(void)
   if ((int)*(dumpdir_0 + 0) == '\000') goto return_label;
   else {
     int tmp;
-    tmp = snprintf_va_5(pattern,sizeof(pattern),"%s/*.dat",dumpdir_0);
+    tmp = snprintf(pattern,sizeof(pattern),"%s/*.dat",dumpdir_0); /* snprintf_va_5 */
     if ((unsigned long)tmp >= sizeof(pattern)) goto return_label;
   }
   tmp_0 = glob((char const *)(pattern),0,
@@ -13285,7 +13268,7 @@ void SRC_RemoveDumpFiles(void)
       if (! s) goto __Cont;
       else {
         int tmp_1;
-        tmp_1 = snprintf_va_6(name,sizeof(name),"%s",s + 1);
+        tmp_1 = snprintf(name,sizeof(name),"%s",s + 1); /* snprintf_va_6 */
         if ((unsigned long)tmp_1 >= sizeof(name)) goto __Cont;
       }
       tmp_2 = strlen((char const *)(name));
@@ -14129,20 +14112,20 @@ void SST_SaveToFile(SST_Stats inst, FILE *out)
   int m;
   int i;
   int j;
-  fprintf_va_6(out,"%d\n",inst->n_samples);
+  fprintf(out,"%d\n",inst->n_samples); /* fprintf_va_6 */
   m = 0;
   while (m < inst->n_samples) {
     i = get_runsbuf_index(inst,m);
     j = get_buf_index(inst,m);
-    fprintf_va_7(out,"%08lx %08lx %.6e %.6e %.6e %.6e %.6e %.6e %.6e %d\n",
-                 (unsigned long)inst->sample_times[i].tv_sec,
-                 (unsigned long)inst->sample_times[i].tv_nsec / (unsigned long)1000,
-                 inst->offsets[i],inst->orig_offsets[j],inst->peer_delays[i],
-                 inst->peer_dispersions[j],inst->root_delays[j],
-                 inst->root_dispersions[j],1.0,inst->stratum);
+    fprintf(out,"%08lx %08lx %.6e %.6e %.6e %.6e %.6e %.6e %.6e %d\n",
+            (unsigned long)inst->sample_times[i].tv_sec,
+            (unsigned long)inst->sample_times[i].tv_nsec / (unsigned long)1000,
+            inst->offsets[i],inst->orig_offsets[j],inst->peer_delays[i],
+            inst->peer_dispersions[j],inst->root_delays[j],
+            inst->root_dispersions[j],1.0,inst->stratum); /* fprintf_va_7 */
     m ++;
   }
-  fprintf_va_8(out,"%d\n",inst->asymmetry_run);
+  fprintf(out,"%d\n",inst->asymmetry_run); /* fprintf_va_8 */
   return;
 }
 
@@ -14238,7 +14221,7 @@ int SST_LoadFromFile(SST_Stats inst, FILE *in)
   tmp_3 = fgets(line,(int)sizeof(line),in);
   if (tmp_3) {
     int tmp_4;
-    tmp_4 = sscanf_va_60((char const *)(line),"%d",& inst->n_samples);
+    tmp_4 = sscanf((char const *)(line),"%d",& inst->n_samples); /* sscanf_va_60 */
     if (tmp_4 == 1) {
       if (inst->n_samples >= 0) {
         if (inst->n_samples <= 64) {
@@ -14250,16 +14233,15 @@ int SST_LoadFromFile(SST_Stats inst, FILE *in)
               tmp = fgets(line,(int)sizeof(line),in);
               if (tmp) {
                 int tmp_0;
-                tmp_0 = sscanf_va_61((char const *)(line),
-                                     "%lx%lx%lf%lf%lf%lf%lf%lf%lf%d\n",
-                                     (unsigned long *)(& sec),& usec,
-                                     & inst->offsets[i],
-                                     & inst->orig_offsets[i],
-                                     & inst->peer_delays[i],
-                                     & inst->peer_dispersions[i],
-                                     & inst->root_delays[i],
-                                     & inst->root_dispersions[i],& weight,
-                                     & inst->stratum);
+                tmp_0 = sscanf((char const *)(line),
+                               "%lx%lx%lf%lf%lf%lf%lf%lf%lf%d\n",
+                               (unsigned long *)(& sec),& usec,
+                               & inst->offsets[i],& inst->orig_offsets[i],
+                               & inst->peer_delays[i],
+                               & inst->peer_dispersions[i],
+                               & inst->root_delays[i],
+                               & inst->root_dispersions[i],& weight,
+                               & inst->stratum); /* sscanf_va_61 */
                 if (tmp_0 != 10) {
                   _LOR:
                   {
@@ -14281,8 +14263,7 @@ int SST_LoadFromFile(SST_Stats inst, FILE *in)
           tmp_1 = fgets(line,(int)sizeof(line),in);
           if (tmp_1) {
             int tmp_2;
-            tmp_2 = sscanf_va_62((char const *)(line),"%d\n",
-                                 & inst->asymmetry_run);
+            tmp_2 = sscanf((char const *)(line),"%d\n",& inst->asymmetry_run); /* sscanf_va_62 */
             if (tmp_2 != 1) inst->asymmetry_run = 0;
           }
           else inst->asymmetry_run = 0;
@@ -14592,8 +14573,8 @@ char *UTI_TimespecToString(struct timespec *ts)
   char *result;
   pool_ptr = (pool_ptr + 1) % 16;
   result = buffer_pool[pool_ptr];
-  snprintf_va_7(result,(unsigned long)64,"%ld.%09lu",ts->tv_sec,
-                (unsigned long)ts->tv_nsec);
+  snprintf(result,(unsigned long)64,"%ld.%09lu",ts->tv_sec,
+           (unsigned long)ts->tv_nsec); /* snprintf_va_7 */
   return result;
 }
 
@@ -14705,27 +14686,29 @@ char *UTI_IPToString(IPAddr *addr)
   pool_ptr = (pool_ptr + 1) % 16;
   result = buffer_pool[pool_ptr];
   switch ((int)addr->family) {
-    case 0: snprintf_va_8(result,(unsigned long)64,"[UNSPEC]");
+    case 0:
+    snprintf(result,(unsigned long)64,"[UNSPEC]"); /* snprintf_va_8 */
     break;
     case 1: ip = (unsigned long)addr->addr.in4;
     a = (ip >> 24) & (unsigned long)0xff;
     b = (ip >> 16) & (unsigned long)0xff;
     c = (ip >> 8) & (unsigned long)0xff;
     d = (ip >> 0) & (unsigned long)0xff;
-    snprintf_va_9(result,(unsigned long)64,"%lu.%lu.%lu.%lu",a,b,c,d);
+    snprintf(result,(unsigned long)64,"%lu.%lu.%lu.%lu",a,b,c,d); /* snprintf_va_9 */
     break;
     case 2: ip6 = addr->addr.in6;
     __FC_assert((64 >= 40) != 0,"util.c",308,"BUFFER_LENGTH >= 40");
     a = (unsigned long)0;
     while (a < (unsigned long)8) {
-      snprintf_va_10(result + a * (unsigned long)5,
-                     (unsigned long)40 - a * (unsigned long)5,"%04x:",
-                     (unsigned int)(((int)*(ip6 + (unsigned long)2 * a) << 8) | (int)*(
-                                    ip6 + ((unsigned long)2 * a + (unsigned long)1))));
+      snprintf(result + a * (unsigned long)5,
+               (unsigned long)40 - a * (unsigned long)5,"%04x:",
+               (unsigned int)(((int)*(ip6 + (unsigned long)2 * a) << 8) | (int)*(
+                              ip6 + ((unsigned long)2 * a + (unsigned long)1)))); /* snprintf_va_10 */
       a ++;
     }
     break;
-    default: snprintf_va_11(result,(unsigned long)64,"[UNKNOWN]");
+    default:
+    snprintf(result,(unsigned long)64,"[UNKNOWN]"); /* snprintf_va_11 */
   }
   return result;
 }
@@ -14765,7 +14748,7 @@ int UTI_StringToIP(char const *addr, IPAddr *ip)
   unsigned long d;
   unsigned long n;
   int tmp;
-  tmp = sscanf_va_63(addr,"%lu.%lu.%lu.%lu",& a,& b,& c,& d);
+  tmp = sscanf(addr,"%lu.%lu.%lu.%lu",& a,& b,& c,& d); /* sscanf_va_63 */
   n = (unsigned long)tmp;
   if (n == (unsigned long)4) {
     ip->family = (unsigned short)1;
@@ -15017,14 +15000,15 @@ char *UTI_SockaddrToString(struct sockaddr *sa)
     ;
     tmp = UTI_IPToString(& ip);
     ;
-    snprintf_va_12(result,(unsigned long)64,"%s:%hu",tmp,(int)port);
+    snprintf(result,(unsigned long)64,"%s:%hu",tmp,(int)port); /* snprintf_va_12 */
     break;
     case 1: sun_path = ((struct sockaddr_un *)sa)->sun_path;
-    snprintf_va_13(result,(unsigned long)64,"%.*s",64 - 1,sun_path);
+    snprintf(result,(unsigned long)64,"%.*s",64 - 1,sun_path); /* snprintf_va_13 */
     tmp_0 = strlen((char const *)sun_path);
     if (tmp_0 >= (size_t)64) *(result + (64 - 2)) = (char)'>';
     break;
-    default: snprintf_va_14(result,(unsigned long)64,"[UNKNOWN]");
+    default:
+    snprintf(result,(unsigned long)64,"[UNKNOWN]"); /* snprintf_va_14 */
   }
   return result;
 }
@@ -15068,7 +15052,7 @@ char *UTI_TimeToLogForm(time_t t)
   stm = gmtime((time_t const *)(& t));
   if (stm) strftime(result,(unsigned long)64,"%Y-%m-%d %H:%M:%S",
                     (struct tm const *)stm);
-  else snprintf_va_15(result,(unsigned long)64,"INVALID    INVALID ");
+  else snprintf(result,(unsigned long)64,"INVALID    INVALID "); /* snprintf_va_15 */
   return result;
 }
 
@@ -15420,12 +15404,12 @@ int UTI_FdSetCloexec(int fd)
 {
   int __retres;
   int flags;
-  flags = __va_fcntl_void(fd,1);
+  flags = fcntl(fd,1); /* __va_fcntl_void */
   if (flags != -1) {
     int tmp_0;
     int tmp;
     flags |= 1;
-    tmp = __va_fcntl_int(fd,2,flags);
+    tmp = fcntl(fd,2,flags); /* __va_fcntl_int */
     if (tmp) tmp_0 = 0; else tmp_0 = 1;
     __retres = tmp_0;
     goto return_label;
@@ -15544,8 +15528,7 @@ char *UTI_PathToDir(char const *path)
     goto return_label;
   }
   dir = (char *)Malloc((unsigned long)((slash - path) + (long)1));
-  snprintf_va_16(dir,(unsigned long)((slash - path) + (long)1),"%s",
-                 (char *)path);
+  snprintf(dir,(unsigned long)((slash - path) + (long)1),"%s",(char *)path); /* snprintf_va_16 */
   __retres = dir;
   return_label: return __retres;
 }
diff --git a/chrony/.frama-c/chrony-regress.parse/framac.ast b/chrony/.frama-c/chrony-regress.parse/framac.ast
index 2303f6bb3ac9a6b5facf97c1356c782a74bb9ab6..d9922359bfd0c90e7ab1933ada9ef522c2efaf3c 100644
--- a/chrony/.frama-c/chrony-regress.parse/framac.ast
+++ b/chrony/.frama-c/chrony-regress.parse/framac.ast
@@ -786,7 +786,7 @@ int printf_va_1(char const * __restrict format, int param0);
 
 void TST_Fail(int line)
 {
-  printf_va_1("FAIL (on line %d)\n",line);
+  printf("FAIL (on line %d)\n",line); /* printf_va_1 */
   exit(1);
   return;
 }
@@ -852,10 +852,11 @@ int main(int argc, char **argv)
         int tmp;
         tmp = strcmp((char const *)*(argv + i),"-s");
         if (tmp) {
-          _LAND: {
-                   fprintf_va_1(__fc_stderr,"Unknown option\n");
-                   exit(1);
-                 }
+          _LAND:
+          {
+            fprintf(__fc_stderr,"Unknown option\n"); /* fprintf_va_1 */
+            exit(1);
+          }
         }
         else 
           if (i + 1 < argc) {
@@ -873,12 +874,12 @@ int main(int argc, char **argv)
   if (seed) tmp_1 = (long)seed;
   else tmp_1 = tv.tv_sec ^ (long)(tv.tv_usec << 10);
   srandom((unsigned int)tmp_1);
-  printf_va_2("Testing %-30s ",test_name);
+  printf("Testing %-30s ",test_name); /* printf_va_2 */
   fflush(__fc_stdout);
   LOG_Initialise();
   test_unit();
   LOG_Finalise();
-  printf_va_3("PASS\n");
+  printf("PASS\n"); /* printf_va_3 */
   __retres = 0;
   return __retres;
 }
@@ -2912,11 +2913,11 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                         }
                                                         else {
                                                           int tmp_16;
-                                                          tmp_16 = sscanf_va_1
+                                                          tmp_16 = sscanf
                                                           ((char const *)line,
                                                            "%d%n",
                                                            & src->params.version,
-                                                           & n);
+                                                           & n); /* sscanf_va_1 */
                                                           if (tmp_16 != 1) {
                                                             __retres = 0;
                                                             goto return_label;
@@ -2925,11 +2926,11 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                       }
                                                       else {
                                                         int tmp_15;
-                                                        tmp_15 = sscanf_va_2
+                                                        tmp_15 = sscanf
                                                         ((char const *)line,
                                                          "%d%n",
                                                          & src->params.presend_minpoll,
-                                                         & n);
+                                                         & n); /* sscanf_va_2 */
                                                         if (tmp_15 != 1) {
                                                           __retres = 0;
                                                           goto return_label;
@@ -2938,11 +2939,11 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                     }
                                                     else {
                                                       int tmp_14;
-                                                      tmp_14 = sscanf_va_3
+                                                      tmp_14 = sscanf
                                                       ((char const *)line,
                                                        "%d%n",
                                                        & src->params.poll_target,
-                                                       & n);
+                                                       & n); /* sscanf_va_3 */
                                                       if (tmp_14 != 1) {
                                                         __retres = 0;
                                                         goto return_label;
@@ -2951,9 +2952,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                   }
                                                   else {
                                                     int tmp_13;
-                                                    tmp_13 = sscanf_va_4
-                                                    ((char const *)line,
-                                                     "%hu%n",& src->port,& n);
+                                                    tmp_13 = sscanf((char const *)line,
+                                                                    "%hu%n",
+                                                                    & src->port,
+                                                                    & n); /* sscanf_va_4 */
                                                     if (tmp_13 != 1) {
                                                       __retres = 0;
                                                       goto return_label;
@@ -2962,10 +2964,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                                 }
                                                 else {
                                                   int tmp_12;
-                                                  tmp_12 = sscanf_va_5
-                                                  ((char const *)line,
-                                                   "%lf%n",
-                                                   & src->params.offset,& n);
+                                                  tmp_12 = sscanf((char const *)line,
+                                                                  "%lf%n",
+                                                                  & src->params.offset,
+                                                                  & n); /* sscanf_va_5 */
                                                   if (tmp_12 != 1) {
                                                     __retres = 0;
                                                     goto return_label;
@@ -2974,10 +2976,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                               }
                                               else {
                                                 int tmp_11;
-                                                tmp_11 = sscanf_va_6((char const *)line,
-                                                                    "%d%n",
-                                                                    & src->params.min_stratum,
-                                                                    & n);
+                                                tmp_11 = sscanf((char const *)line,
+                                                                "%d%n",
+                                                                & src->params.min_stratum,
+                                                                & n); /* sscanf_va_6 */
                                                 if (tmp_11 != 1) {
                                                   __retres = 0;
                                                   goto return_label;
@@ -2986,10 +2988,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                             }
                                             else {
                                               int tmp_10;
-                                              tmp_10 = sscanf_va_7((char const *)line,
-                                                                   "%d%n",
-                                                                   & src->params.min_samples,
-                                                                   & n);
+                                              tmp_10 = sscanf((char const *)line,
+                                                              "%d%n",
+                                                              & src->params.min_samples,
+                                                              & n); /* sscanf_va_7 */
                                               if (tmp_10 != 1) {
                                                 __retres = 0;
                                                 goto return_label;
@@ -2998,10 +3000,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                           }
                                           else {
                                             int tmp_9;
-                                            tmp_9 = sscanf_va_8((char const *)line,
-                                                                "%d%n",
-                                                                & src->params.minpoll,
-                                                                & n);
+                                            tmp_9 = sscanf((char const *)line,
+                                                           "%d%n",
+                                                           & src->params.minpoll,
+                                                           & n); /* sscanf_va_8 */
                                             if (tmp_9 != 1) {
                                               __retres = 0;
                                               goto return_label;
@@ -3010,10 +3012,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                         }
                                         else {
                                           int tmp_8;
-                                          tmp_8 = sscanf_va_9((char const *)line,
-                                                              "%lf%n",
-                                                              & src->params.min_delay,
-                                                              & n);
+                                          tmp_8 = sscanf((char const *)line,
+                                                         "%lf%n",
+                                                         & src->params.min_delay,
+                                                         & n); /* sscanf_va_9 */
                                           if (tmp_8 != 1) {
                                             __retres = 0;
                                             goto return_label;
@@ -3022,10 +3024,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                       }
                                       else {
                                         int tmp_7;
-                                        tmp_7 = sscanf_va_10((char const *)line,
-                                                             "%d%n",
-                                                             & src->params.max_sources,
-                                                             & n);
+                                        tmp_7 = sscanf((char const *)line,
+                                                       "%d%n",
+                                                       & src->params.max_sources,
+                                                       & n); /* sscanf_va_10 */
                                         if (tmp_7 != 1) {
                                           __retres = 0;
                                           goto return_label;
@@ -3034,10 +3036,10 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                     }
                                     else {
                                       int tmp_6;
-                                      tmp_6 = sscanf_va_11((char const *)line,
-                                                           "%d%n",
-                                                           & src->params.max_samples,
-                                                           & n);
+                                      tmp_6 = sscanf((char const *)line,
+                                                     "%d%n",
+                                                     & src->params.max_samples,
+                                                     & n); /* sscanf_va_11 */
                                       if (tmp_6 != 1) {
                                         __retres = 0;
                                         goto return_label;
@@ -3046,10 +3048,8 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                   }
                                   else {
                                     int tmp_5;
-                                    tmp_5 = sscanf_va_12((char const *)line,
-                                                         "%d%n",
-                                                         & src->params.maxpoll,
-                                                         & n);
+                                    tmp_5 = sscanf((char const *)line,"%d%n",
+                                                   & src->params.maxpoll,& n); /* sscanf_va_12 */
                                     if (tmp_5 != 1) {
                                       __retres = 0;
                                       goto return_label;
@@ -3058,10 +3058,9 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                                 }
                                 else {
                                   int tmp_4;
-                                  tmp_4 = sscanf_va_13((char const *)line,
-                                                       "%lf%n",
-                                                       & src->params.max_delay_dev_ratio,
-                                                       & n);
+                                  tmp_4 = sscanf((char const *)line,"%lf%n",
+                                                 & src->params.max_delay_dev_ratio,
+                                                 & n); /* sscanf_va_13 */
                                   if (tmp_4 != 1) {
                                     __retres = 0;
                                     goto return_label;
@@ -3070,10 +3069,9 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                               }
                               else {
                                 int tmp_3;
-                                tmp_3 = sscanf_va_14((char const *)line,
-                                                     "%lf%n",
-                                                     & src->params.max_delay_ratio,
-                                                     & n);
+                                tmp_3 = sscanf((char const *)line,"%lf%n",
+                                               & src->params.max_delay_ratio,
+                                               & n); /* sscanf_va_14 */
                                 if (tmp_3 != 1) {
                                   __retres = 0;
                                   goto return_label;
@@ -3082,10 +3080,8 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                             }
                             else {
                               int tmp_2;
-                              tmp_2 = sscanf_va_15((char const *)line,
-                                                   "%lf%n",
-                                                   & src->params.max_delay,
-                                                   & n);
+                              tmp_2 = sscanf((char const *)line,"%lf%n",
+                                             & src->params.max_delay,& n); /* sscanf_va_15 */
                               if (tmp_2 != 1) {
                                 __retres = 0;
                                 goto return_label;
@@ -3094,9 +3090,8 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                           }
                           else {
                             int tmp_1;
-                            tmp_1 = sscanf_va_16((char const *)line,"%d%n",
-                                                 & src->params.filter_length,
-                                                 & n);
+                            tmp_1 = sscanf((char const *)line,"%d%n",
+                                           & src->params.filter_length,& n); /* sscanf_va_16 */
                             if (tmp_1 != 1) {
                               __retres = 0;
                               goto return_label;
@@ -3105,8 +3100,8 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                         }
                         else {
                           int tmp_0;
-                          tmp_0 = sscanf_va_17((char const *)line,"%lf%n",
-                                               & src->params.asymmetry,& n);
+                          tmp_0 = sscanf((char const *)line,"%lf%n",
+                                         & src->params.asymmetry,& n); /* sscanf_va_17 */
                           if (tmp_0 != 1) {
                             __retres = 0;
                             goto return_label;
@@ -3115,9 +3110,9 @@ int CPS_ParseNTPSourceAdd(char *line, CPS_NTP_Source *src)
                       }
                       else {
                         int tmp;
-                        tmp = sscanf_va_18((char const *)line,"%u%n",
-                                           (unsigned int *)(& src->params.authkey),
-                                           & n);
+                        tmp = sscanf((char const *)line,"%u%n",
+                                     (unsigned int *)(& src->params.authkey),
+                                     & n); /* sscanf_va_18 */
                         if (tmp != 1) {
                           __retres = 0;
                           goto return_label;
@@ -3210,7 +3205,7 @@ int CPS_ParseLocal(char *line, int *stratum, int *orphan, double *distance)
         }
         else {
           int tmp_0;
-          tmp_0 = sscanf_va_19((char const *)line,"%lf%n",distance,& n);
+          tmp_0 = sscanf((char const *)line,"%lf%n",distance,& n); /* sscanf_va_19 */
           if (tmp_0 != 1) {
             __retres = 0;
             goto return_label;
@@ -3224,7 +3219,7 @@ int CPS_ParseLocal(char *line, int *stratum, int *orphan, double *distance)
     }
     else {
       int tmp;
-      tmp = sscanf_va_20((char const *)line,"%d%n",stratum,& n);
+      tmp = sscanf((char const *)line,"%d%n",stratum,& n); /* sscanf_va_20 */
       if (tmp != 1) {
         __retres = 0;
         goto return_label;
@@ -3363,7 +3358,7 @@ int CPS_ParseKey(char *line, uint32_t *id, char const **hash, char **key)
       __retres = 0;
       goto return_label;
     }
-  tmp = sscanf_va_21((char const *)s1,"%u",(unsigned int *)id);
+  tmp = sscanf((char const *)s1,"%u",(unsigned int *)id); /* sscanf_va_21 */
   if (tmp != 1) {
     __retres = 0;
     goto return_label;
@@ -4356,7 +4351,7 @@ static int parse_int(char *line, int *result)
   int __retres;
   int tmp;
   check_number_of_args(line,1);
-  tmp = sscanf_va_22((char const *)line,"%d",result);
+  tmp = sscanf((char const *)line,"%d",result); /* sscanf_va_22 */
   if (tmp != 1) {
     command_parse_error();
     __retres = 0;
@@ -4384,7 +4379,7 @@ static int parse_double(char *line, double *result)
   int __retres;
   int tmp;
   check_number_of_args(line,1);
-  tmp = sscanf_va_23((char const *)line,"%lf",result);
+  tmp = sscanf((char const *)line,"%lf",result); /* sscanf_va_23 */
   if (tmp != 1) {
     command_parse_error();
     __retres = 0;
@@ -4447,7 +4442,7 @@ static void parse_ratelimit(char *line, int *enabled_0, int *interval,
     int tmp_2;
     opt = line;
     line = CPS_SplitWord(line);
-    tmp = sscanf_va_24((char const *)line,"%d%n",& val,& n);
+    tmp = sscanf((char const *)line,"%d%n",& val,& n); /* sscanf_va_24 */
     if (tmp != 1) {
       command_parse_error();
       goto return_label;
@@ -4880,10 +4875,9 @@ static void parse_refclock(char *line)
                                       }
                                       else {
                                         int tmp_13;
-                                        tmp_13 = sscanf_va_25((char const *)line,
-                                                              "%lf%n",
-                                                              & pulse_width,
-                                                              & n);
+                                        tmp_13 = sscanf((char const *)line,
+                                                        "%lf%n",
+                                                        & pulse_width,& n); /* sscanf_va_25 */
                                         if (tmp_13 != 1) break;
                                       }
                                     }
@@ -4894,9 +4888,8 @@ static void parse_refclock(char *line)
                                   }
                                   else {
                                     int tmp_12;
-                                    tmp_12 = sscanf_va_26((char const *)line,
-                                                          "%d%n",& stratum,
-                                                          & n);
+                                    tmp_12 = sscanf((char const *)line,
+                                                    "%d%n",& stratum,& n); /* sscanf_va_26 */
                                     if (tmp_12 != 1) break;
                                     else 
                                       if (stratum >= 16) break;
@@ -4906,17 +4899,15 @@ static void parse_refclock(char *line)
                                 }
                                 else {
                                   int tmp_11;
-                                  tmp_11 = sscanf_va_27((char const *)line,
-                                                        "%lf%n",
-                                                        & max_dispersion,& n);
+                                  tmp_11 = sscanf((char const *)line,"%lf%n",
+                                                  & max_dispersion,& n); /* sscanf_va_27 */
                                   if (tmp_11 != 1) break;
                                 }
                               }
                               else {
                                 int tmp_10;
-                                tmp_10 = sscanf_va_28((char const *)line,
-                                                      "%lf%n",& precision,
-                                                      & n);
+                                tmp_10 = sscanf((char const *)line,"%lf%n",
+                                                & precision,& n); /* sscanf_va_28 */
                                 if (tmp_10 != 1) break;
                               }
                             }
@@ -4927,68 +4918,66 @@ static void parse_refclock(char *line)
                           }
                           else {
                             int tmp_9;
-                            tmp_9 = sscanf_va_29((char const *)line,"%lf%n",
-                                                 & delay,& n);
+                            tmp_9 = sscanf((char const *)line,"%lf%n",
+                                           & delay,& n); /* sscanf_va_29 */
                             if (tmp_9 != 1) break;
                           }
                         }
                         else {
                           int tmp_8;
-                          tmp_8 = sscanf_va_30((char const *)line,"%lf%n",
-                                               & offset,& n);
+                          tmp_8 = sscanf((char const *)line,"%lf%n",& offset,
+                                         & n); /* sscanf_va_30 */
                           if (tmp_8 != 1) break;
                         }
                       }
                       else {
                         int tmp_7;
-                        tmp_7 = sscanf_va_31((char const *)line,"%d%n",
-                                             & max_samples_0,& n);
+                        tmp_7 = sscanf((char const *)line,"%d%n",
+                                       & max_samples_0,& n); /* sscanf_va_31 */
                         if (tmp_7 != 1) break;
                       }
                     }
                     else {
                       int tmp_6;
-                      tmp_6 = sscanf_va_32((char const *)line,"%d%n",
-                                           & max_lock_age,& n);
+                      tmp_6 = sscanf((char const *)line,"%d%n",
+                                     & max_lock_age,& n); /* sscanf_va_32 */
                       if (tmp_6 != 1) break;
                     }
                   }
                   else {
                     int tmp_5;
-                    tmp_5 = sscanf_va_33((char const *)line,"%d%n",
-                                         & min_samples_0,& n);
+                    tmp_5 = sscanf((char const *)line,"%d%n",& min_samples_0,
+                                   & n); /* sscanf_va_33 */
                     if (tmp_5 != 1) break;
                   }
                 }
                 else {
                   int tmp_4;
-                  tmp_4 = sscanf_va_34((char const *)line,"%d%n",& pps_rate,
-                                       & n);
+                  tmp_4 = sscanf((char const *)line,"%d%n",& pps_rate,& n); /* sscanf_va_34 */
                   if (tmp_4 != 1) break;
                 }
               }
               else {
                 int tmp_3;
-                tmp_3 = sscanf_va_35((char const *)line,"%d%n",
-                                     & filter_length,& n);
+                tmp_3 = sscanf((char const *)line,"%d%n",& filter_length,& n); /* sscanf_va_35 */
                 if (tmp_3 != 1) break;
               }
             }
             else {
               int tmp_2;
-              tmp_2 = sscanf_va_36((char const *)line,"%d%n",& dpoll,& n);
+              tmp_2 = sscanf((char const *)line,"%d%n",& dpoll,& n); /* sscanf_va_36 */
               if (tmp_2 != 1) break;
             }
           }
           else {
             int tmp_1;
-            tmp_1 = sscanf_va_37((char const *)line,"%d%n",& poll,& n);
+            tmp_1 = sscanf((char const *)line,"%d%n",& poll,& n); /* sscanf_va_37 */
             if (tmp_1 != 1) break;
           }
         }
         else {
           int tmp_0;
-          tmp_0 = sscanf_va_38((char const *)line,"%4s%n",(char *)(ref),& n);
+          tmp_0 = sscanf((char const *)line,"%4s%n",(char *)(ref),& n); /* sscanf_va_38 */
           if (tmp_0 != 1) break;
           lock_ref_id = ((((unsigned int)ref[0] << 24) | (unsigned int)(
                           (int)ref[1] << 16)) | (unsigned int)((int)ref[2] << 8)) | (unsigned int)ref[3];
@@ -4996,7 +4985,7 @@ static void parse_refclock(char *line)
       }
       else {
         int tmp;
-        tmp = sscanf_va_39((char const *)line,"%4s%n",(char *)(ref),& n);
+        tmp = sscanf((char const *)line,"%4s%n",(char *)(ref),& n); /* sscanf_va_39 */
         if (tmp != 1) break;
         ref_id = ((((unsigned int)ref[0] << 24) | (unsigned int)((int)ref[1] << 16)) | (unsigned int)(
                   (int)ref[2] << 8)) | (unsigned int)ref[3];
@@ -5117,7 +5106,7 @@ static void parse_initstepslew(char *line)
   if (restarted) goto return_label;
   ARR_SetSize(init_sources,(unsigned int)0);
   p = CPS_SplitWord(line);
-  tmp = sscanf_va_40((char const *)line,"%lf",& init_slew_threshold);
+  tmp = sscanf((char const *)line,"%lf",& init_slew_threshold); /* sscanf_va_40 */
   if (tmp != 1) {
     command_parse_error();
     goto return_label;
@@ -5185,7 +5174,7 @@ static void parse_clientloglimit(char *line)
 {
   int tmp;
   check_number_of_args(line,1);
-  tmp = sscanf_va_41((char const *)line,"%lu",& client_log_limit);
+  tmp = sscanf((char const *)line,"%lu",& client_log_limit); /* sscanf_va_41 */
   if (tmp != 1) command_parse_error();
   return;
 }
@@ -5211,8 +5200,7 @@ static void parse_fallbackdrift(char *line)
 {
   int tmp;
   check_number_of_args(line,2);
-  tmp = sscanf_va_42((char const *)line,"%d %d",& fb_drift_min,
-                     & fb_drift_max);
+  tmp = sscanf((char const *)line,"%d %d",& fb_drift_min,& fb_drift_max); /* sscanf_va_42 */
   if (tmp != 2) command_parse_error();
   return;
 }
@@ -5238,8 +5226,8 @@ static void parse_makestep(char *line)
 {
   int tmp;
   check_number_of_args(line,2);
-  tmp = sscanf_va_43((char const *)line,"%lf %d",& make_step_threshold,
-                     & make_step_limit);
+  tmp = sscanf((char const *)line,"%lf %d",& make_step_threshold,
+               & make_step_limit); /* sscanf_va_43 */
   if (tmp != 2) {
     make_step_limit = 0;
     command_parse_error();
@@ -5274,8 +5262,8 @@ static void parse_maxchange(char *line)
 {
   int tmp;
   check_number_of_args(line,3);
-  tmp = sscanf_va_44((char const *)line,"%lf %d %d",& max_offset,
-                     & max_offset_delay,& max_offset_ignore);
+  tmp = sscanf((char const *)line,"%lf %d %d",& max_offset,
+               & max_offset_delay,& max_offset_ignore); /* sscanf_va_44 */
   if (tmp != 3) {
     max_offset_delay = -1;
     command_parse_error();
@@ -5304,7 +5292,7 @@ static void parse_mailonchange(char *line)
   address = line;
   line = CPS_SplitWord(line);
   free((void *)mail_user_on_change);
-  tmp = sscanf_va_45((char const *)line,"%lf",& mail_change_threshold);
+  tmp = sscanf((char const *)line,"%lf",& mail_change_threshold); /* sscanf_va_45 */
   if (tmp == 1) mail_user_on_change = Strdup((char const *)address);
   else {
     mail_user_on_change = (char *)0;
@@ -5388,7 +5376,7 @@ static void parse_allow_deny(char *line, ARR_Instance restrictions, int allow)
     if (tmp_4) goto _LOR;
     else {
       int tmp_5;
-      tmp_5 = sscanf_va_46((char const *)p,"%lu.%lu.%lu.%lu",& a,& b,& c,& d);
+      tmp_5 = sscanf((char const *)p,"%lu.%lu.%lu.%lu",& a,& b,& c,& d); /* sscanf_va_46 */
       n = (unsigned long)tmp_5;
       if (n >= (unsigned long)1) {
         _LOR:
@@ -5433,8 +5421,8 @@ static void parse_allow_deny(char *line, ARR_Instance restrictions, int allow)
           if (slashpos) {
             int specified_subnet_bits;
             int n_0;
-            n_0 = sscanf_va_47((char const *)(slashpos + 1),"%d",
-                               & specified_subnet_bits);
+            n_0 = sscanf((char const *)(slashpos + 1),"%d",
+                         & specified_subnet_bits); /* sscanf_va_47 */
             if (n_0 == 1) new_node->subnet_bits = specified_subnet_bits;
             else command_parse_error();
           }
@@ -5550,7 +5538,7 @@ static void parse_broadcast(char *line)
   int tmp_0;
   p = line;
   line = CPS_SplitWord(line);
-  tmp = sscanf_va_48((char const *)p,"%d",& interval);
+  tmp = sscanf((char const *)p,"%d",& interval); /* sscanf_va_48 */
   if (tmp != 1) {
     command_parse_error();
     goto return_label;
@@ -5566,7 +5554,7 @@ static void parse_broadcast(char *line)
   line = CPS_SplitWord(line);
   if (*p) {
     int tmp_1;
-    tmp_1 = sscanf_va_49((char const *)p,"%d",& port);
+    tmp_1 = sscanf((char const *)p,"%d",& port); /* sscanf_va_49 */
     if (tmp_1 != 1) goto _LOR;
     else 
       if (*line) {
@@ -5608,8 +5596,8 @@ static void parse_smoothtime(char *line)
   char *tmp_1;
   tmp = get_number_of_args(line);
   if (tmp != 3) check_number_of_args(line,2);
-  tmp_0 = sscanf_va_50((char const *)line,"%lf %lf",& smooth_max_freq,
-                       & smooth_max_wander);
+  tmp_0 = sscanf((char const *)line,"%lf %lf",& smooth_max_freq,
+                 & smooth_max_wander); /* sscanf_va_50 */
   if (tmp_0 != 2) {
     smooth_max_freq = 0.0;
     command_parse_error();
@@ -5686,7 +5674,7 @@ static void parse_tempcomp(char *line)
   if (point_form) {
     int tmp_0;
     char *tmp_1;
-    tmp_0 = sscanf_va_51((char const *)line,"%lf",& tempcomp_interval);
+    tmp_0 = sscanf((char const *)line,"%lf",& tempcomp_interval); /* sscanf_va_51 */
     if (tmp_0 != 1) {
       command_parse_error();
       goto return_label;
@@ -5696,9 +5684,9 @@ static void parse_tempcomp(char *line)
   }
   else {
     int tmp_2;
-    tmp_2 = sscanf_va_52((char const *)line,"%lf %lf %lf %lf %lf",
-                         & tempcomp_interval,& tempcomp_T0,& tempcomp_k0,
-                         & tempcomp_k1,& tempcomp_k2);
+    tmp_2 = sscanf((char const *)line,"%lf %lf %lf %lf %lf",
+                   & tempcomp_interval,& tempcomp_T0,& tempcomp_k0,
+                   & tempcomp_k1,& tempcomp_k2); /* sscanf_va_52 */
     if (tmp_2 != 5) {
       command_parse_error();
       goto return_label;
@@ -5885,8 +5873,7 @@ static void parse_hwtimestamp(char *line)
                   else {
                     int tmp_5;
                     int tmp_8;
-                    tmp_5 = sscanf_va_53((char const *)line,"%4s%n",filter,
-                                         & n);
+                    tmp_5 = sscanf((char const *)line,"%4s%n",filter,& n); /* sscanf_va_53 */
                     if (tmp_5 != 1) break;
                     tmp_8 = strcasecmp((char const *)(filter),"none");
                     if (tmp_8) {
@@ -5905,43 +5892,41 @@ static void parse_hwtimestamp(char *line)
                 }
                 else {
                   int tmp_4;
-                  tmp_4 = sscanf_va_54((char const *)line,"%lf%n",
-                                       & iface->tx_comp,& n);
+                  tmp_4 = sscanf((char const *)line,"%lf%n",& iface->tx_comp,
+                                 & n); /* sscanf_va_54 */
                   if (tmp_4 != 1) break;
                 }
               }
               else {
                 int tmp_3;
-                tmp_3 = sscanf_va_55((char const *)line,"%lf%n",
-                                     & iface->rx_comp,& n);
+                tmp_3 = sscanf((char const *)line,"%lf%n",& iface->rx_comp,
+                               & n); /* sscanf_va_55 */
                 if (tmp_3 != 1) break;
               }
             }
             else {
               int tmp_2;
-              tmp_2 = sscanf_va_56((char const *)line,"%lf%n",
-                                   & iface->precision,& n);
+              tmp_2 = sscanf((char const *)line,"%lf%n",& iface->precision,
+                             & n); /* sscanf_va_56 */
               if (tmp_2 != 1) break;
             }
           }
           else {
             int tmp_1;
-            tmp_1 = sscanf_va_57((char const *)line,"%d%n",
-                                 & iface->min_samples,& n);
+            tmp_1 = sscanf((char const *)line,"%d%n",& iface->min_samples,
+                           & n); /* sscanf_va_57 */
             if (tmp_1 != 1) break;
           }
         }
         else {
           int tmp_0;
-          tmp_0 = sscanf_va_58((char const *)line,"%d%n",& iface->minpoll,
-                               & n);
+          tmp_0 = sscanf((char const *)line,"%d%n",& iface->minpoll,& n); /* sscanf_va_58 */
           if (tmp_0 != 1) break;
         }
       }
       else {
         int tmp;
-        tmp = sscanf_va_59((char const *)line,"%d%n",& iface->max_samples,
-                           & n);
+        tmp = sscanf((char const *)line,"%d%n",& iface->max_samples,& n); /* sscanf_va_59 */
         if (tmp != 1) break;
       }
     }
@@ -8226,7 +8211,7 @@ int DNS_IPAddress2Name(IPAddr *ip_addr, char *name, int len)
   }
   if (host) result = host->h_name;
   if (result == (char *)0) result = UTI_IPToString(ip_addr);
-  tmp = snprintf_va_1(name,(unsigned long)len,"%s",result);
+  tmp = snprintf(name,(unsigned long)len,"%s",result); /* snprintf_va_1 */
   ;
   if (tmp >= len) {
     __retres = 0;
@@ -8338,7 +8323,7 @@ static int prepare_socket(int family, int port_number, int client_only)
   UTI_FdSetCloexec(sock_fd);
   if (! client_only) {
     int tmp_4;
-    tmp_4 = __va_fcntl_int(sock_fd,4,0x800);
+    tmp_4 = fcntl(sock_fd,4,0x800); /* __va_fcntl_int */
     if (tmp_4) ;
   }
   memset((void *)(& my_addr),0,sizeof(my_addr));
@@ -8968,7 +8953,7 @@ void REF_Initialise(void)
     in = fopen((char const *)drift_file_0,"r");
     if (in) {
       int tmp;
-      tmp = fscanf_va_1(in,"%lf%lf",& file_freq_ppm,& file_skew_ppm);
+      tmp = fscanf(in,"%lf%lf",& file_freq_ppm,& file_skew_ppm); /* fscanf_va_1 */
       if (tmp == 2) {
         our_frequency_ppm = file_freq_ppm;
         our_skew = 1.0e-6 * file_skew_ppm;
@@ -9165,7 +9150,7 @@ static void update_drift_file(double freq_ppm, double skew)
     }
     goto return_label;
   }
-  r1 = fprintf_va_2(out,"%20.6f %20.6f\n",freq_ppm,1.0e6 * skew);
+  r1 = fprintf(out,"%20.6f %20.6f\n",freq_ppm,1.0e6 * skew); /* fprintf_va_2 */
   r2 = fclose(out);
   if (r1 < 0) goto _LOR;
   else 
@@ -9383,18 +9368,17 @@ static void maybe_log_offset(double offset, time_t now)
   }
   if (do_mail_change) 
     if (abs_offset > mail_change_threshold_0) {
-      snprintf_va_2(buffer,sizeof(buffer),"%s -t",
-                    (char *)"/usr/lib/sendmail");
+      snprintf(buffer,sizeof(buffer),"%s -t",(char *)"/usr/lib/sendmail"); /* snprintf_va_2 */
       p = popen((char const *)(buffer),"w");
       if (p) {
         int tmp;
         tmp = gethostname(host,sizeof(host));
         if (tmp < 0) strcpy(host,"<UNKNOWN>");
         host[sizeof(host) - (unsigned long)1] = (char)'\000';
-        fprintf_va_3(p,"To: %s\n",mail_change_user);
-        fprintf_va_4(p,
-                     "Subject: chronyd reports change to system clock on node [%s]\n",
-                     host);
+        fprintf(p,"To: %s\n",mail_change_user); /* fprintf_va_3 */
+        fprintf(p,
+                "Subject: chronyd reports change to system clock on node [%s]\n",
+                host); /* fprintf_va_4 */
         fputs("\n",p);
         tm = localtime((time_t const *)(& now));
         if (tm) {
@@ -9403,9 +9387,9 @@ static void maybe_log_offset(double offset, time_t now)
                    (struct tm const *)tm);
           fputs((char const *)(buffer),p);
         }
-        fprintf_va_5(p,
-                     "\n\nchronyd started to apply an adjustment of %.3f seconds to it,\n  which exceeded the reporting threshold of %.3f seconds\n\n",
-                     - offset,mail_change_threshold_0);
+        fprintf(p,
+                "\n\nchronyd started to apply an adjustment of %.3f seconds to it,\n  which exceeded the reporting threshold of %.3f seconds\n\n",
+                - offset,mail_change_threshold_0); /* fprintf_va_5 */
         pclose(p);
       }
       else {
@@ -12157,16 +12141,15 @@ static FILE *open_dumpfile(SRC_Instance inst, char const *mode_0)
     char *tmp;
     tmp = source_to_string(inst);
     ;
-    tmp_0 = snprintf_va_3(filename,sizeof(filename),"%s/%s.dat",dumpdir_0,
-                          tmp);
+    tmp_0 = snprintf(filename,sizeof(filename),"%s/%s.dat",dumpdir_0,tmp); /* snprintf_va_3 */
     if ((unsigned long)tmp_0 >= sizeof(filename)) goto _LOR; else goto _LAND;
   }
   else {
     _LAND: ;
     if (inst->type != (unsigned int)SRC_NTP) {
       int tmp_1;
-      tmp_1 = snprintf_va_4(filename,sizeof(filename),"%s/refid:%08x.dat",
-                            dumpdir_0,inst->ref_id);
+      tmp_1 = snprintf(filename,sizeof(filename),"%s/refid:%08x.dat",
+                       dumpdir_0,inst->ref_id); /* snprintf_va_4 */
       if ((unsigned long)tmp_1 >= sizeof(filename)) {
         _LOR:
         {
@@ -12296,7 +12279,7 @@ void SRC_RemoveDumpFiles(void)
   if ((int)*(dumpdir_0 + 0) == '\000') goto return_label;
   else {
     int tmp;
-    tmp = snprintf_va_5(pattern,sizeof(pattern),"%s/*.dat",dumpdir_0);
+    tmp = snprintf(pattern,sizeof(pattern),"%s/*.dat",dumpdir_0); /* snprintf_va_5 */
     if ((unsigned long)tmp >= sizeof(pattern)) goto return_label;
   }
   tmp_0 = glob((char const *)(pattern),0,
@@ -12312,7 +12295,7 @@ void SRC_RemoveDumpFiles(void)
       if (! s) goto __Cont;
       else {
         int tmp_1;
-        tmp_1 = snprintf_va_6(name,sizeof(name),"%s",s + 1);
+        tmp_1 = snprintf(name,sizeof(name),"%s",s + 1); /* snprintf_va_6 */
         if ((unsigned long)tmp_1 >= sizeof(name)) goto __Cont;
       }
       tmp_2 = strlen((char const *)(name));
@@ -13156,20 +13139,20 @@ void SST_SaveToFile(SST_Stats inst, FILE *out)
   int m;
   int i;
   int j;
-  fprintf_va_6(out,"%d\n",inst->n_samples);
+  fprintf(out,"%d\n",inst->n_samples); /* fprintf_va_6 */
   m = 0;
   while (m < inst->n_samples) {
     i = get_runsbuf_index(inst,m);
     j = get_buf_index(inst,m);
-    fprintf_va_7(out,"%08lx %08lx %.6e %.6e %.6e %.6e %.6e %.6e %.6e %d\n",
-                 (unsigned long)inst->sample_times[i].tv_sec,
-                 (unsigned long)inst->sample_times[i].tv_nsec / (unsigned long)1000,
-                 inst->offsets[i],inst->orig_offsets[j],inst->peer_delays[i],
-                 inst->peer_dispersions[j],inst->root_delays[j],
-                 inst->root_dispersions[j],1.0,inst->stratum);
+    fprintf(out,"%08lx %08lx %.6e %.6e %.6e %.6e %.6e %.6e %.6e %d\n",
+            (unsigned long)inst->sample_times[i].tv_sec,
+            (unsigned long)inst->sample_times[i].tv_nsec / (unsigned long)1000,
+            inst->offsets[i],inst->orig_offsets[j],inst->peer_delays[i],
+            inst->peer_dispersions[j],inst->root_delays[j],
+            inst->root_dispersions[j],1.0,inst->stratum); /* fprintf_va_7 */
     m ++;
   }
-  fprintf_va_8(out,"%d\n",inst->asymmetry_run);
+  fprintf(out,"%d\n",inst->asymmetry_run); /* fprintf_va_8 */
   return;
 }
 
@@ -13265,7 +13248,7 @@ int SST_LoadFromFile(SST_Stats inst, FILE *in)
   tmp_3 = fgets(line,(int)sizeof(line),in);
   if (tmp_3) {
     int tmp_4;
-    tmp_4 = sscanf_va_60((char const *)(line),"%d",& inst->n_samples);
+    tmp_4 = sscanf((char const *)(line),"%d",& inst->n_samples); /* sscanf_va_60 */
     if (tmp_4 == 1) {
       if (inst->n_samples >= 0) {
         if (inst->n_samples <= 64) {
@@ -13277,16 +13260,15 @@ int SST_LoadFromFile(SST_Stats inst, FILE *in)
               tmp = fgets(line,(int)sizeof(line),in);
               if (tmp) {
                 int tmp_0;
-                tmp_0 = sscanf_va_61((char const *)(line),
-                                     "%lx%lx%lf%lf%lf%lf%lf%lf%lf%d\n",
-                                     (unsigned long *)(& sec),& usec,
-                                     & inst->offsets[i],
-                                     & inst->orig_offsets[i],
-                                     & inst->peer_delays[i],
-                                     & inst->peer_dispersions[i],
-                                     & inst->root_delays[i],
-                                     & inst->root_dispersions[i],& weight,
-                                     & inst->stratum);
+                tmp_0 = sscanf((char const *)(line),
+                               "%lx%lx%lf%lf%lf%lf%lf%lf%lf%d\n",
+                               (unsigned long *)(& sec),& usec,
+                               & inst->offsets[i],& inst->orig_offsets[i],
+                               & inst->peer_delays[i],
+                               & inst->peer_dispersions[i],
+                               & inst->root_delays[i],
+                               & inst->root_dispersions[i],& weight,
+                               & inst->stratum); /* sscanf_va_61 */
                 if (tmp_0 != 10) {
                   _LOR:
                   {
@@ -13308,8 +13290,7 @@ int SST_LoadFromFile(SST_Stats inst, FILE *in)
           tmp_1 = fgets(line,(int)sizeof(line),in);
           if (tmp_1) {
             int tmp_2;
-            tmp_2 = sscanf_va_62((char const *)(line),"%d\n",
-                                 & inst->asymmetry_run);
+            tmp_2 = sscanf((char const *)(line),"%d\n",& inst->asymmetry_run); /* sscanf_va_62 */
             if (tmp_2 != 1) inst->asymmetry_run = 0;
           }
           else inst->asymmetry_run = 0;
@@ -13619,8 +13600,8 @@ char *UTI_TimespecToString(struct timespec *ts)
   char *result;
   pool_ptr = (pool_ptr + 1) % 16;
   result = buffer_pool[pool_ptr];
-  snprintf_va_7(result,(unsigned long)64,"%ld.%09lu",ts->tv_sec,
-                (unsigned long)ts->tv_nsec);
+  snprintf(result,(unsigned long)64,"%ld.%09lu",ts->tv_sec,
+           (unsigned long)ts->tv_nsec); /* snprintf_va_7 */
   return result;
 }
 
@@ -13732,27 +13713,29 @@ char *UTI_IPToString(IPAddr *addr)
   pool_ptr = (pool_ptr + 1) % 16;
   result = buffer_pool[pool_ptr];
   switch ((int)addr->family) {
-    case 0: snprintf_va_8(result,(unsigned long)64,"[UNSPEC]");
+    case 0:
+    snprintf(result,(unsigned long)64,"[UNSPEC]"); /* snprintf_va_8 */
     break;
     case 1: ip = (unsigned long)addr->addr.in4;
     a = (ip >> 24) & (unsigned long)0xff;
     b = (ip >> 16) & (unsigned long)0xff;
     c = (ip >> 8) & (unsigned long)0xff;
     d = (ip >> 0) & (unsigned long)0xff;
-    snprintf_va_9(result,(unsigned long)64,"%lu.%lu.%lu.%lu",a,b,c,d);
+    snprintf(result,(unsigned long)64,"%lu.%lu.%lu.%lu",a,b,c,d); /* snprintf_va_9 */
     break;
     case 2: ip6 = addr->addr.in6;
     __FC_assert((64 >= 40) != 0,"util.c",308,"BUFFER_LENGTH >= 40");
     a = (unsigned long)0;
     while (a < (unsigned long)8) {
-      snprintf_va_10(result + a * (unsigned long)5,
-                     (unsigned long)40 - a * (unsigned long)5,"%04x:",
-                     (unsigned int)(((int)*(ip6 + (unsigned long)2 * a) << 8) | (int)*(
-                                    ip6 + ((unsigned long)2 * a + (unsigned long)1))));
+      snprintf(result + a * (unsigned long)5,
+               (unsigned long)40 - a * (unsigned long)5,"%04x:",
+               (unsigned int)(((int)*(ip6 + (unsigned long)2 * a) << 8) | (int)*(
+                              ip6 + ((unsigned long)2 * a + (unsigned long)1)))); /* snprintf_va_10 */
       a ++;
     }
     break;
-    default: snprintf_va_11(result,(unsigned long)64,"[UNKNOWN]");
+    default:
+    snprintf(result,(unsigned long)64,"[UNKNOWN]"); /* snprintf_va_11 */
   }
   return result;
 }
@@ -13792,7 +13775,7 @@ int UTI_StringToIP(char const *addr, IPAddr *ip)
   unsigned long d;
   unsigned long n;
   int tmp;
-  tmp = sscanf_va_63(addr,"%lu.%lu.%lu.%lu",& a,& b,& c,& d);
+  tmp = sscanf(addr,"%lu.%lu.%lu.%lu",& a,& b,& c,& d); /* sscanf_va_63 */
   n = (unsigned long)tmp;
   if (n == (unsigned long)4) {
     ip->family = (unsigned short)1;
@@ -14044,14 +14027,15 @@ char *UTI_SockaddrToString(struct sockaddr *sa)
     ;
     tmp = UTI_IPToString(& ip);
     ;
-    snprintf_va_12(result,(unsigned long)64,"%s:%hu",tmp,(int)port);
+    snprintf(result,(unsigned long)64,"%s:%hu",tmp,(int)port); /* snprintf_va_12 */
     break;
     case 1: sun_path = ((struct sockaddr_un *)sa)->sun_path;
-    snprintf_va_13(result,(unsigned long)64,"%.*s",64 - 1,sun_path);
+    snprintf(result,(unsigned long)64,"%.*s",64 - 1,sun_path); /* snprintf_va_13 */
     tmp_0 = strlen((char const *)sun_path);
     if (tmp_0 >= (size_t)64) *(result + (64 - 2)) = (char)'>';
     break;
-    default: snprintf_va_14(result,(unsigned long)64,"[UNKNOWN]");
+    default:
+    snprintf(result,(unsigned long)64,"[UNKNOWN]"); /* snprintf_va_14 */
   }
   return result;
 }
@@ -14095,7 +14079,7 @@ char *UTI_TimeToLogForm(time_t t)
   stm = gmtime((time_t const *)(& t));
   if (stm) strftime(result,(unsigned long)64,"%Y-%m-%d %H:%M:%S",
                     (struct tm const *)stm);
-  else snprintf_va_15(result,(unsigned long)64,"INVALID    INVALID ");
+  else snprintf(result,(unsigned long)64,"INVALID    INVALID "); /* snprintf_va_15 */
   return result;
 }
 
@@ -14447,12 +14431,12 @@ int UTI_FdSetCloexec(int fd)
 {
   int __retres;
   int flags;
-  flags = __va_fcntl_void(fd,1);
+  flags = fcntl(fd,1); /* __va_fcntl_void */
   if (flags != -1) {
     int tmp_0;
     int tmp;
     flags |= 1;
-    tmp = __va_fcntl_int(fd,2,flags);
+    tmp = fcntl(fd,2,flags); /* __va_fcntl_int */
     if (tmp) tmp_0 = 0; else tmp_0 = 1;
     __retres = tmp_0;
     goto return_label;
@@ -14571,8 +14555,7 @@ char *UTI_PathToDir(char const *path)
     goto return_label;
   }
   dir = (char *)Malloc((unsigned long)((slash - path) + (long)1));
-  snprintf_va_16(dir,(unsigned long)((slash - path) + (long)1),"%s",
-                 (char *)path);
+  snprintf(dir,(unsigned long)((slash - path) + (long)1),"%s",(char *)path); /* snprintf_va_16 */
   __retres = dir;
   return_label: return __retres;
 }
diff --git a/frama-c b/frama-c
index ee4be605e04e738bd1c683613270efc75cbaa6b4..292964f3767f94f2e4a45e347aa33fde15a225d1 160000
--- a/frama-c
+++ b/frama-c
@@ -1 +1 @@
-Subproject commit ee4be605e04e738bd1c683613270efc75cbaa6b4
+Subproject commit 292964f3767f94f2e4a45e347aa33fde15a225d1
diff --git a/gzip124/.frama-c/gzip124.parse/framac.ast b/gzip124/.frama-c/gzip124.parse/framac.ast
index 6ef9d9cb19aaa3ac0cddbb85cfcf685752d09467..2ea886cce80182b3983cf4d0744142800a586192 100644
--- a/gzip124/.frama-c/gzip124.parse/framac.ast
+++ b/gzip124/.frama-c/gzip124.parse/framac.ast
@@ -334,9 +334,9 @@ int fprintf_va_1(FILE * __restrict stream, char const * __restrict format,
 
 static void usage(void)
 {
-  fprintf_va_1(__fc_stderr,
-               "usage: %s [-%scdfhlLnN%stvV19] [-S suffix] [file ...]\n",
-               progname,(char *)"",(char *)"r");
+  fprintf(__fc_stderr,
+          "usage: %s [-%scdfhlLnN%stvV19] [-S suffix] [file ...]\n",progname,
+          (char *)"",(char *)"r"); /* fprintf_va_1 */
   return;
 }
 
@@ -394,8 +394,8 @@ int fprintf_va_3(FILE * __restrict stream, char const * __restrict format,
 static void help(void)
 {
   char **p = help_help_msg;
-  fprintf_va_2(__fc_stderr,"%s %s (%s)\n",progname,(char *)"1.2.4",
-               (char *)"18 Aug 93");
+  fprintf(__fc_stderr,"%s %s (%s)\n",progname,(char *)"1.2.4",
+          (char *)"18 Aug 93"); /* fprintf_va_2 */
   usage();
   while (*p) {
     char **tmp;
@@ -403,7 +403,7 @@ static void help(void)
     p ++;
     ;
     ;
-    fprintf_va_3(__fc_stderr,"%s\n",*tmp);
+    fprintf(__fc_stderr,"%s\n",*tmp); /* fprintf_va_3 */
   }
   return;
 }
@@ -443,15 +443,15 @@ int fprintf_va_5(FILE * __restrict stream, char const * __restrict format,
 static void license(void)
 {
   char **p = license_msg;
-  fprintf_va_4(__fc_stderr,"%s %s (%s)\n",progname,(char *)"1.2.4",
-               (char *)"18 Aug 93");
+  fprintf(__fc_stderr,"%s %s (%s)\n",progname,(char *)"1.2.4",
+          (char *)"18 Aug 93"); /* fprintf_va_4 */
   while (*p) {
     char **tmp;
     tmp = p;
     p ++;
     ;
     ;
-    fprintf_va_5(__fc_stderr,"%s\n",*tmp);
+    fprintf(__fc_stderr,"%s\n",*tmp); /* fprintf_va_5 */
   }
   return;
 }
@@ -529,13 +529,13 @@ int fprintf_va_10(FILE * __restrict stream, char const * __restrict format);
 
 static void version(void)
 {
-  fprintf_va_6(__fc_stderr,"%s %s (%s)\n",progname,(char *)"1.2.4",
-               (char *)"18 Aug 93");
-  fprintf_va_7(__fc_stderr,"Compilation options:\n%s %s ",(char *)"DIRENT",
-               (char *)"NO_UTIME");
-  fprintf_va_8(__fc_stderr,"STDC_HEADERS ");
-  fprintf_va_9(__fc_stderr,"HAVE_UNISTD_H ");
-  fprintf_va_10(__fc_stderr,"\n");
+  fprintf(__fc_stderr,"%s %s (%s)\n",progname,(char *)"1.2.4",
+          (char *)"18 Aug 93"); /* fprintf_va_6 */
+  fprintf(__fc_stderr,"Compilation options:\n%s %s ",(char *)"DIRENT",
+          (char *)"NO_UTIME"); /* fprintf_va_7 */
+  fprintf(__fc_stderr,"STDC_HEADERS "); /* fprintf_va_8 */
+  fprintf(__fc_stderr,"HAVE_UNISTD_H "); /* fprintf_va_9 */
+  fprintf(__fc_stderr,"\n"); /* fprintf_va_10 */
   return;
 }
 
@@ -708,8 +708,7 @@ int main(int argc, char **argv)
       do_exit(0);
       break;
       case 'Z':
-      fprintf_va_11(__fc_stderr,"%s: -Z not supported in this version\n",
-                    progname);
+      fprintf(__fc_stderr,"%s: -Z not supported in this version\n",progname); /* fprintf_va_11 */
       usage();
       do_exit(1);
       break;
@@ -725,9 +724,9 @@ int main(int argc, char **argv)
   if (no_name < 0) no_name = decompress;
   file_count = argc - optind;
   if (ascii) 
-    if (! quiet) fprintf_va_12(__fc_stderr,
-                               "%s: option --ascii ignored on this system\n",
-                               progname);
+    if (! quiet) fprintf(__fc_stderr,
+                         "%s: option --ascii ignored on this system\n",
+                         progname); /* fprintf_va_12 */
   if (z_len == 0) {
     if (! decompress) goto _LOR_1; else goto _LAND;
   }
@@ -736,8 +735,7 @@ int main(int argc, char **argv)
     if (z_len > 30) {
       _LOR_1:
       {
-        fprintf_va_13(__fc_stderr,"%s: incorrect suffix \'%s\'\n",progname,
-                      optarg);
+        fprintf(__fc_stderr,"%s: incorrect suffix \'%s\'\n",progname,optarg); /* fprintf_va_13 */
         do_exit(1);
       }
     }
@@ -840,10 +838,10 @@ static void treat_stdin(void)
         if (decompress) tmp_0 = "read from"; else tmp_0 = "written to";
         ;
         ;
-        fprintf_va_14(__fc_stderr,
-                      "%s: compressed data not %s a terminal. Use -f to force %scompression.\n",
-                      progname,(char *)tmp_0,(char *)tmp);
-        fprintf_va_15(__fc_stderr,"For help, type: %s -h\n",progname);
+        fprintf(__fc_stderr,
+                "%s: compressed data not %s a terminal. Use -f to force %scompression.\n",
+                progname,(char *)tmp_0,(char *)tmp); /* fprintf_va_14 */
+        fprintf(__fc_stderr,"For help, type: %s -h\n",progname); /* fprintf_va_15 */
         do_exit(1);
       }
     }
@@ -901,12 +899,12 @@ static void treat_stdin(void)
     bytes_out = (long)0;
   }
   if (verbose) 
-    if (test) fprintf_va_16(__fc_stderr," OK\n");
+    if (test) fprintf(__fc_stderr," OK\n"); /* fprintf_va_16 */
     else 
       if (! decompress) {
         display_ratio(bytes_in - (bytes_out - header_bytes),bytes_in,
                       __fc_stderr);
-        fprintf_va_17(__fc_stderr,"\n");
+        fprintf(__fc_stderr,"\n"); /* fprintf_va_17 */
       }
   return_label: return;
 }
@@ -1071,17 +1069,16 @@ static void treat_file(char *iname)
       st = istat;
     }
     else {
-      if (! quiet) fprintf_va_18(__fc_stderr,
-                                 "%s: %s is a directory -- ignored\n",
-                                 progname,ifname);
+      if (! quiet) fprintf(__fc_stderr,"%s: %s is a directory -- ignored\n",
+                           progname,ifname); /* fprintf_va_18 */
       if (exit_code == 0) exit_code = 2;
     }
     goto return_label;
   }
   if (! ((istat.st_mode & (unsigned int)0170000) == (unsigned int)0100000)) {
-    if (! quiet) fprintf_va_19(__fc_stderr,
-                               "%s: %s is not a directory or a regular file - ignored\n",
-                               progname,ifname);
+    if (! quiet) fprintf(__fc_stderr,
+                         "%s: %s is not a directory or a regular file - ignored\n",
+                         progname,ifname); /* fprintf_va_19 */
     if (exit_code == 0) exit_code = 2;
     goto return_label;
   }
@@ -1094,9 +1091,8 @@ static void treat_file(char *iname)
           ;
           ;
           ;
-          fprintf_va_20(__fc_stderr,
-                        "%s: %s has %d other link%c -- unchanged\n",progname,
-                        ifname,(int)istat.st_nlink - 1,tmp_1);
+          fprintf(__fc_stderr,"%s: %s has %d other link%c -- unchanged\n",
+                  progname,ifname,(int)istat.st_nlink - 1,tmp_1); /* fprintf_va_20 */
         }
         if (exit_code == 0) exit_code = 2;
         goto return_label;
@@ -1119,10 +1115,9 @@ static void treat_file(char *iname)
   if (ascii) 
     if (! decompress) tmp_3 = 0; else tmp_3 = 0 | 0;
   else tmp_3 = 0 | 0;
-  ifd = __va_open_mode_t((char const *)(ifname),tmp_3,
-                         (mode_t)(00400 | 00200));
+  ifd = open((char const *)(ifname),tmp_3,(mode_t)(00400 | 00200)); /* __va_open_mode_t */
   if (ifd == -1) {
-    fprintf_va_21(__fc_stderr,"%s: ",progname);
+    fprintf(__fc_stderr,"%s: ",progname); /* fprintf_va_21 */
     perror((char const *)(ifname));
     exit_code = 1;
     goto return_label;
@@ -1149,8 +1144,8 @@ static void treat_file(char *iname)
     if (! decompress) 
       if (save_orig_name) 
         if (! verbose) 
-          if (! quiet) fprintf_va_22(__fc_stderr,"%s: %s compressed to %s\n",
-                                     progname,ifname,ofname);
+          if (! quiet) fprintf(__fc_stderr,"%s: %s compressed to %s\n",
+                               progname,ifname,ofname); /* fprintf_va_22 */
   }
   if (! save_orig_name) save_orig_name = ! no_name;
   if (verbose) {
@@ -1166,7 +1161,7 @@ static void treat_file(char *iname)
       tmp_8 = tmp_7;
     }
     ;
-    fprintf_va_23(__fc_stderr,"%s:\t%s",ifname,(char *)tmp_8);
+    fprintf(__fc_stderr,"%s:\t%s",ifname,(char *)tmp_8); /* fprintf_va_23 */
   }
   while (1) {
     int tmp_9;
@@ -1195,16 +1190,15 @@ static void treat_file(char *iname)
     goto return_label;
   }
   if (verbose) {
-    if (test) fprintf_va_24(__fc_stderr," OK");
+    if (test) fprintf(__fc_stderr," OK"); /* fprintf_va_24 */
     else 
       if (decompress) display_ratio(bytes_out - (bytes_in - header_bytes),
                                     bytes_out,__fc_stderr);
       else display_ratio(bytes_in - (bytes_out - header_bytes),bytes_in,
                          __fc_stderr);
     if (! test) 
-      if (! to_stdout) fprintf_va_25(__fc_stderr," -- replaced with %s",
-                                     ofname);
-    fprintf_va_26(__fc_stderr,"\n");
+      if (! to_stdout) fprintf(__fc_stderr," -- replaced with %s",ofname); /* fprintf_va_25 */
+    fprintf(__fc_stderr,"\n"); /* fprintf_va_26 */
   }
   if (! to_stdout) copy_stat(& istat);
   return_label: return;
@@ -1259,8 +1253,7 @@ static int create_outfile(void)
       goto return_label;
     }
     remove_ofname = 1;
-    ofd = __va_open_mode_t((char const *)(ofname),flags_0,
-                           (mode_t)(00400 | 00200));
+    ofd = open((char const *)(ofname),flags_0,(mode_t)(00400 | 00200)); /* __va_open_mode_t */
     if (ofd == -1) {
       perror((char const *)(ofname));
       close(ifd);
@@ -1270,7 +1263,7 @@ static int create_outfile(void)
     }
     tmp_0 = fstat(ofd,& ostat);
     if (tmp_0 != 0) {
-      fprintf_va_27(__fc_stderr,"%s: ",progname);
+      fprintf(__fc_stderr,"%s: ",progname); /* fprintf_va_27 */
       perror((char const *)(ofname));
       close(ifd);
       close(ofd);
@@ -1285,9 +1278,8 @@ static int create_outfile(void)
       goto return_label;
     }
     if (decompress) {
-      if (! quiet) fprintf_va_28(__fc_stderr,
-                                 "%s: %s: warning, name truncated\n",
-                                 progname,ofname);
+      if (! quiet) fprintf(__fc_stderr,"%s: %s: warning, name truncated\n",
+                           progname,ofname); /* fprintf_va_28 */
       if (exit_code == 0) exit_code = 2;
       __retres = 0;
       goto return_label;
@@ -1499,9 +1491,9 @@ static int make_ofname(void)
           if (! quiet) {
             _LOR:
             {
-              if (! quiet) fprintf_va_29(__fc_stderr,
-                                         "%s: %s: unknown suffix -- ignored\n",
-                                         progname,ifname);
+              if (! quiet) fprintf(__fc_stderr,
+                                   "%s: %s: unknown suffix -- ignored\n",
+                                   progname,ifname); /* fprintf_va_29 */
               if (exit_code == 0) exit_code = 2;
             }
           }
@@ -1523,9 +1515,9 @@ static int make_ofname(void)
       else 
         if (! recursive) 
           if (! quiet) _LOR_1:
-                       fprintf_va_30(__fc_stderr,
-                                     "%s: %s already has %s suffix -- unchanged\n",
-                                     progname,ifname,suff);
+                       fprintf(__fc_stderr,
+                               "%s: %s already has %s suffix -- unchanged\n",
+                               progname,ifname,suff); /* fprintf_va_30 */
       if (exit_code == 0) exit_code = 2;
       __retres = 2;
       goto return_label;
@@ -1757,9 +1749,9 @@ static int get_method(int in)
         else tmp_13 = fill_inbuf(0);
         method = tmp_13;
         if (method != 8) {
-          fprintf_va_31(__fc_stderr,
-                        "%s: %s: unknown method %d -- get newer version of gzip\n",
-                        progname,ifname,method);
+          fprintf(__fc_stderr,
+                  "%s: %s: unknown method %d -- get newer version of gzip\n",
+                  progname,ifname,method); /* fprintf_va_31 */
           exit_code = 1;
           __retres = -1;
           goto return_label;
@@ -1774,17 +1766,17 @@ static int get_method(int in)
         else tmp_16 = fill_inbuf(0);
         flags_0 = (unsigned char)tmp_16;
         if (((int)flags_0 & 0x20) != 0) {
-          fprintf_va_32(__fc_stderr,
-                        "%s: %s is encrypted -- get newer version of gzip\n",
-                        progname,ifname);
+          fprintf(__fc_stderr,
+                  "%s: %s is encrypted -- get newer version of gzip\n",
+                  progname,ifname); /* fprintf_va_32 */
           exit_code = 1;
           __retres = -1;
           goto return_label;
         }
         if (((int)flags_0 & 0x02) != 0) {
-          fprintf_va_33(__fc_stderr,
-                        "%s: %s is a a multi-part gzip file -- get newer version of gzip\n",
-                        progname,ifname);
+          fprintf(__fc_stderr,
+                  "%s: %s is a a multi-part gzip file -- get newer version of gzip\n",
+                  progname,ifname); /* fprintf_va_33 */
           exit_code = 1;
           if (force <= 1) {
             __retres = -1;
@@ -1792,9 +1784,9 @@ static int get_method(int in)
           }
         }
         if (((int)flags_0 & 0xC0) != 0) {
-          fprintf_va_34(__fc_stderr,
-                        "%s: %s has flags 0x%x -- get newer version of gzip\n",
-                        progname,ifname,(unsigned int)((int)flags_0));
+          fprintf(__fc_stderr,
+                  "%s: %s has flags 0x%x -- get newer version of gzip\n",
+                  progname,ifname,(unsigned int)((int)flags_0)); /* fprintf_va_34 */
           exit_code = 1;
           if (force <= 1) {
             __retres = -1;
@@ -1868,8 +1860,8 @@ static int get_method(int in)
           }
           else tmp_36 = fill_inbuf(0);
           part |= (unsigned int)tmp_36 << 8;
-          if (verbose) fprintf_va_35(__fc_stderr,"%s: %s: part number %u\n",
-                                     progname,ifname,part);
+          if (verbose) fprintf(__fc_stderr,"%s: %s: part number %u\n",
+                               progname,ifname,part); /* fprintf_va_35 */
         }
         if (((int)flags_0 & 0x04) != 0) {
           int tmp_39;
@@ -1890,9 +1882,9 @@ static int get_method(int in)
           }
           else tmp_42 = fill_inbuf(0);
           len |= (unsigned int)tmp_42 << 8;
-          if (verbose) fprintf_va_36(__fc_stderr,
-                                     "%s: %s: extra field of %u bytes ignored\n",
-                                     progname,ifname,len);
+          if (verbose) fprintf(__fc_stderr,
+                               "%s: %s: extra field of %u bytes ignored\n",
+                               progname,ifname,len); /* fprintf_va_36 */
           while (1) {
             unsigned int tmp_44_0;
             tmp_44_0 = len;
@@ -2045,16 +2037,15 @@ static int get_method(int in)
     goto return_label;
   }
   if (part_nb == 1) {
-    fprintf_va_37(__fc_stderr,"\n%s: %s: not in gzip format\n",progname,
-                  ifname);
+    fprintf(__fc_stderr,"\n%s: %s: not in gzip format\n",progname,ifname); /* fprintf_va_37 */
     exit_code = 1;
     __retres = -1;
     goto return_label;
   }
   else {
-    if (! quiet) fprintf_va_38(__fc_stderr,
-                               "\n%s: %s: decompression OK, trailing garbage ignored\n",
-                               progname,ifname);
+    if (! quiet) fprintf(__fc_stderr,
+                         "\n%s: %s: decompression OK, trailing garbage ignored\n",
+                         progname,ifname); /* fprintf_va_38 */
     if (exit_code == 0) exit_code = 2;
     __retres = -2;
     goto return_label;
@@ -2192,8 +2183,8 @@ static void do_list(int ifd_0, int method_0)
   if (do_list_first_time) {
     if (method_0 >= 0) {
       do_list_first_time = 0;
-      if (verbose) printf_va_1("method  crc     date  time  ");
-      if (! quiet) printf_va_2("compressed  uncompr. ratio uncompressed_name\n");
+      if (verbose) printf("method  crc     date  time  "); /* printf_va_1 */
+      if (! quiet) printf("compressed  uncompr. ratio uncompressed_name\n"); /* printf_va_2 */
     }
     else goto _LAND;
   }
@@ -2203,14 +2194,13 @@ static void do_list(int ifd_0, int method_0)
       if (total_in <= (long)0) goto return_label;
       else 
         if (total_out <= (long)0) goto return_label;
-      if (verbose) printf_va_3("                            %9lu %9lu ",
-                               (unsigned long)total_in,
-                               (unsigned long)total_out);
+      if (verbose) printf("                            %9lu %9lu ",
+                          (unsigned long)total_in,(unsigned long)total_out); /* printf_va_3 */
       else 
-        if (! quiet) printf_va_4("%9ld %9ld ",total_in,total_out);
+        if (! quiet) printf("%9ld %9ld ",total_in,total_out); /* printf_va_4 */
       display_ratio(total_out - (total_in - header_bytes),total_out,
                     __fc_stdout);
-      printf_va_5(" (totals)\n");
+      printf(" (totals)\n"); /* printf_va_5 */
       goto return_label;
     }
   }
@@ -2238,9 +2228,8 @@ static void do_list(int ifd_0, int method_0)
   tmp_1 = ctime((time_t const *)(& time_stamp));
   date = tmp_1 + 4;
   *(date + 12) = (char)'\000';
-  if (verbose) printf_va_6("%5s %08lx %11s ",do_list_methods[method_0],crc_0,
-                           date);
-  printf_va_7("%9ld %9ld ",bytes_in,bytes_out);
+  if (verbose) printf("%5s %08lx %11s ",do_list_methods[method_0],crc_0,date); /* printf_va_6 */
+  printf("%9ld %9ld ",bytes_in,bytes_out); /* printf_va_7 */
   if (bytes_in == -1L) {
     total_in = -1L;
     header_bytes = (long)0;
@@ -2258,7 +2247,7 @@ static void do_list(int ifd_0, int method_0)
   else 
     if (total_out >= (long)0) total_out += bytes_out;
   display_ratio(bytes_out - (bytes_in - header_bytes),bytes_out,__fc_stdout);
-  printf_va_8(" %s\n",ofname);
+  printf(" %s\n",ofname); /* printf_va_8 */
   return_label: return;
 }
 
@@ -2494,11 +2483,11 @@ static int check_ofname(void)
       if (decompress) tmp_2 = "de"; else tmp_2 = "";
       ;
       ;
-      fprintf_va_39(__fc_stderr,"%s: %s: cannot %scompress onto itself\n",
-                    progname,ifname,(char *)tmp_2);
+      fprintf(__fc_stderr,"%s: %s: cannot %scompress onto itself\n",progname,
+              ifname,(char *)tmp_2); /* fprintf_va_39 */
     }
-    else fprintf_va_40(__fc_stderr,"%s: %s and %s are the same file\n",
-                       progname,ifname,ofname);
+    else fprintf(__fc_stderr,"%s: %s and %s are the same file\n",progname,
+                 ifname,ofname); /* fprintf_va_40 */
     exit_code = 1;
     __retres = 1;
     goto return_label;
@@ -2508,14 +2497,14 @@ static int check_ofname(void)
     int tmp_8;
     int tmp_7;
     strcpy(response,"n");
-    fprintf_va_41(__fc_stderr,"%s: %s already exists;",progname,ofname);
+    fprintf(__fc_stderr,"%s: %s already exists;",progname,ofname); /* fprintf_va_41 */
     if (foreground) {
       int tmp_6;
       int tmp_5;
       tmp_5 = fileno(__fc_stdin);
       tmp_6 = isatty(tmp_5);
       if (tmp_6) {
-        fprintf_va_42(__fc_stderr," do you wish to overwrite (y or n)? ");
+        fprintf(__fc_stderr," do you wish to overwrite (y or n)? "); /* fprintf_va_42 */
         fflush(__fc_stderr);
         fgets(response,(int)(sizeof(response) - (unsigned int)1),__fc_stdin);
       }
@@ -2524,7 +2513,7 @@ static int check_ofname(void)
     if (tmp_7) tmp_8 = ((int)response[0] - 'A') + 'a';
     else tmp_8 = (int)response[0];
     if (tmp_8 != 'y') {
-      fprintf_va_43(__fc_stderr,"\tnot overwritten\n");
+      fprintf(__fc_stderr,"\tnot overwritten\n"); /* fprintf_va_43 */
       if (exit_code == 0) exit_code = 2;
       __retres = 1;
       goto return_label;
@@ -2533,7 +2522,7 @@ static int check_ofname(void)
   chmod((char const *)(ofname),(unsigned int)0777);
   tmp_9 = unlink((char const *)(ofname));
   if (tmp_9) {
-    fprintf_va_44(__fc_stderr,"%s: ",progname);
+    fprintf(__fc_stderr,"%s: ",progname); /* fprintf_va_44 */
     perror((char const *)(ofname));
     exit_code = 1;
     __retres = 1;
@@ -2578,7 +2567,7 @@ static void copy_stat(struct stat *ifstat)
   int tmp_0;
   tmp = chmod((char const *)(ofname),ifstat->st_mode & (unsigned int)07777);
   if (tmp) {
-    if (! quiet) fprintf_va_45(__fc_stderr,"%s: ",progname);
+    if (! quiet) fprintf(__fc_stderr,"%s: ",progname); /* fprintf_va_45 */
     if (exit_code == 0) exit_code = 2;
     if (! quiet) perror((char const *)(ofname));
   }
@@ -2587,7 +2576,7 @@ static void copy_stat(struct stat *ifstat)
   chmod((char const *)(ifname),(unsigned int)0777);
   tmp_0 = unlink((char const *)(ifname));
   if (tmp_0) {
-    if (! quiet) fprintf_va_46(__fc_stderr,"%s: ",progname);
+    if (! quiet) fprintf(__fc_stderr,"%s: ",progname); /* fprintf_va_46 */
     if (exit_code == 0) exit_code = 2;
     if (! quiet) perror((char const *)(ifname));
   }
@@ -2638,7 +2627,7 @@ static void treat_dir(char *dir)
   int len;
   dirp = opendir((char const *)dir);
   if (dirp == (DIR *)0) {
-    fprintf_va_47(__fc_stderr,"%s: %s unreadable\n",progname,dir);
+    fprintf(__fc_stderr,"%s: %s unreadable\n",progname,dir); /* fprintf_va_47 */
     exit_code = 1;
     goto return_label;
   }
@@ -2672,8 +2661,8 @@ static void treat_dir(char *dir)
         treat_file(nbuf);
       }
       else {
-        fprintf_va_48(__fc_stderr,"%s: %s/%s: pathname too long\n",progname,
-                      dir,dp->d_name);
+        fprintf(__fc_stderr,"%s: %s/%s: pathname too long\n",progname,dir,
+                dp->d_name); /* fprintf_va_48 */
         exit_code = 1;
       }
     }
@@ -4563,8 +4552,8 @@ int check_zipfile(int in)
                                                                   (h + 2) + 1)) << 8)) << 16)) != (unsigned long)0x04034b50L) {
       _LOR:
       {
-        fprintf_va_49(__fc_stderr,"\n%s: %s: not a valid zip file\n",
-                      progname,ifname);
+        fprintf(__fc_stderr,"\n%s: %s: not a valid zip file\n",progname,
+                ifname); /* fprintf_va_49 */
         exit_code = 1;
         __retres = 1;
         goto return_label;
@@ -4573,17 +4562,17 @@ int check_zipfile(int in)
   method = (int)*(h + 8);
   if (method != 0) 
     if (method != 8) {
-      fprintf_va_50(__fc_stderr,
-                    "\n%s: %s: first entry not deflated or stored -- use unzip\n",
-                    progname,ifname);
+      fprintf(__fc_stderr,
+              "\n%s: %s: first entry not deflated or stored -- use unzip\n",
+              progname,ifname); /* fprintf_va_50 */
       exit_code = 1;
       __retres = 1;
       goto return_label;
     }
   decrypt = (int)*(h + 6) & 1;
   if (decrypt != 0) {
-    fprintf_va_51(__fc_stderr,"\n%s: %s: encrypted file -- use unzip\n",
-                  progname,ifname);
+    fprintf(__fc_stderr,"\n%s: %s: encrypted file -- use unzip\n",progname,
+            ifname); /* fprintf_va_51 */
     exit_code = 1;
     __retres = 1;
     goto return_label;
@@ -4686,14 +4675,11 @@ int unzip(int in, int out)
                                     (int)((unsigned short)*(& inbuf[18] + 1)) << 8)) | (
                     (unsigned long)((int)((unsigned short)*((& inbuf[18] + 2) + 0)) | (
                                     (int)((unsigned short)*((& inbuf[18] + 2) + 1)) << 8)) << 16)) - (unsigned long)tmp_0) {
-          fprintf_va_52(__fc_stderr,"len %ld, siz %ld\n",(long)n_0,
-                        (long)((unsigned long)((int)((unsigned short)*(
-                                               & inbuf[18] + 0)) | ((int)((unsigned short)*(
-                                                                    & inbuf[18] + 1)) << 8)) | (
-                               (unsigned long)((int)((unsigned short)*(
-                                               (& inbuf[18] + 2) + 0)) | (
-                                               (int)((unsigned short)*(
-                                               (& inbuf[18] + 2) + 1)) << 8)) << 16)));
+          fprintf(__fc_stderr,"len %ld, siz %ld\n",(long)n_0,
+                  (long)((unsigned long)((int)((unsigned short)*(& inbuf[18] + 0)) | (
+                                         (int)((unsigned short)*(& inbuf[18] + 1)) << 8)) | (
+                         (unsigned long)((int)((unsigned short)*((& inbuf[18] + 2) + 0)) | (
+                                         (int)((unsigned short)*((& inbuf[18] + 2) + 1)) << 8)) << 16))); /* fprintf_va_52 */
           error((char *)"invalid compressed data--length mismatch");
         }
         while (1) {
@@ -4787,15 +4773,15 @@ int unzip(int in, int out)
            (unsigned long)((int)((unsigned short)*((& inbuf[inptr] + 2) + 0)) | (
                            (int)((unsigned short)*((& inbuf[inptr] + 2) + 1)) << 8)) << 16)) == (unsigned long)0x04034b50L) 
         if (to_stdout) {
-          if (! quiet) fprintf_va_53(__fc_stderr,
-                                     "%s: %s has more than one entry--rest ignored\n",
-                                     progname,ifname);
+          if (! quiet) fprintf(__fc_stderr,
+                               "%s: %s has more than one entry--rest ignored\n",
+                               progname,ifname); /* fprintf_va_53 */
           if (exit_code == 0) exit_code = 2;
         }
         else {
-          fprintf_va_54(__fc_stderr,
-                        "%s: %s has more than one entry -- unchanged\n",
-                        progname,ifname);
+          fprintf(__fc_stderr,
+                  "%s: %s has more than one entry -- unchanged\n",progname,
+                  ifname); /* fprintf_va_54 */
           exit_code = 1;
           pkzip = 0;
           ext_header = pkzip;
@@ -5823,7 +5809,7 @@ int inflate_dynamic(void)
   i = huft_build(ll,nl,(unsigned int)257,cplens,cplext,& tl,& bl);
   if (i != 0) {
     if (i == 1) {
-      fprintf_va_55(__fc_stderr," incomplete literal tree\n");
+      fprintf(__fc_stderr," incomplete literal tree\n"); /* fprintf_va_55 */
       huft_free(tl);
     }
     __retres = i;
@@ -5833,7 +5819,7 @@ int inflate_dynamic(void)
   i = huft_build(& ll[nl],nd,(unsigned int)0,cpdist,cpdext,& td,& bd);
   if (i != 0) {
     if (i == 1) {
-      fprintf_va_56(__fc_stderr," incomplete distance tree\n");
+      fprintf(__fc_stderr," incomplete distance tree\n"); /* fprintf_va_56 */
       huft_free(td);
     }
     huft_free(tl);
@@ -6233,7 +6219,7 @@ int fprintf_va_57(FILE * __restrict stream, char const * __restrict format,
 void error(char *m) __attribute__((__FC_OLDSTYLEPROTO__));
 void error(char *m)
 {
-  fprintf_va_57(__fc_stderr,"\n%s: %s: %s\n",progname,ifname,m);
+  fprintf(__fc_stderr,"\n%s: %s: %s\n",progname,ifname,m); /* fprintf_va_57 */
   abort_gzip();
   return;
 }
@@ -6261,8 +6247,8 @@ int fprintf_va_58(FILE * __restrict stream, char const * __restrict format,
 void warn(char *a, char *b) __attribute__((__FC_OLDSTYLEPROTO__));
 void warn(char *a, char *b)
 {
-  if (! quiet) fprintf_va_58(__fc_stderr,"%s: %s: warning: %s%s\n",progname,
-                             ifname,a,b);
+  if (! quiet) fprintf(__fc_stderr,"%s: %s: warning: %s%s\n",progname,ifname,
+                       a,b); /* fprintf_va_58 */
   if (exit_code == 0) exit_code = 2;
   return;
 }
@@ -6297,9 +6283,9 @@ int fprintf_va_60(FILE * __restrict stream, char const * __restrict format,
 
 void read_error(void)
 {
-  fprintf_va_59(__fc_stderr,"\n%s: ",progname);
+  fprintf(__fc_stderr,"\n%s: ",progname); /* fprintf_va_59 */
   if (__fc_errno != 0) perror((char const *)(ifname));
-  else fprintf_va_60(__fc_stderr,"%s: unexpected end of file\n",ifname);
+  else fprintf(__fc_stderr,"%s: unexpected end of file\n",ifname); /* fprintf_va_60 */
   abort_gzip();
   return;
 }
@@ -6320,7 +6306,7 @@ int fprintf_va_61(FILE * __restrict stream, char const * __restrict format,
 
 void write_error(void)
 {
-  fprintf_va_61(__fc_stderr,"\n%s: ",progname);
+  fprintf(__fc_stderr,"\n%s: ",progname); /* fprintf_va_61 */
   perror((char const *)(ofname));
   abort_gzip();
   return;
@@ -6353,7 +6339,7 @@ void display_ratio(long num, long den, FILE *file)
     ratio = - ratio;
   }
   else putc(' ',file);
-  fprintf_va_62(file,"%2ld.%1ld%%",ratio / 10L,ratio % 10L);
+  fprintf(file,"%2ld.%1ld%%",ratio / 10L,ratio % 10L); /* fprintf_va_62 */
   return;
 }
 
@@ -6644,7 +6630,7 @@ int lzw(int in, int out)
     goto return_label;
   }
   msg_done = 1;
-  fprintf_va_63(__fc_stderr,"output in compress .Z format not supported\n");
+  fprintf(__fc_stderr,"output in compress .Z format not supported\n"); /* fprintf_va_63 */
   if (in != out) exit_code = 1;
   __retres = 1;
   return_label: return __retres;
@@ -6713,18 +6699,17 @@ int unlzw(int in, int out)
   else maxbits = fill_inbuf(0);
   block_mode = maxbits & 0x80;
   if ((maxbits & 0x60) != 0) {
-    if (! quiet) fprintf_va_64(__fc_stderr,
-                               "\n%s: %s: warning, unknown flags 0x%x\n",
-                               progname,ifname,
-                               (unsigned int)(maxbits & 0x60));
+    if (! quiet) fprintf(__fc_stderr,
+                         "\n%s: %s: warning, unknown flags 0x%x\n",progname,
+                         ifname,(unsigned int)(maxbits & 0x60)); /* fprintf_va_64 */
     if (exit_code == 0) exit_code = 2;
   }
   maxbits &= 0x1f;
   maxmaxcode = 1L << maxbits;
   if (maxbits > 16) {
-    fprintf_va_65(__fc_stderr,
-                  "\n%s: %s: compressed with %d bits, can only handle %d bits\n",
-                  progname,ifname,maxbits,16);
+    fprintf(__fc_stderr,
+            "\n%s: %s: compressed with %d bits, can only handle %d bits\n",
+            progname,ifname,maxbits,16); /* fprintf_va_65 */
     exit_code = 1;
     __retres = 1;
     goto return_label;
@@ -7902,9 +7887,9 @@ int _getopt_internal(int argc, char * const *argv, char const *optstring,
             if (ambig) 
               if (! exact) {
                 int tmp_5;
-                if (opterr) fprintf_va_66(__fc_stderr,
-                                          "%s: option `%s\' is ambiguous\n",
-                                          *(argv + 0),*(argv + optind));
+                if (opterr) fprintf(__fc_stderr,
+                                    "%s: option `%s\' is ambiguous\n",
+                                    *(argv + 0),*(argv + optind)); /* fprintf_va_66 */
                 tmp_5 = my_strlen((char const *)nextchar);
                 nextchar += tmp_5;
                 optind ++;
@@ -7920,17 +7905,17 @@ int _getopt_internal(int argc, char * const *argv, char const *optstring,
                 else {
                   int tmp_6;
                   if (opterr) 
-                    if ((int)*(*(argv + (optind - 1)) + 1) == '-') fprintf_va_67
+                    if ((int)*(*(argv + (optind - 1)) + 1) == '-') fprintf
                                                                    (__fc_stderr,
                                                                     "%s: option `--%s\' doesn\'t allow an argument\n",
                                                                     *(
                                                                     argv + 0),
-                                                                    (char *)pfound->name);
-                    else fprintf_va_68(__fc_stderr,
-                                       "%s: option `%c%s\' doesn\'t allow an argument\n",
-                                       *(argv + 0),
-                                       (int)*(*(argv + (optind - 1)) + 0),
-                                       (char *)pfound->name);
+                                                                    (char *)pfound->name); /* fprintf_va_67 */
+                    else fprintf(__fc_stderr,
+                                 "%s: option `%c%s\' doesn\'t allow an argument\n",
+                                 *(argv + 0),
+                                 (int)*(*(argv + (optind - 1)) + 0),
+                                 (char *)pfound->name); /* fprintf_va_68 */
                   tmp_6 = my_strlen((char const *)nextchar);
                   nextchar += tmp_6;
                   __retres = '\000';
@@ -7947,10 +7932,9 @@ int _getopt_internal(int argc, char * const *argv, char const *optstring,
                   else {
                     int tmp_8;
                     int tmp_9;
-                    if (opterr) fprintf_va_69(__fc_stderr,
-                                              "%s: option `%s\' requires an argument\n",
-                                              *(argv + 0),
-                                              *(argv + (optind - 1)));
+                    if (opterr) fprintf(__fc_stderr,
+                                        "%s: option `%s\' requires an argument\n",
+                                        *(argv + 0),*(argv + (optind - 1))); /* fprintf_va_69 */
                     tmp_8 = my_strlen((char const *)nextchar);
                     nextchar += tmp_8;
                     if ((int)*(optstring + 0) == ':') tmp_9 = ':';
@@ -7979,16 +7963,15 @@ int _getopt_internal(int argc, char * const *argv, char const *optstring,
                   _LOR_1:
                   {
                     if (opterr) 
-                      if ((int)*(*(argv + optind) + 1) == '-') fprintf_va_70
+                      if ((int)*(*(argv + optind) + 1) == '-') fprintf
                                                                (__fc_stderr,
                                                                 "%s: unrecognized option `--%s\'\n",
                                                                 *(argv + 0),
-                                                                nextchar);
-                      else fprintf_va_71(__fc_stderr,
-                                         "%s: unrecognized option `%c%s\'\n",
-                                         *(argv + 0),
-                                         (int)*(*(argv + optind) + 0),
-                                         nextchar);
+                                                                nextchar); /* fprintf_va_70 */
+                      else fprintf(__fc_stderr,
+                                   "%s: unrecognized option `%c%s\'\n",
+                                   *(argv + 0),(int)*(*(argv + optind) + 0),
+                                   nextchar); /* fprintf_va_71 */
                     nextchar = (char *)"";
                     optind ++;
                     __retres = '\000';
@@ -8010,8 +7993,8 @@ int _getopt_internal(int argc, char * const *argv, char const *optstring,
       if ((int)c == ':') {
         _LOR_3:
         {
-          if (opterr) fprintf_va_72(__fc_stderr,"%s: illegal option -- %c\n",
-                                    *(argv + 0),(int)c);
+          if (opterr) fprintf(__fc_stderr,"%s: illegal option -- %c\n",
+                              *(argv + 0),(int)c); /* fprintf_va_72 */
           optopt = (int)c;
           __retres = '\000';
           goto return_label;
@@ -8033,9 +8016,9 @@ int _getopt_internal(int argc, char * const *argv, char const *optstring,
         }
         else 
           if (optind == argc) {
-            if (opterr) fprintf_va_73(__fc_stderr,
-                                      "%s: option requires an argument -- %c\n",
-                                      *(argv + 0),(int)c);
+            if (opterr) fprintf(__fc_stderr,
+                                "%s: option requires an argument -- %c\n",
+                                *(argv + 0),(int)c); /* fprintf_va_73 */
             optopt = (int)c;
             if ((int)*(optstring + 0) == ':') c = (char)':';
             else c = (char)'\000';
diff --git a/hiredis/.frama-c/hiredis-format.parse/framac.ast b/hiredis/.frama-c/hiredis-format.parse/framac.ast
index 9ea662a630e8a04d3ead0d828ee0c91dd8cf6ed6..d37bdc8571226fa4838f80963adbf15861cccba0 100644
--- a/hiredis/.frama-c/hiredis-format.parse/framac.ast
+++ b/hiredis/.frama-c/hiredis-format.parse/framac.ast
@@ -1557,8 +1557,8 @@ void redisProcessCallbacks(redisAsyncContext *ac)
         int tmp_0;
         if (((redisReply *)reply)->type == 6) {
           c->err = 2;
-          snprintf_va_1(c->errstr,sizeof(c->errstr),"%s",
-                        ((redisReply *)reply)->str);
+          snprintf(c->errstr,sizeof(c->errstr),"%s",
+                   ((redisReply *)reply)->str); /* snprintf_va_1 */
           (*(((c->reader)->fn)->freeObject))(reply);
           __redisAsyncDisconnect(ac);
           goto return_label;
@@ -2972,7 +2972,7 @@ int redisvFormatCommand(char **target, char const *format, va_list ap)
   totlen = (int)((uint32_t)totlen + (((uint32_t)1 + tmp_20) + (uint32_t)2));
   cmd = (char *)malloc((unsigned int)(totlen + 1));
   if (cmd == (char *)0) goto memory_err;
-  pos = sprintf_va_1(cmd,"*%d\r\n",argc);
+  pos = sprintf(cmd,"*%d\r\n",argc); /* sprintf_va_1 */
   j = 0;
   while (j < argc) {
     {
@@ -2984,7 +2984,7 @@ int redisvFormatCommand(char **target, char const *format, va_list ap)
       int tmp_26;
       tmp_21 = sdslen_0(*(curargv + j));
       ;
-      tmp_22 = sprintf_va_2(cmd + pos,"$%zu\r\n",tmp_21);
+      tmp_22 = sprintf(cmd + pos,"$%zu\r\n",tmp_21); /* sprintf_va_2 */
       pos += tmp_22;
       tmp_23 = sdslen_0(*(curargv + j));
       ;
@@ -3157,7 +3157,7 @@ int redisFormatCommandArgv(char **target, int argc, char const **argv,
     __retres = -1;
     goto return_label;
   }
-  pos = sprintf_va_3(cmd,"*%d\r\n",argc);
+  pos = sprintf(cmd,"*%d\r\n",argc); /* sprintf_va_3 */
   j = 0;
   while (j < argc) {
     {
@@ -3165,7 +3165,7 @@ int redisFormatCommandArgv(char **target, int argc, char const **argv,
       int tmp_4;
       int tmp_5;
       if (argvlen) len = *(argvlen + j); else len = strlen(*(argv + j));
-      tmp_3 = sprintf_va_4(cmd + pos,"$%zu\r\n",len);
+      tmp_3 = sprintf(cmd + pos,"$%zu\r\n",len); /* sprintf_va_4 */
       pos += tmp_3;
       memcpy((void *)(cmd + pos),(void const *)*(argv + j),len);
       pos = (int)((size_t)pos + len);
@@ -4080,7 +4080,7 @@ static void __redisSetErrorFromErrno(redisContext *c, int type,
   size_t len = (unsigned int)0;
   if (prefix != (char const *)0) {
     int tmp;
-    tmp = snprintf_va_2(buf,sizeof(buf),"%s: ",(char *)prefix);
+    tmp = snprintf(buf,sizeof(buf),"%s: ",(char *)prefix); /* snprintf_va_2 */
     len = (unsigned int)tmp;
   }
   strerror_r(errorno,& buf[len],sizeof(buf) - len);
@@ -4132,7 +4132,7 @@ static int redisSetBlocking(redisContext *c, int blocking)
   int __retres;
   int flags;
   int tmp;
-  flags = __va_fcntl_void(c->fd,3);
+  flags = fcntl(c->fd,3); /* __va_fcntl_void */
   if (flags == -1) {
     __redisSetErrorFromErrno(c,1,"fcntl(F_GETFL)");
     redisNetClose(c);
@@ -4140,7 +4140,7 @@ static int redisSetBlocking(redisContext *c, int blocking)
     goto return_label;
   }
   if (blocking) flags &= ~ 0x800; else flags |= 0x800;
-  tmp = __va_fcntl_int(c->fd,4,flags);
+  tmp = fcntl(c->fd,4,flags); /* __va_fcntl_int */
   if (tmp == -1) {
     __redisSetErrorFromErrno(c,1,"fcntl(F_SETFL)");
     redisNetClose(c);
@@ -4433,7 +4433,7 @@ static int _redisContextConnectTcp(redisContext *c, char const *addr,
       free((void *)c->tcp.source_addr);
       c->tcp.source_addr = hi_strdup(source_addr);
     }
-  snprintf_va_3(_port,(unsigned int)6,"%d",port);
+  snprintf(_port,(unsigned int)6,"%d",port); /* snprintf_va_3 */
   memset((void *)(& hints),0,sizeof(hints));
   hints.ai_family = 2;
   hints.ai_socktype = 1;
@@ -4471,7 +4471,7 @@ static int _redisContextConnectTcp(redisContext *c, char const *addr,
           char buf[128];
           char const *tmp_2;
           tmp_2 = gai_strerror(rv);
-          snprintf_va_4(buf,sizeof(buf),"Can\'t get addr: %s",(char *)tmp_2);
+          snprintf(buf,sizeof(buf),"Can\'t get addr: %s",(char *)tmp_2); /* snprintf_va_4 */
           __redisSetError(c,2,(char const *)(buf));
           goto error;
         }
@@ -4501,7 +4501,7 @@ static int _redisContextConnectTcp(redisContext *c, char const *addr,
           char buf_0[128];
           char *tmp_5;
           tmp_5 = strerror(__fc_errno);
-          snprintf_va_5(buf_0,sizeof(buf_0),"Can\'t bind socket: %s",tmp_5);
+          snprintf(buf_0,sizeof(buf_0),"Can\'t bind socket: %s",tmp_5); /* snprintf_va_5 */
           __redisSetError(c,2,(char const *)(buf_0));
           goto error;
         }
@@ -4558,7 +4558,7 @@ static int _redisContextConnectTcp(redisContext *c, char const *addr,
     char buf_1[128];
     char *tmp_10;
     tmp_10 = strerror(__fc_errno);
-    snprintf_va_6(buf_1,sizeof(buf_1),"Can\'t create socket: %s",tmp_10);
+    snprintf(buf_1,sizeof(buf_1),"Can\'t create socket: %s",tmp_10); /* snprintf_va_6 */
     __redisSetError(c,2,(char const *)(buf_1));
     goto error;
   }
@@ -4965,50 +4965,50 @@ static size_t chrtos(char *buf, size_t size, char byte)
     int tmp_7;
     case '\\': case '\"':
     { /* sequence */
-      tmp = snprintf_va_7(buf,size,"\"\\%c\"",(int)byte);
+      tmp = snprintf(buf,size,"\"\\%c\"",(int)byte); /* snprintf_va_7 */
       len = (unsigned int)tmp;
     }
     break;
     case '\n':
     { /* sequence */
-      tmp_0 = snprintf_va_8(buf,size,"\"\\n\"");
+      tmp_0 = snprintf(buf,size,"\"\\n\""); /* snprintf_va_8 */
       len = (unsigned int)tmp_0;
     }
     break;
     case '\r':
     { /* sequence */
-      tmp_1 = snprintf_va_9(buf,size,"\"\\r\"");
+      tmp_1 = snprintf(buf,size,"\"\\r\""); /* snprintf_va_9 */
       len = (unsigned int)tmp_1;
     }
     break;
     case '\t':
     { /* sequence */
-      tmp_2 = snprintf_va_10(buf,size,"\"\\t\"");
+      tmp_2 = snprintf(buf,size,"\"\\t\""); /* snprintf_va_10 */
       len = (unsigned int)tmp_2;
     }
     break;
     case '\a':
     { /* sequence */
-      tmp_3 = snprintf_va_11(buf,size,"\"\\a\"");
+      tmp_3 = snprintf(buf,size,"\"\\a\""); /* snprintf_va_11 */
       len = (unsigned int)tmp_3;
     }
     break;
     case '\b':
     { /* sequence */
-      tmp_4 = snprintf_va_12(buf,size,"\"\\b\"");
+      tmp_4 = snprintf(buf,size,"\"\\b\""); /* snprintf_va_12 */
       len = (unsigned int)tmp_4;
     }
     break;
     default: tmp_7 = isprint((int)byte);
     if (tmp_7) {
       int tmp_5;
-      tmp_5 = snprintf_va_13(buf,size,"\"%c\"",(int)byte);
+      tmp_5 = snprintf(buf,size,"\"%c\"",(int)byte); /* snprintf_va_13 */
       len = (unsigned int)tmp_5;
     }
     else {
       int tmp_6;
-      tmp_6 = snprintf_va_14(buf,size,"\"\\x%02x\"",
-                             (unsigned int)((int)((unsigned char)byte)));
+      tmp_6 = snprintf(buf,size,"\"\\x%02x\"",
+                       (unsigned int)((int)((unsigned char)byte))); /* snprintf_va_14 */
       len = (unsigned int)tmp_6;
     }
     break;
@@ -5036,8 +5036,8 @@ static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte)
   char cbuf[8];
   char sbuf[128];
   chrtos(cbuf,sizeof(cbuf),byte);
-  snprintf_va_15(sbuf,sizeof(sbuf),
-                 "Protocol error, got %s as reply type byte",cbuf);
+  snprintf(sbuf,sizeof(sbuf),"Protocol error, got %s as reply type byte",
+           cbuf); /* snprintf_va_15 */
   __redisReaderSetError(r,4,(char const *)(sbuf));
   return;
 }
@@ -7360,7 +7360,7 @@ static redisContext *select_database(redisContext *c)
   else {
     _LAND:
     {
-      printf_va_1("Database #9 is not empty, test can not continue\n");
+      printf("Database #9 is not empty, test can not continue\n"); /* printf_va_1 */
       exit(1);
     }
   }
@@ -7457,18 +7457,18 @@ static redisContext *do_connect(struct config config)
           redisContext *dummy_ctx = redisConnectUnix(config.unix_sock.path);
           if (dummy_ctx) {
             int fd = disconnect(dummy_ctx,1);
-            printf_va_2("Connecting to inherited fd %d\n",fd);
+            printf("Connecting to inherited fd %d\n",fd); /* printf_va_2 */
             c = redisConnectFd(fd);
           }
         }
         else __FC_assert((void *)0 != (void *)0,"test.c",148,"NULL");
   if (c == (redisContext *)0) {
-    printf_va_3("Connection error: can\'t allocate redis context\n");
+    printf("Connection error: can\'t allocate redis context\n"); /* printf_va_3 */
     exit(1);
   }
   else 
     if (c->err) {
-      printf_va_4("Connection error: %s\n",c->errstr);
+      printf("Connection error: %s\n",c->errstr); /* printf_va_4 */
       redisFree(c);
       exit(1);
     }
@@ -8678,8 +8678,8 @@ static void test_format_commands(void)
   int tmp_20;
   int tmp_21;
   tests ++;
-  printf_va_5("#%02d ",tests);
-  printf_va_6("Format command without interpolation: ");
+  printf("#%02d ",tests); /* printf_va_5 */
+  printf("Format command without interpolation: "); /* printf_va_6 */
   {
     void *__va_args[1] = {(void *)0};
     len = redisFormatCommand(& cmd,"SET foo bar",(void * const *)(__va_args));
@@ -8689,19 +8689,20 @@ static void test_format_commands(void)
                 (unsigned int)len);
   if (tmp == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_7("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_7 */
     else goto _LAND;
   }
   else {
-    _LAND: {
-             printf_va_8("\033[0;31mFAILED\033[0;0m\n");
-             fails ++;
-           }
+    _LAND:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_8 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_9("#%02d ",tests);
-  printf_va_10("Format command with %%s string interpolation: ");
+  printf("#%02d ",tests); /* printf_va_9 */
+  printf("Format command with %%s string interpolation: "); /* printf_va_10 */
   {
     char const *__va_arg0 = "foo";
     char const *__va_arg1 = "bar";
@@ -8714,19 +8715,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_0 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_11("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_11 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_12("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_12 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_13("#%02d ",tests);
-  printf_va_14("Format command with %%s and an empty string: ");
+  printf("#%02d ",tests); /* printf_va_13 */
+  printf("Format command with %%s and an empty string: "); /* printf_va_14 */
   {
     char const *__va_arg0_48 = "foo";
     char const *__va_arg1_50 = "";
@@ -8739,19 +8741,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_1 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (0 + 2)) 
-      printf_va_15("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_15 */
     else goto _LAND_1;
   }
   else {
-    _LAND_1: {
-               printf_va_16("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_1:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_16 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_17("#%02d ",tests);
-  printf_va_18("Format command with an empty string in between proper interpolations: ");
+  printf("#%02d ",tests); /* printf_va_17 */
+  printf("Format command with an empty string in between proper interpolations: "); /* printf_va_18 */
   {
     char const *__va_arg0_54 = "";
     char const *__va_arg1_56 = "foo";
@@ -8764,19 +8767,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_2 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (0 + 2)) + 4) + (3 + 2)) 
-      printf_va_19("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_19 */
     else goto _LAND_2;
   }
   else {
-    _LAND_2: {
-               printf_va_20("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_2:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_20 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_21("#%02d ",tests);
-  printf_va_22("Format command with %%b string interpolation: ");
+  printf("#%02d ",tests); /* printf_va_21 */
+  printf("Format command with %%b string interpolation: "); /* printf_va_22 */
   {
     char const *__va_arg0_60 = "foo";
     unsigned int __va_arg1_62 = (unsigned int)3;
@@ -8792,19 +8796,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_3 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_23("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_23 */
     else goto _LAND_3;
   }
   else {
-    _LAND_3: {
-               printf_va_24("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_3:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_24 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_25("#%02d ",tests);
-  printf_va_26("Format command with %%b and an empty string: ");
+  printf("#%02d ",tests); /* printf_va_25 */
+  printf("Format command with %%b and an empty string: "); /* printf_va_26 */
   {
     char const *__va_arg0_68 = "foo";
     unsigned int __va_arg1_70 = (unsigned int)3;
@@ -8820,19 +8825,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_4 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (0 + 2)) 
-      printf_va_27("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_27 */
     else goto _LAND_4;
   }
   else {
-    _LAND_4: {
-               printf_va_28("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_4:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_28 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_29("#%02d ",tests);
-  printf_va_30("Format command with literal %%: ");
+  printf("#%02d ",tests); /* printf_va_29 */
+  printf("Format command with literal %%: "); /* printf_va_30 */
   {
     void *__va_args_78[1] = {(void *)0};
     len = redisFormatCommand(& cmd,"SET %% %%",
@@ -8843,22 +8849,23 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_5 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (1 + 2)) + 4) + (1 + 2)) 
-      printf_va_31("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_31 */
     else goto _LAND_5;
   }
   else {
-    _LAND_5: {
-               printf_va_32("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_5:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_32 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   {
     int tmp_6;
     int value = 123;
     tests ++;
-    printf_va_33("#%02d ",tests);
-    printf_va_34("Format command with printf-delegation (int): ");
+    printf("#%02d ",tests); /* printf_va_33 */
+    printf("Format command with printf-delegation (int): "); /* printf_va_34 */
     {
       int __va_arg0_80 = value;
       char const *__va_arg1_82 = "hello";
@@ -8870,14 +8877,15 @@ static void test_format_commands(void)
                     "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                     (unsigned int)len);
     if (tmp_6 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_35("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_35 */
       else goto _LAND_6;
     }
     else {
-      _LAND_6: {
-                 printf_va_36("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_6:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_36 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8885,8 +8893,8 @@ static void test_format_commands(void)
     int tmp_7;
     char value_0 = (char)123;
     tests ++;
-    printf_va_37("#%02d ",tests);
-    printf_va_38("Format command with printf-delegation (char): ");
+    printf("#%02d ",tests); /* printf_va_37 */
+    printf("Format command with printf-delegation (char): "); /* printf_va_38 */
     {
       int __va_arg0_86 = (int)value_0;
       char const *__va_arg1_88 = "hello";
@@ -8898,14 +8906,15 @@ static void test_format_commands(void)
                     "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                     (unsigned int)len);
     if (tmp_7 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_39("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_39 */
       else goto _LAND_7;
     }
     else {
-      _LAND_7: {
-                 printf_va_40("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_7:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_40 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8913,8 +8922,8 @@ static void test_format_commands(void)
     int tmp_8;
     short value_1 = (short)123;
     tests ++;
-    printf_va_41("#%02d ",tests);
-    printf_va_42("Format command with printf-delegation (short): ");
+    printf("#%02d ",tests); /* printf_va_41 */
+    printf("Format command with printf-delegation (short): "); /* printf_va_42 */
     {
       int __va_arg0_92 = (int)value_1;
       char const *__va_arg1_94 = "hello";
@@ -8926,14 +8935,15 @@ static void test_format_commands(void)
                     "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                     (unsigned int)len);
     if (tmp_8 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_43("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_43 */
       else goto _LAND_8;
     }
     else {
-      _LAND_8: {
-                 printf_va_44("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_8:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_44 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8941,8 +8951,8 @@ static void test_format_commands(void)
     int tmp_9;
     long value_2 = (long)123;
     tests ++;
-    printf_va_45("#%02d ",tests);
-    printf_va_46("Format command with printf-delegation (long): ");
+    printf("#%02d ",tests); /* printf_va_45 */
+    printf("Format command with printf-delegation (long): "); /* printf_va_46 */
     {
       long __va_arg0_98 = value_2;
       char const *__va_arg1_100 = "hello";
@@ -8954,14 +8964,15 @@ static void test_format_commands(void)
                     "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                     (unsigned int)len);
     if (tmp_9 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_47("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_47 */
       else goto _LAND_9;
     }
     else {
-      _LAND_9: {
-                 printf_va_48("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_9:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_48 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8969,8 +8980,8 @@ static void test_format_commands(void)
     int tmp_10;
     long long value_3 = (long long)123;
     tests ++;
-    printf_va_49("#%02d ",tests);
-    printf_va_50("Format command with printf-delegation (long long): ");
+    printf("#%02d ",tests); /* printf_va_49 */
+    printf("Format command with printf-delegation (long long): "); /* printf_va_50 */
     {
       long long __va_arg0_104 = value_3;
       char const *__va_arg1_106 = "hello";
@@ -8982,14 +8993,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_10 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_51("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_51 */
       else goto _LAND_10;
     }
     else {
-      _LAND_10: {
-                  printf_va_52("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_10:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_52 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8997,8 +9009,8 @@ static void test_format_commands(void)
     int tmp_11;
     unsigned int value_4 = (unsigned int)123;
     tests ++;
-    printf_va_53("#%02d ",tests);
-    printf_va_54("Format command with printf-delegation (unsigned int): ");
+    printf("#%02d ",tests); /* printf_va_53 */
+    printf("Format command with printf-delegation (unsigned int): "); /* printf_va_54 */
     {
       unsigned int __va_arg0_110 = value_4;
       char const *__va_arg1_112 = "hello";
@@ -9010,14 +9022,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_11 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_55("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_55 */
       else goto _LAND_11;
     }
     else {
-      _LAND_11: {
-                  printf_va_56("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_11:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_56 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9025,8 +9038,8 @@ static void test_format_commands(void)
     int tmp_12;
     unsigned char value_5 = (unsigned char)123;
     tests ++;
-    printf_va_57("#%02d ",tests);
-    printf_va_58("Format command with printf-delegation (unsigned char): ");
+    printf("#%02d ",tests); /* printf_va_57 */
+    printf("Format command with printf-delegation (unsigned char): "); /* printf_va_58 */
     {
       int __va_arg0_116 = (int)value_5;
       char const *__va_arg1_118 = "hello";
@@ -9038,14 +9051,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_12 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_59("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_59 */
       else goto _LAND_12;
     }
     else {
-      _LAND_12: {
-                  printf_va_60("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_12:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_60 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9053,8 +9067,8 @@ static void test_format_commands(void)
     int tmp_13;
     unsigned short value_6 = (unsigned short)123;
     tests ++;
-    printf_va_61("#%02d ",tests);
-    printf_va_62("Format command with printf-delegation (unsigned short): ");
+    printf("#%02d ",tests); /* printf_va_61 */
+    printf("Format command with printf-delegation (unsigned short): "); /* printf_va_62 */
     {
       int __va_arg0_122 = (int)value_6;
       char const *__va_arg1_124 = "hello";
@@ -9066,14 +9080,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_13 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_63("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_63 */
       else goto _LAND_13;
     }
     else {
-      _LAND_13: {
-                  printf_va_64("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_13:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_64 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9081,8 +9096,8 @@ static void test_format_commands(void)
     int tmp_14;
     unsigned long value_7 = (unsigned long)123;
     tests ++;
-    printf_va_65("#%02d ",tests);
-    printf_va_66("Format command with printf-delegation (unsigned long): ");
+    printf("#%02d ",tests); /* printf_va_65 */
+    printf("Format command with printf-delegation (unsigned long): "); /* printf_va_66 */
     {
       unsigned long __va_arg0_128 = value_7;
       char const *__va_arg1_130 = "hello";
@@ -9094,14 +9109,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_14 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_67("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_67 */
       else goto _LAND_14;
     }
     else {
-      _LAND_14: {
-                  printf_va_68("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_14:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_68 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9109,8 +9125,8 @@ static void test_format_commands(void)
     int tmp_15;
     unsigned long long value_8 = (unsigned long long)123;
     tests ++;
-    printf_va_69("#%02d ",tests);
-    printf_va_70("Format command with printf-delegation (unsigned long long): ");
+    printf("#%02d ",tests); /* printf_va_69 */
+    printf("Format command with printf-delegation (unsigned long long): "); /* printf_va_70 */
     {
       unsigned long long __va_arg0_134 = value_8;
       char const *__va_arg1_136 = "hello";
@@ -9122,14 +9138,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_15 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_71("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_71 */
       else goto _LAND_15;
     }
     else {
-      _LAND_15: {
-                  printf_va_72("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_15:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_72 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9137,8 +9154,8 @@ static void test_format_commands(void)
     int tmp_16;
     float value_9 = (float)123.0;
     tests ++;
-    printf_va_73("#%02d ",tests);
-    printf_va_74("Format command with printf-delegation (float): ");
+    printf("#%02d ",tests); /* printf_va_73 */
+    printf("Format command with printf-delegation (float): "); /* printf_va_74 */
     {
       double __va_arg0_140 = (double)value_9;
       char const *__va_arg1_142 = "hello";
@@ -9150,14 +9167,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_16 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_75("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_75 */
       else goto _LAND_16;
     }
     else {
-      _LAND_16: {
-                  printf_va_76("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_16:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_76 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9165,8 +9183,8 @@ static void test_format_commands(void)
     int tmp_17;
     double value_10 = 123.0;
     tests ++;
-    printf_va_77("#%02d ",tests);
-    printf_va_78("Format command with printf-delegation (double): ");
+    printf("#%02d ",tests); /* printf_va_77 */
+    printf("Format command with printf-delegation (double): "); /* printf_va_78 */
     {
       double __va_arg0_146 = value_10;
       char const *__va_arg1_148 = "hello";
@@ -9178,20 +9196,21 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_17 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_79("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_79 */
       else goto _LAND_17;
     }
     else {
-      _LAND_17: {
-                  printf_va_80("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_17:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_80 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
   tests ++;
-  printf_va_81("#%02d ",tests);
-  printf_va_82("Format command with invalid printf format: ");
+  printf("#%02d ",tests); /* printf_va_81 */
+  printf("Format command with invalid printf format: "); /* printf_va_82 */
   {
     void *__va_arg0_152 = (void *)1234;
     char const *__va_arg1_154 = "foo";
@@ -9201,9 +9220,9 @@ static void test_format_commands(void)
     len = redisFormatCommand(& cmd,"key:%08p %b",
                              (void * const *)(__va_args_158));
   }
-  if (len == -1) printf_va_83("\033[0;32mPASSED\033[0;0m\n");
+  if (len == -1) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_83 */
   else {
-    printf_va_84("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_84 */
     fails ++;
   }
   argv[0] = "SET";
@@ -9212,81 +9231,85 @@ static void test_format_commands(void)
   size_t lens[3] = {(unsigned int)3, (unsigned int)7, (unsigned int)3};
   int argc = 3;
   tests ++;
-  printf_va_85("#%02d ",tests);
-  printf_va_86("Format command by passing argc/argv without lengths: ");
+  printf("#%02d ",tests); /* printf_va_85 */
+  printf("Format command by passing argc/argv without lengths: "); /* printf_va_86 */
   len = redisFormatCommandArgv(& cmd,argc,argv,(size_t const *)0);
   tmp_18 = strncmp((char const *)cmd,
                    "*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",
                    (unsigned int)len);
   if (tmp_18 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_87("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_87 */
     else goto _LAND_18;
   }
   else {
-    _LAND_18: {
-                printf_va_88("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_18:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_88 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_89("#%02d ",tests);
-  printf_va_90("Format command by passing argc/argv with lengths: ");
+  printf("#%02d ",tests); /* printf_va_89 */
+  printf("Format command by passing argc/argv with lengths: "); /* printf_va_90 */
   len = redisFormatCommandArgv(& cmd,argc,argv,(size_t const *)(lens));
   tmp_19 = strncmp((char const *)cmd,
                    "*3\r\n$3\r\nSET\r\n$7\r\nfoo\000xxx\r\n$3\r\nbar\r\n",
                    (unsigned int)len);
   if (tmp_19 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (7 + 2)) + 4) + (3 + 2)) 
-      printf_va_91("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_91 */
     else goto _LAND_19;
   }
   else {
-    _LAND_19: {
-                printf_va_92("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_19:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_92 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   sds_cmd = (char *)0;
   tests ++;
-  printf_va_93("#%02d ",tests);
-  printf_va_94("Format command into sds by passing argc/argv without lengths: ");
+  printf("#%02d ",tests); /* printf_va_93 */
+  printf("Format command into sds by passing argc/argv without lengths: "); /* printf_va_94 */
   len = redisFormatSdsCommandArgv(& sds_cmd,argc,argv,(size_t const *)0);
   tmp_20 = strncmp((char const *)sds_cmd,
                    "*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",
                    (unsigned int)len);
   if (tmp_20 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_95("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_95 */
     else goto _LAND_20;
   }
   else {
-    _LAND_20: {
-                printf_va_96("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_20:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_96 */
+      fails ++;
+    }
   }
   sdsfree(sds_cmd);
   sds_cmd = (char *)0;
   tests ++;
-  printf_va_97("#%02d ",tests);
-  printf_va_98("Format command into sds by passing argc/argv with lengths: ");
+  printf("#%02d ",tests); /* printf_va_97 */
+  printf("Format command into sds by passing argc/argv with lengths: "); /* printf_va_98 */
   len = redisFormatSdsCommandArgv(& sds_cmd,argc,argv,(size_t const *)(lens));
   tmp_21 = strncmp((char const *)sds_cmd,
                    "*3\r\n$3\r\nSET\r\n$7\r\nfoo\000xxx\r\n$3\r\nbar\r\n",
                    (unsigned int)len);
   if (tmp_21 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (7 + 2)) + 4) + (3 + 2)) 
-      printf_va_99("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_99 */
     else goto _LAND_21;
   }
   else {
-    _LAND_21: {
-                printf_va_100("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_21:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_100 */
+      fails ++;
+    }
   }
   sdsfree(sds_cmd);
   return;
@@ -9351,16 +9374,16 @@ static void test_append_formatted_commands(struct config config)
   int tmp_0;
   c = do_connect(config);
   tests ++;
-  printf_va_101("#%02d ",tests);
-  printf_va_102("Append format command: ");
+  printf("#%02d ",tests); /* printf_va_101 */
+  printf("Append format command: "); /* printf_va_102 */
   {
     void *__va_args[1] = {(void *)0};
     len = redisFormatCommand(& cmd,"SET foo bar",(void * const *)(__va_args));
   }
   tmp = redisAppendFormattedCommand(c,(char const *)cmd,(unsigned int)len);
-  if (tmp == 0) printf_va_103("\033[0;32mPASSED\033[0;0m\n");
+  if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_103 */
   else {
-    printf_va_104("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_104 */
     fails ++;
   }
   tmp_0 = redisGetReply(c,(void **)(& reply));
@@ -10115,8 +10138,8 @@ static void test_reply_reader(void)
   int i;
   int tmp_8;
   tests ++;
-  printf_va_105("#%02d ",tests);
-  printf_va_106("Error handling in reply parser: ");
+  printf("#%02d ",tests); /* printf_va_105 */
+  printf("Error handling in reply parser: "); /* printf_va_106 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"@foo\r\n",(unsigned int)6);
   ret = redisReaderGetReply(reader,(void **)0);
@@ -10124,19 +10147,20 @@ static void test_reply_reader(void)
     int tmp;
     tmp = strcasecmp((char const *)(reader->errstr),
                      "Protocol error, got \"@\" as reply type byte");
-    if (tmp == 0) printf_va_107("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_107 */
     else goto _LAND;
   }
   else {
-    _LAND: {
-             printf_va_108("\033[0;31mFAILED\033[0;0m\n");
-             fails ++;
-           }
+    _LAND:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_108 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_109("#%02d ",tests);
-  printf_va_110("Memory cleanup in reply parser: ");
+  printf("#%02d ",tests); /* printf_va_109 */
+  printf("Memory cleanup in reply parser: "); /* printf_va_110 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"*2\r\n",(unsigned int)4);
   redisReaderFeed(reader,"$5\r\nhello\r\n",(unsigned int)11);
@@ -10146,19 +10170,20 @@ static void test_reply_reader(void)
     int tmp_0;
     tmp_0 = strcasecmp((char const *)(reader->errstr),
                        "Protocol error, got \"@\" as reply type byte");
-    if (tmp_0 == 0) printf_va_111("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_0 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_111 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_112("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_112 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_113("#%02d ",tests);
-  printf_va_114("Set error on nested multi bulks with depth > 7: ");
+  printf("#%02d ",tests); /* printf_va_113 */
+  printf("Set error on nested multi bulks with depth > 7: "); /* printf_va_114 */
   reader = redisReaderCreate();
   i = 0;
   while (i < 9) {
@@ -10170,103 +10195,108 @@ static void test_reply_reader(void)
     int tmp_1;
     tmp_1 = strncasecmp((char const *)(reader->errstr),"No support for",
                         (unsigned int)14);
-    if (tmp_1 == 0) printf_va_115("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_1 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_115 */
     else goto _LAND_1;
   }
   else {
-    _LAND_1: {
-               printf_va_116("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_1:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_116 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_117("#%02d ",tests);
-  printf_va_118("Correctly parses LLONG_MAX: ");
+  printf("#%02d ",tests); /* printf_va_117 */
+  printf("Correctly parses LLONG_MAX: "); /* printf_va_118 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,":9223372036854775807\r\n",(unsigned int)22);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
     if (((redisReply *)reply)->type == 3) {
-      if (((redisReply *)reply)->integer == 9223372036854775807LL) printf_va_119
-                                                                   ("\033[0;32mPASSED\033[0;0m\n");
+      if (((redisReply *)reply)->integer == 9223372036854775807LL) printf
+                                                                   ("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_119 */
       else goto _LAND_3;
     }
     else goto _LAND_3;
   }
   else {
-    _LAND_3: {
-               printf_va_120("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_3:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_120 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_121("#%02d ",tests);
-  printf_va_122("Set error when > LLONG_MAX: ");
+  printf("#%02d ",tests); /* printf_va_121 */
+  printf("Set error when > LLONG_MAX: "); /* printf_va_122 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,":9223372036854775808\r\n",(unsigned int)22);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == -1) {
     int tmp_2;
     tmp_2 = strcasecmp((char const *)(reader->errstr),"Bad integer value");
-    if (tmp_2 == 0) printf_va_123("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_2 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_123 */
     else goto _LAND_4;
   }
   else {
-    _LAND_4: {
-               printf_va_124("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_4:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_124 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_125("#%02d ",tests);
-  printf_va_126("Correctly parses LLONG_MIN: ");
+  printf("#%02d ",tests); /* printf_va_125 */
+  printf("Correctly parses LLONG_MIN: "); /* printf_va_126 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,":-9223372036854775808\r\n",(unsigned int)23);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
     if (((redisReply *)reply)->type == 3) {
       if (((redisReply *)reply)->integer == -9223372036854775807LL - 1LL) 
-        printf_va_127("\033[0;32mPASSED\033[0;0m\n");
+        printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_127 */
       else goto _LAND_6;
     }
     else goto _LAND_6;
   }
   else {
-    _LAND_6: {
-               printf_va_128("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_6:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_128 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_129("#%02d ",tests);
-  printf_va_130("Set error when < LLONG_MIN: ");
+  printf("#%02d ",tests); /* printf_va_129 */
+  printf("Set error when < LLONG_MIN: "); /* printf_va_130 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,":-9223372036854775809\r\n",(unsigned int)23);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == -1) {
     int tmp_3;
     tmp_3 = strcasecmp((char const *)(reader->errstr),"Bad integer value");
-    if (tmp_3 == 0) printf_va_131("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_3 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_131 */
     else goto _LAND_7;
   }
   else {
-    _LAND_7: {
-               printf_va_132("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_7:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_132 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_133("#%02d ",tests);
-  printf_va_134("Set error when array < -1: ");
+  printf("#%02d ",tests); /* printf_va_133 */
+  printf("Set error when array < -1: "); /* printf_va_134 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"*-2\r\n+asdf\r\n",(unsigned int)12);
   ret = redisReaderGetReply(reader,& reply);
@@ -10274,20 +10304,21 @@ static void test_reply_reader(void)
     int tmp_4;
     tmp_4 = strcasecmp((char const *)(reader->errstr),
                        "Multi-bulk length out of range");
-    if (tmp_4 == 0) printf_va_135("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_4 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_135 */
     else goto _LAND_8;
   }
   else {
-    _LAND_8: {
-               printf_va_136("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_8:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_136 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_137("#%02d ",tests);
-  printf_va_138("Set error when bulk < -1: ");
+  printf("#%02d ",tests); /* printf_va_137 */
+  printf("Set error when bulk < -1: "); /* printf_va_138 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"$-2\r\nasdf\r\n",(unsigned int)11);
   ret = redisReaderGetReply(reader,& reply);
@@ -10295,20 +10326,21 @@ static void test_reply_reader(void)
     int tmp_5;
     tmp_5 = strcasecmp((char const *)(reader->errstr),
                        "Bulk string length out of range");
-    if (tmp_5 == 0) printf_va_139("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_5 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_139 */
     else goto _LAND_9;
   }
   else {
-    _LAND_9: {
-               printf_va_140("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_9:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_140 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_141("#%02d ",tests);
-  printf_va_142("Set error when array > SIZE_MAX: ");
+  printf("#%02d ",tests); /* printf_va_141 */
+  printf("Set error when array > SIZE_MAX: "); /* printf_va_142 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"*9223372036854775807\r\n+asdf\r\n",
                   (unsigned int)29);
@@ -10317,20 +10349,21 @@ static void test_reply_reader(void)
     int tmp_6;
     tmp_6 = strcasecmp((char const *)(reader->errstr),
                        "Multi-bulk length out of range");
-    if (tmp_6 == 0) printf_va_143("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_6 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_143 */
     else goto _LAND_10;
   }
   else {
-    _LAND_10: {
-                printf_va_144("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_10:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_144 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_145("#%02d ",tests);
-  printf_va_146("Set error when bulk > SIZE_MAX: ");
+  printf("#%02d ",tests); /* printf_va_145 */
+  printf("Set error when bulk > SIZE_MAX: "); /* printf_va_146 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"$9223372036854775807\r\nasdf\r\n",(unsigned int)28);
   ret = redisReaderGetReply(reader,& reply);
@@ -10338,38 +10371,40 @@ static void test_reply_reader(void)
     int tmp_7;
     tmp_7 = strcasecmp((char const *)(reader->errstr),
                        "Bulk string length out of range");
-    if (tmp_7 == 0) printf_va_147("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_7 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_147 */
     else goto _LAND_11;
   }
   else {
-    _LAND_11: {
-                printf_va_148("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_11:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_148 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_149("#%02d ",tests);
-  printf_va_150("Works with NULL functions for reply: ");
+  printf("#%02d ",tests); /* printf_va_149 */
+  printf("Works with NULL functions for reply: "); /* printf_va_150 */
   reader = redisReaderCreate();
   reader->fn = (redisReplyObjectFunctions *)0;
   redisReaderFeed(reader,"+OK\r\n",(unsigned int)5);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
-    if (reply == (void *)5) printf_va_151("\033[0;32mPASSED\033[0;0m\n");
+    if (reply == (void *)5) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_151 */
     else goto _LAND_12;
   }
   else {
-    _LAND_12: {
-                printf_va_152("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_12:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_152 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_153("#%02d ",tests);
-  printf_va_154("Works when a single newline (\\r\\n) covers two calls to feed: ");
+  printf("#%02d ",tests); /* printf_va_153 */
+  printf("Works when a single newline (\\r\\n) covers two calls to feed: "); /* printf_va_154 */
   reader = redisReaderCreate();
   reader->fn = (redisReplyObjectFunctions *)0;
   redisReaderFeed(reader,"+OK\r",(unsigned int)4);
@@ -10381,19 +10416,20 @@ static void test_reply_reader(void)
   redisReaderFeed(reader,"\n",(unsigned int)1);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
-    if (reply == (void *)5) printf_va_155("\033[0;32mPASSED\033[0;0m\n");
+    if (reply == (void *)5) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_155 */
     else goto _LAND_13;
   }
   else {
-    _LAND_13: {
-                printf_va_156("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_13:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_156 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_157("#%02d ",tests);
-  printf_va_158("Don\'t reset state after protocol error: ");
+  printf("#%02d ",tests); /* printf_va_157 */
+  printf("Don\'t reset state after protocol error: "); /* printf_va_158 */
   reader = redisReaderCreate();
   reader->fn = (redisReplyObjectFunctions *)0;
   redisReaderFeed(reader,"x",(unsigned int)1);
@@ -10401,35 +10437,36 @@ static void test_reply_reader(void)
   __FC_assert((ret == -1) != 0,"test.c",455,"ret == REDIS_ERR");
   ret = redisReaderGetReply(reader,& reply);
   if (ret == -1) {
-    if (reply == (void *)0) printf_va_159("\033[0;32mPASSED\033[0;0m\n");
+    if (reply == (void *)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_159 */
     else goto _LAND_14;
   }
   else {
-    _LAND_14: {
-                printf_va_160("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_14:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_160 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_161("#%02d ",tests);
-  printf_va_162("Don\'t do empty allocation for empty multi bulk: ");
+  printf("#%02d ",tests); /* printf_va_161 */
+  printf("Don\'t do empty allocation for empty multi bulk: "); /* printf_va_162 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"*0\r\n",(unsigned int)4);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
     if (((redisReply *)reply)->type == 2) {
-      if (((redisReply *)reply)->elements == (size_t)0) printf_va_163
-                                                        ("\033[0;32mPASSED\033[0;0m\n");
+      if (((redisReply *)reply)->elements == (size_t)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_163 */
       else goto _LAND_16;
     }
     else goto _LAND_16;
   }
   else {
-    _LAND_16: {
-                printf_va_164("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_16:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_164 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
@@ -10539,21 +10576,21 @@ static void test_free_null(void)
   void *redisCtx = (void *)0;
   void *reply = (void *)0;
   tests ++;
-  printf_va_165("#%02d ",tests);
-  printf_va_166("Don\'t fail when redisFree is passed a NULL value: ");
+  printf("#%02d ",tests); /* printf_va_165 */
+  printf("Don\'t fail when redisFree is passed a NULL value: "); /* printf_va_166 */
   redisFree((redisContext *)redisCtx);
-  if (redisCtx == (void *)0) printf_va_167("\033[0;32mPASSED\033[0;0m\n");
+  if (redisCtx == (void *)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_167 */
   else {
-    printf_va_168("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_168 */
     fails ++;
   }
   tests ++;
-  printf_va_169("#%02d ",tests);
-  printf_va_170("Don\'t fail when freeReplyObject is passed a NULL value: ");
+  printf("#%02d ",tests); /* printf_va_169 */
+  printf("Don\'t fail when freeReplyObject is passed a NULL value: "); /* printf_va_170 */
   freeReplyObject(reply);
-  if (reply == (void *)0) printf_va_171("\033[0;32mPASSED\033[0;0m\n");
+  if (reply == (void *)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_171 */
   else {
-    printf_va_172("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_172 */
     fails ++;
   }
   return;
@@ -10832,52 +10869,52 @@ static void test_blocking_connection_errors(void)
                 (struct addrinfo const *)(& hints),& ai_tmp);
   if (rv != 0) {
     tests ++;
-    printf_va_173("#%02d ",tests);
-    printf_va_174("Returns error when host cannot be resolved: ");
+    printf("#%02d ",tests); /* printf_va_173 */
+    printf("Returns error when host cannot be resolved: "); /* printf_va_174 */
     c = redisConnect("idontexist-noreally.com",6379);
     if (c->err == 2) {
       int tmp_0;
       tmp_0 = strcmp((char const *)(c->errstr),"Name or service not known");
-      if (tmp_0 == 0) printf_va_175("\033[0;32mPASSED\033[0;0m\n");
+      if (tmp_0 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_175 */
       else {
         int tmp_1;
         tmp_1 = strcmp((char const *)(c->errstr),
                        "Can\'t resolve: idontexist-noreally.com");
-        if (tmp_1 == 0) printf_va_176("\033[0;32mPASSED\033[0;0m\n");
+        if (tmp_1 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_176 */
         else {
           int tmp_2;
           tmp_2 = strcmp((char const *)(c->errstr),"Name does not resolve");
-          if (tmp_2 == 0) printf_va_177("\033[0;32mPASSED\033[0;0m\n");
+          if (tmp_2 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_177 */
           else {
             int tmp_3;
             tmp_3 = strcmp((char const *)(c->errstr),
                            "nodename nor servname provided, or not known");
-            if (tmp_3 == 0) printf_va_178("\033[0;32mPASSED\033[0;0m\n");
+            if (tmp_3 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_178 */
             else {
               int tmp_4;
               tmp_4 = strcmp((char const *)(c->errstr),
                              "No address associated with hostname");
-              if (tmp_4 == 0) printf_va_179("\033[0;32mPASSED\033[0;0m\n");
+              if (tmp_4 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_179 */
               else {
                 int tmp_5;
                 tmp_5 = strcmp((char const *)(c->errstr),
                                "Temporary failure in name resolution");
-                if (tmp_5 == 0) printf_va_180("\033[0;32mPASSED\033[0;0m\n");
+                if (tmp_5 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_180 */
                 else {
                   int tmp_6;
                   tmp_6 = strcmp((char const *)(c->errstr),
                                  "hostname nor servname provided, or not known");
-                  if (tmp_6 == 0) printf_va_181("\033[0;32mPASSED\033[0;0m\n");
+                  if (tmp_6 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_181 */
                   else {
                     int tmp_7;
                     tmp_7 = strcmp((char const *)(c->errstr),
                                    "no address associated with name");
-                    if (tmp_7 == 0) printf_va_182("\033[0;32mPASSED\033[0;0m\n");
+                    if (tmp_7 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_182 */
                     else {
                       int tmp_8;
                       tmp_8 = strcmp((char const *)(c->errstr),
                                      "No such host is known. ");
-                      if (tmp_8 == 0) printf_va_183("\033[0;32mPASSED\033[0;0m\n");
+                      if (tmp_8 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_183 */
                       else goto _LAND;
                     }
                   }
@@ -10889,41 +10926,43 @@ static void test_blocking_connection_errors(void)
       }
     }
     else {
-      _LAND: {
-               printf_va_184("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+      _LAND:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_184 */
+        fails ++;
+      }
     }
     redisFree(c);
   }
   else {
-    printf_va_185("Skipping NXDOMAIN test. Found evil ISP!\n");
+    printf("Skipping NXDOMAIN test. Found evil ISP!\n"); /* printf_va_185 */
     freeaddrinfo(ai_tmp);
   }
   tests ++;
-  printf_va_186("#%02d ",tests);
-  printf_va_187("Returns error when the port is not open: ");
+  printf("#%02d ",tests); /* printf_va_186 */
+  printf("Returns error when the port is not open: "); /* printf_va_187 */
   c = redisConnect("localhost",1);
   if (c->err == 1) {
     int tmp_9;
     tmp_9 = strcmp((char const *)(c->errstr),"Connection refused");
-    if (tmp_9 == 0) printf_va_188("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_9 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_188 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_189("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_189 */
+      fails ++;
+    }
   }
   redisFree(c);
   tests ++;
-  printf_va_190("#%02d ",tests);
-  printf_va_191("Returns error when the unix_sock socket path doesn\'t accept connections: ");
+  printf("#%02d ",tests); /* printf_va_190 */
+  printf("Returns error when the unix_sock socket path doesn\'t accept connections: "); /* printf_va_191 */
   c = redisConnectUnix("/tmp/idontexist.sock");
-  if (c->err == 1) printf_va_192("\033[0;32mPASSED\033[0;0m\n");
+  if (c->err == 1) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_192 */
   else {
-    printf_va_193("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_193 */
     fails ++;
   }
   redisFree(c);
@@ -11433,8 +11472,8 @@ static void test_blocking_connection(struct config config)
   int tmp_14;
   c = do_connect(config);
   tests ++;
-  printf_va_194("#%02d ",tests);
-  printf_va_195("Is able to deliver commands: ");
+  printf("#%02d ",tests); /* printf_va_194 */
+  printf("Is able to deliver commands: "); /* printf_va_195 */
   {
     void *__va_args[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"PING",(void * const *)(__va_args));
@@ -11442,19 +11481,20 @@ static void test_blocking_connection(struct config config)
   if (reply->type == 5) {
     int tmp;
     tmp = strcasecmp((char const *)reply->str,"pong");
-    if (tmp == 0) printf_va_196("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_196 */
     else goto _LAND;
   }
   else {
-    _LAND: {
-             printf_va_197("\033[0;31mFAILED\033[0;0m\n");
-             fails ++;
-           }
+    _LAND:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_197 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_198("#%02d ",tests);
-  printf_va_199("Is a able to send commands verbatim: ");
+  printf("#%02d ",tests); /* printf_va_198 */
+  printf("Is a able to send commands verbatim: "); /* printf_va_199 */
   {
     void *__va_args_22[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"SET foo bar",
@@ -11463,19 +11503,20 @@ static void test_blocking_connection(struct config config)
   if (reply->type == 5) {
     int tmp_0;
     tmp_0 = strcasecmp((char const *)reply->str,"ok");
-    if (tmp_0 == 0) printf_va_200("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_0 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_200 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_201("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_201 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_202("#%02d ",tests);
-  printf_va_203("%%s String interpolation works: ");
+  printf("#%02d ",tests); /* printf_va_202 */
+  printf("%%s String interpolation works: "); /* printf_va_203 */
   {
     char const *__va_arg0 = "foo";
     char const *__va_arg1 = "hello world";
@@ -11492,19 +11533,20 @@ static void test_blocking_connection(struct config config)
   if (reply->type == 1) {
     int tmp_1;
     tmp_1 = strcmp((char const *)reply->str,"hello world");
-    if (tmp_1 == 0) printf_va_204("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_1 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_204 */
     else goto _LAND_1;
   }
   else {
-    _LAND_1: {
-               printf_va_205("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_1:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_205 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_206("#%02d ",tests);
-  printf_va_207("%%b String interpolation works: ");
+  printf("#%02d ",tests); /* printf_va_206 */
+  printf("%%b String interpolation works: "); /* printf_va_207 */
   {
     char const *__va_arg0_30 = "foo";
     unsigned int __va_arg1_32 = (unsigned int)3;
@@ -11525,60 +11567,62 @@ static void test_blocking_connection(struct config config)
     int tmp_2;
     tmp_2 = memcmp((void const *)reply->str,(void const *)"hello\000world",
                    (unsigned int)11);
-    if (tmp_2 == 0) printf_va_208("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_2 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_208 */
     else goto _LAND_2;
   }
   else {
-    _LAND_2: {
-               printf_va_209("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_2:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_209 */
+      fails ++;
+    }
   }
   tests ++;
-  printf_va_210("#%02d ",tests);
-  printf_va_211("Binary reply length is correct: ");
-  if (reply->len == (size_t)11) printf_va_212("\033[0;32mPASSED\033[0;0m\n");
+  printf("#%02d ",tests); /* printf_va_210 */
+  printf("Binary reply length is correct: "); /* printf_va_211 */
+  if (reply->len == (size_t)11) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_212 */
   else {
-    printf_va_213("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_213 */
     fails ++;
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_214("#%02d ",tests);
-  printf_va_215("Can parse nil replies: ");
+  printf("#%02d ",tests); /* printf_va_214 */
+  printf("Can parse nil replies: "); /* printf_va_215 */
   {
     void *__va_args_40[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"GET nokey",
                                        (void * const *)(__va_args_40));
   }
-  if (reply->type == 4) printf_va_216("\033[0;32mPASSED\033[0;0m\n");
+  if (reply->type == 4) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_216 */
   else {
-    printf_va_217("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_217 */
     fails ++;
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_218("#%02d ",tests);
-  printf_va_219("Can parse integer replies: ");
+  printf("#%02d ",tests); /* printf_va_218 */
+  printf("Can parse integer replies: "); /* printf_va_219 */
   {
     void *__va_args_42[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"INCR mycounter",
                                        (void * const *)(__va_args_42));
   }
   if (reply->type == 3) {
-    if (reply->integer == (long long)1) printf_va_220("\033[0;32mPASSED\033[0;0m\n");
+    if (reply->integer == (long long)1) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_220 */
     else goto _LAND_3;
   }
   else {
-    _LAND_3: {
-               printf_va_221("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_3:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_221 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_222("#%02d ",tests);
-  printf_va_223("Can parse multi bulk replies: ");
+  printf("#%02d ",tests); /* printf_va_222 */
+  printf("Can parse multi bulk replies: "); /* printf_va_223 */
   {
     void *__va_args_44[1] = {(void *)0};
     tmp_3 = redisCommand(c,"LPUSH mylist foo",(void * const *)(__va_args_44));
@@ -11605,21 +11649,22 @@ static void test_blocking_connection(struct config config)
         tmp_6 = memcmp((void const *)(*(reply->element + 1))->str,
                        (void const *)"foo",(unsigned int)3);
         if (tmp_6) goto _LAND_6;
-        else printf_va_224("\033[0;32mPASSED\033[0;0m\n");
+        else printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_224 */
       }
     }
     else goto _LAND_6;
   }
   else {
-    _LAND_6: {
-               printf_va_225("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_6:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_225 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_226("#%02d ",tests);
-  printf_va_227("Can handle nested multi bulk replies: ");
+  printf("#%02d ",tests); /* printf_va_226 */
+  printf("Can handle nested multi bulk replies: "); /* printf_va_227 */
   {
     void *__va_args_50[1] = {(void *)0};
     tmp_7 = redisCommand(c,"MULTI",(void * const *)(__va_args_50));
@@ -11659,7 +11704,7 @@ static void test_blocking_connection(struct config config)
                 int tmp_12;
                 tmp_12 = strcasecmp((char const *)(*(reply->element + 1))->str,
                                     "pong");
-                if (tmp_12 == 0) printf_va_228("\033[0;32mPASSED\033[0;0m\n");
+                if (tmp_12 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_228 */
                 else goto _LAND_13;
               }
               else goto _LAND_13;
@@ -11672,15 +11717,16 @@ static void test_blocking_connection(struct config config)
     else goto _LAND_13;
   }
   else {
-    _LAND_13: {
-                printf_va_229("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_13:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_229 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_230("#%02d ",tests);
-  printf_va_231("Can pass NULL to redisGetReply: ");
+  printf("#%02d ",tests); /* printf_va_230 */
+  printf("Can pass NULL to redisGetReply: "); /* printf_va_231 */
   {
     void *__va_args_58[1] = {(void *)0};
     tmp_13 = redisAppendCommand(c,"PING",(void * const *)(__va_args_58));
@@ -11688,9 +11734,9 @@ static void test_blocking_connection(struct config config)
   __FC_assert((tmp_13 == 0) != 0,"test.c",605,
               "redisAppendCommand(c, \"PING\") == REDIS_OK");
   tmp_14 = redisGetReply(c,(void **)0);
-  if (tmp_14 == 0) printf_va_232("\033[0;32mPASSED\033[0;0m\n");
+  if (tmp_14 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_232 */
   else {
-    printf_va_233("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_233 */
     fails ++;
   }
   disconnect(c,0);
@@ -11725,9 +11771,9 @@ static int detect_debug_sleep(redisContext *c)
         char const *tmp_0;
         if (c->err) tmp_0 = (char const *)(c->errstr); else tmp_0 = "(none)";
         char const *cause = tmp_0;
-        fprintf_va_1(__fc_stderr,
-                     "Error testing for DEBUG SLEEP (Redis error: %s), exiting\n",
-                     (char *)cause);
+        fprintf(__fc_stderr,
+                "Error testing for DEBUG SLEEP (Redis error: %s), exiting\n",
+                (char *)cause); /* fprintf_va_1 */
         exit(-1);
       }
     }
@@ -11954,8 +12000,8 @@ static void test_blocking_connection_timeouts(struct config config)
   char const *sleep_cmd = "DEBUG SLEEP 3\r\n";
   c = do_connect(config);
   tests ++;
-  printf_va_234("#%02d ",tests);
-  printf_va_235("Successfully completes a command when the timeout is not exceeded: ");
+  printf("#%02d ",tests); /* printf_va_234 */
+  printf("Successfully completes a command when the timeout is not exceeded: "); /* printf_va_235 */
   {
     void *__va_args[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"SET foo fast",
@@ -11975,23 +12021,24 @@ static void test_blocking_connection_timeouts(struct config config)
       int tmp;
       tmp = memcmp((void const *)reply->str,(void const *)"fast",
                    (unsigned int)4);
-      if (tmp == 0) printf_va_236("\033[0;32mPASSED\033[0;0m\n");
+      if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_236 */
       else goto _LAND_0;
     }
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_237("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_237 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   disconnect(c,0);
   c = do_connect(config);
   tests ++;
-  printf_va_238("#%02d ",tests);
-  printf_va_239("Does not return a reply when the command times out: ");
+  printf("#%02d ",tests); /* printf_va_238 */
+  printf("Does not return a reply when the command times out: "); /* printf_va_239 */
   tmp_2 = detect_debug_sleep(c);
   if (tmp_2) {
     size_t tmp_0;
@@ -12014,7 +12061,7 @@ static void test_blocking_connection_timeouts(struct config config)
           int tmp_1;
           tmp_1 = strcmp((char const *)(c->errstr),
                          "Resource temporarily unavailable");
-          if (tmp_1 == 0) printf_va_240("\033[0;32mPASSED\033[0;0m\n");
+          if (tmp_1 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_240 */
           else goto _LAND_3;
         }
         else goto _LAND_3;
@@ -12022,20 +12069,21 @@ static void test_blocking_connection_timeouts(struct config config)
       else goto _LAND_3;
     }
     else {
-      _LAND_3: {
-                 printf_va_241("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_3:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_241 */
+        fails ++;
+      }
     }
     freeReplyObject((void *)reply);
   }
   else {
-    printf_va_242("\033[01;33mSKIPPED\033[0;0m\n");
+    printf("\033[01;33mSKIPPED\033[0;0m\n"); /* printf_va_242 */
     skips ++;
   }
   tests ++;
-  printf_va_243("#%02d ",tests);
-  printf_va_244("Reconnect properly reconnects after a timeout: ");
+  printf("#%02d ",tests); /* printf_va_243 */
+  printf("Reconnect properly reconnects after a timeout: "); /* printf_va_244 */
   do_reconnect(c,config);
   {
     void *__va_args_19[1] = {(void *)0};
@@ -12046,21 +12094,22 @@ static void test_blocking_connection_timeouts(struct config config)
     if (reply->type == 5) {
       int tmp_3;
       tmp_3 = strcmp((char const *)reply->str,"PONG");
-      if (tmp_3 == 0) printf_va_245("\033[0;32mPASSED\033[0;0m\n");
+      if (tmp_3 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_245 */
       else goto _LAND_5;
     }
     else goto _LAND_5;
   }
   else {
-    _LAND_5: {
-               printf_va_246("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_5:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_246 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_247("#%02d ",tests);
-  printf_va_248("Reconnect properly uses owned parameters: ");
+  printf("#%02d ",tests); /* printf_va_247 */
+  printf("Reconnect properly uses owned parameters: "); /* printf_va_248 */
   config.tcp.host = "foo";
   config.unix_sock.path = "foo";
   do_reconnect(c,config);
@@ -12073,16 +12122,17 @@ static void test_blocking_connection_timeouts(struct config config)
     if (reply->type == 5) {
       int tmp_4;
       tmp_4 = strcmp((char const *)reply->str,"PONG");
-      if (tmp_4 == 0) printf_va_249("\033[0;32mPASSED\033[0;0m\n");
+      if (tmp_4 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_249 */
       else goto _LAND_7;
     }
     else goto _LAND_7;
   }
   else {
-    _LAND_7: {
-               printf_va_250("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_7:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_250 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   disconnect(c,0);
@@ -12240,8 +12290,8 @@ static void test_blocking_io_errors(struct config config)
     freeReplyObject((void *)reply);
   }
   tests ++;
-  printf_va_251("#%02d ",tests);
-  printf_va_252("Returns I/O error when the connection is lost: ");
+  printf("#%02d ",tests); /* printf_va_251 */
+  printf("Returns I/O error when the connection is lost: "); /* printf_va_252 */
   {
     void *__va_args_21[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"QUIT",
@@ -12258,13 +12308,13 @@ static void test_blocking_io_errors(struct config config)
           if (tmp_0 == 0) {
             int tmp_1;
             tmp_1 = redisGetReply(c,& _reply);
-            if (tmp_1 == -1) printf_va_253("\033[0;32mPASSED\033[0;0m\n");
+            if (tmp_1 == -1) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_253 */
             else goto _LAND;
           }
           else {
             _LAND:
             {
-              printf_va_254("\033[0;31mFAILED\033[0;0m\n");
+              printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_254 */
               fails ++;
             }
           }
@@ -12275,9 +12325,9 @@ static void test_blocking_io_errors(struct config config)
     }
     else 
       _LAND_0:
-      if (reply == (redisReply *)0) printf_va_255("\033[0;32mPASSED\033[0;0m\n");
+      if (reply == (redisReply *)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_255 */
       else {
-        printf_va_256("\033[0;31mFAILED\033[0;0m\n");
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_256 */
         fails ++;
       }
   if (c->err == 3) {
@@ -12291,8 +12341,8 @@ static void test_blocking_io_errors(struct config config)
   redisFree(c);
   c = do_connect(config);
   tests ++;
-  printf_va_257("#%02d ",tests);
-  printf_va_258("Returns I/O error on socket timeout: ");
+  printf("#%02d ",tests); /* printf_va_257 */
+  printf("Returns I/O error on socket timeout: "); /* printf_va_258 */
   struct timeval tv = {.tv_sec = (long)0, .tv_usec = 1000};
   tmp_4 = redisSetTimeout(c,tv);
   __FC_assert((tmp_4 == 0) != 0,"test.c",732,
@@ -12300,16 +12350,17 @@ static void test_blocking_io_errors(struct config config)
   int respcode = redisGetReply(c,& _reply);
   if (respcode == -1) {
     if (c->err == 1) {
-      if (__fc_errno == 11) printf_va_259("\033[0;32mPASSED\033[0;0m\n");
+      if (__fc_errno == 11) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_259 */
       else goto _LAND_2;
     }
     else goto _LAND_2;
   }
   else {
-    _LAND_2: {
-               printf_va_260("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_2:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_260 */
+      fails ++;
+    }
   }
   redisFree(c);
   return;
@@ -12417,8 +12468,8 @@ static void test_invalid_timeout_errors(struct config config)
 {
   redisContext *c;
   tests ++;
-  printf_va_261("#%02d ",tests);
-  printf_va_262("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: ");
+  printf("#%02d ",tests); /* printf_va_261 */
+  printf("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: "); /* printf_va_262 */
   config.tcp.timeout.tv_sec = (long)0;
   config.tcp.timeout.tv_usec = 10000001;
   c = redisConnectWithTimeout(config.tcp.host,config.tcp.port,
@@ -12426,19 +12477,20 @@ static void test_invalid_timeout_errors(struct config config)
   if (c->err == 1) {
     int tmp;
     tmp = strcmp((char const *)(c->errstr),"Invalid timeout specified");
-    if (tmp == 0) printf_va_263("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_263 */
     else goto _LAND;
   }
   else {
-    _LAND: {
-             printf_va_264("\033[0;31mFAILED\033[0;0m\n");
-             fails ++;
-           }
+    _LAND:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_264 */
+      fails ++;
+    }
   }
   redisFree(c);
   tests ++;
-  printf_va_265("#%02d ",tests);
-  printf_va_266("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
+  printf("#%02d ",tests); /* printf_va_265 */
+  printf("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: "); /* printf_va_266 */
   config.tcp.timeout.tv_sec = (2147483647L - (long)999) / (long)1000 + (long)1;
   config.tcp.timeout.tv_usec = 0;
   c = redisConnectWithTimeout(config.tcp.host,config.tcp.port,
@@ -12446,14 +12498,15 @@ static void test_invalid_timeout_errors(struct config config)
   if (c->err == 1) {
     int tmp_0;
     tmp_0 = strcmp((char const *)(c->errstr),"Invalid timeout specified");
-    if (tmp_0 == 0) printf_va_267("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_0 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_267 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_268("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_268 */
+      fails ++;
+    }
   }
   redisFree(c);
   return;
@@ -12577,8 +12630,8 @@ static void test_throughput(struct config config)
   long long t2;
   redisContext *c = do_connect(config);
   tests ++;
-  printf_va_269("#%02d ",tests);
-  printf_va_270("Throughput:\n");
+  printf("#%02d ",tests); /* printf_va_269 */
+  printf("Throughput:\n"); /* printf_va_270 */
   i = 0;
   while (i < 500) {
     void *tmp_0;
@@ -12616,7 +12669,7 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_271("\t(%dx PING: %.3fs)\n",num,(double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx PING: %.3fs)\n",num,(double)(t2 - t1) / 1000000.0); /* printf_va_271 */
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   t1 = usec();
   i = 0;
@@ -12650,8 +12703,8 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_272("\t(%dx LRANGE with 500 elements: %.3fs)\n",num,
-                (double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx LRANGE with 500 elements: %.3fs)\n",num,
+         (double)(t2 - t1) / 1000000.0); /* printf_va_272 */
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   t1 = usec();
   i = 0;
@@ -12679,7 +12732,7 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_273("\t(%dx INCRBY: %.3fs)\n",num,(double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx INCRBY: %.3fs)\n",num,(double)(t2 - t1) / 1000000.0); /* printf_va_273 */
   num = 10000;
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   i = 0;
@@ -12714,8 +12767,8 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_274("\t(%dx PING (pipelined): %.3fs)\n",num,
-                (double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx PING (pipelined): %.3fs)\n",num,
+         (double)(t2 - t1) / 1000000.0); /* printf_va_274 */
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   i = 0;
   while (i < num) {
@@ -12757,8 +12810,8 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_275("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n",num,
-                (double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n",num,
+         (double)(t2 - t1) / 1000000.0); /* printf_va_275 */
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   i = 0;
   while (i < num) {
@@ -12794,8 +12847,8 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_276("\t(%dx INCRBY (pipelined): %.3fs)\n",num,
-                (double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx INCRBY (pipelined): %.3fs)\n",num,
+         (double)(t2 - t1) / 1000000.0); /* printf_va_276 */
   disconnect(c,0);
   return;
 }
@@ -12933,8 +12986,7 @@ int main(int argc, char **argv)
               else {
                 _LAND:
                 {
-                  fprintf_va_2(__fc_stderr,"Invalid argument: %s\n",
-                               *(argv + 0));
+                  fprintf(__fc_stderr,"Invalid argument: %s\n",*(argv + 0)); /* fprintf_va_2 */
                   exit(1);
                 }
               }
@@ -12956,13 +13008,13 @@ int main(int argc, char **argv)
       if (skips) {
         _LOR:
         {
-          printf_va_277("*** %d TESTS FAILED ***\n",fails);
-          if (skips) printf_va_278("*** %d TESTS SKIPPED ***\n",skips);
+          printf("*** %d TESTS FAILED ***\n",fails); /* printf_va_277 */
+          if (skips) printf("*** %d TESTS SKIPPED ***\n",skips); /* printf_va_278 */
           __retres = 1;
           goto return_label;
         }
       }
-  printf_va_279("ALL TESTS PASSED (%d skipped)\n",skips);
+  printf("ALL TESTS PASSED (%d skipped)\n",skips); /* printf_va_279 */
   __retres = 0;
   return_label: return __retres;
 }
diff --git a/hiredis/.frama-c/hiredis-misc.eva/alarms.csv b/hiredis/.frama-c/hiredis-misc.eva/alarms.csv
index 13d95aae76109f1eb4b4a85ec2af9d2005ebee02..7445226d10385a0755e5c5bec6d673195f579474 100644
--- a/hiredis/.frama-c/hiredis-misc.eva/alarms.csv
+++ b/hiredis/.frama-c/hiredis-misc.eva/alarms.csv
@@ -336,4 +336,4 @@ FRAMAC_SHARE/libc	strings.h	53	strncasecmp	precondition	Unknown	valid_string_s1:
 FRAMAC_SHARE/libc	unistd.h	738	access	precondition	Unknown	valid_string_path: valid_read_string(path)
 FRAMAC_SHARE/libc/sys	socket.h	334	connect	precondition	Unknown	valid_sockfd: 0 ≤ sockfd < 1024
 FRAMAC_SHARE/libc/sys	socket.h	370	getsockopt	precondition	Unknown	valid_sockfd: 0 ≤ sockfd < 1024
-FRAMAC_SHARE/libc/sys	socket.h	490	setsockopt	precondition	Unknown	valid_sockfd: 0 ≤ sockfd < 1024
+FRAMAC_SHARE/libc/sys	socket.h	525	setsockopt	precondition	Unknown	valid_sockfd: 0 ≤ sockfd < 1024
diff --git a/hiredis/.frama-c/hiredis-misc.parse/framac.ast b/hiredis/.frama-c/hiredis-misc.parse/framac.ast
index f85de624a6debf7f1580ad367fd47bf28e1ccfcd..30438fcc56937f671e3cb68c8e7a0e3954ca3442 100644
--- a/hiredis/.frama-c/hiredis-misc.parse/framac.ast
+++ b/hiredis/.frama-c/hiredis-misc.parse/framac.ast
@@ -1557,8 +1557,8 @@ void redisProcessCallbacks(redisAsyncContext *ac)
         int tmp_0;
         if (((redisReply *)reply)->type == 6) {
           c->err = 2;
-          snprintf_va_1(c->errstr,sizeof(c->errstr),"%s",
-                        ((redisReply *)reply)->str);
+          snprintf(c->errstr,sizeof(c->errstr),"%s",
+                   ((redisReply *)reply)->str); /* snprintf_va_1 */
           (*(((c->reader)->fn)->freeObject))(reply);
           __redisAsyncDisconnect(ac);
           goto return_label;
@@ -2972,7 +2972,7 @@ int redisvFormatCommand(char **target, char const *format, va_list ap)
   totlen = (int)((uint32_t)totlen + (((uint32_t)1 + tmp_20) + (uint32_t)2));
   cmd = (char *)malloc((unsigned int)(totlen + 1));
   if (cmd == (char *)0) goto memory_err;
-  pos = sprintf_va_1(cmd,"*%d\r\n",argc);
+  pos = sprintf(cmd,"*%d\r\n",argc); /* sprintf_va_1 */
   j = 0;
   while (j < argc) {
     {
@@ -2984,7 +2984,7 @@ int redisvFormatCommand(char **target, char const *format, va_list ap)
       int tmp_26;
       tmp_21 = sdslen_0(*(curargv + j));
       ;
-      tmp_22 = sprintf_va_2(cmd + pos,"$%zu\r\n",tmp_21);
+      tmp_22 = sprintf(cmd + pos,"$%zu\r\n",tmp_21); /* sprintf_va_2 */
       pos += tmp_22;
       tmp_23 = sdslen_0(*(curargv + j));
       ;
@@ -3157,7 +3157,7 @@ int redisFormatCommandArgv(char **target, int argc, char const **argv,
     __retres = -1;
     goto return_label;
   }
-  pos = sprintf_va_3(cmd,"*%d\r\n",argc);
+  pos = sprintf(cmd,"*%d\r\n",argc); /* sprintf_va_3 */
   j = 0;
   while (j < argc) {
     {
@@ -3165,7 +3165,7 @@ int redisFormatCommandArgv(char **target, int argc, char const **argv,
       int tmp_4;
       int tmp_5;
       if (argvlen) len = *(argvlen + j); else len = strlen(*(argv + j));
-      tmp_3 = sprintf_va_4(cmd + pos,"$%zu\r\n",len);
+      tmp_3 = sprintf(cmd + pos,"$%zu\r\n",len); /* sprintf_va_4 */
       pos += tmp_3;
       memcpy((void *)(cmd + pos),(void const *)*(argv + j),len);
       pos = (int)((size_t)pos + len);
@@ -4080,7 +4080,7 @@ static void __redisSetErrorFromErrno(redisContext *c, int type,
   size_t len = (unsigned int)0;
   if (prefix != (char const *)0) {
     int tmp;
-    tmp = snprintf_va_2(buf,sizeof(buf),"%s: ",(char *)prefix);
+    tmp = snprintf(buf,sizeof(buf),"%s: ",(char *)prefix); /* snprintf_va_2 */
     len = (unsigned int)tmp;
   }
   strerror_r(errorno,& buf[len],sizeof(buf) - len);
@@ -4132,7 +4132,7 @@ static int redisSetBlocking(redisContext *c, int blocking)
   int __retres;
   int flags;
   int tmp;
-  flags = __va_fcntl_void(c->fd,3);
+  flags = fcntl(c->fd,3); /* __va_fcntl_void */
   if (flags == -1) {
     __redisSetErrorFromErrno(c,1,"fcntl(F_GETFL)");
     redisNetClose(c);
@@ -4140,7 +4140,7 @@ static int redisSetBlocking(redisContext *c, int blocking)
     goto return_label;
   }
   if (blocking) flags &= ~ 0x800; else flags |= 0x800;
-  tmp = __va_fcntl_int(c->fd,4,flags);
+  tmp = fcntl(c->fd,4,flags); /* __va_fcntl_int */
   if (tmp == -1) {
     __redisSetErrorFromErrno(c,1,"fcntl(F_SETFL)");
     redisNetClose(c);
@@ -4433,7 +4433,7 @@ static int _redisContextConnectTcp(redisContext *c, char const *addr,
       free((void *)c->tcp.source_addr);
       c->tcp.source_addr = hi_strdup(source_addr);
     }
-  snprintf_va_3(_port,(unsigned int)6,"%d",port);
+  snprintf(_port,(unsigned int)6,"%d",port); /* snprintf_va_3 */
   memset((void *)(& hints),0,sizeof(hints));
   hints.ai_family = 2;
   hints.ai_socktype = 1;
@@ -4471,7 +4471,7 @@ static int _redisContextConnectTcp(redisContext *c, char const *addr,
           char buf[128];
           char const *tmp_2;
           tmp_2 = gai_strerror(rv);
-          snprintf_va_4(buf,sizeof(buf),"Can\'t get addr: %s",(char *)tmp_2);
+          snprintf(buf,sizeof(buf),"Can\'t get addr: %s",(char *)tmp_2); /* snprintf_va_4 */
           __redisSetError(c,2,(char const *)(buf));
           goto error;
         }
@@ -4501,7 +4501,7 @@ static int _redisContextConnectTcp(redisContext *c, char const *addr,
           char buf_0[128];
           char *tmp_5;
           tmp_5 = strerror(__fc_errno);
-          snprintf_va_5(buf_0,sizeof(buf_0),"Can\'t bind socket: %s",tmp_5);
+          snprintf(buf_0,sizeof(buf_0),"Can\'t bind socket: %s",tmp_5); /* snprintf_va_5 */
           __redisSetError(c,2,(char const *)(buf_0));
           goto error;
         }
@@ -4558,7 +4558,7 @@ static int _redisContextConnectTcp(redisContext *c, char const *addr,
     char buf_1[128];
     char *tmp_10;
     tmp_10 = strerror(__fc_errno);
-    snprintf_va_6(buf_1,sizeof(buf_1),"Can\'t create socket: %s",tmp_10);
+    snprintf(buf_1,sizeof(buf_1),"Can\'t create socket: %s",tmp_10); /* snprintf_va_6 */
     __redisSetError(c,2,(char const *)(buf_1));
     goto error;
   }
@@ -4965,50 +4965,50 @@ static size_t chrtos(char *buf, size_t size, char byte)
     int tmp_7;
     case '\\': case '\"':
     { /* sequence */
-      tmp = snprintf_va_7(buf,size,"\"\\%c\"",(int)byte);
+      tmp = snprintf(buf,size,"\"\\%c\"",(int)byte); /* snprintf_va_7 */
       len = (unsigned int)tmp;
     }
     break;
     case '\n':
     { /* sequence */
-      tmp_0 = snprintf_va_8(buf,size,"\"\\n\"");
+      tmp_0 = snprintf(buf,size,"\"\\n\""); /* snprintf_va_8 */
       len = (unsigned int)tmp_0;
     }
     break;
     case '\r':
     { /* sequence */
-      tmp_1 = snprintf_va_9(buf,size,"\"\\r\"");
+      tmp_1 = snprintf(buf,size,"\"\\r\""); /* snprintf_va_9 */
       len = (unsigned int)tmp_1;
     }
     break;
     case '\t':
     { /* sequence */
-      tmp_2 = snprintf_va_10(buf,size,"\"\\t\"");
+      tmp_2 = snprintf(buf,size,"\"\\t\""); /* snprintf_va_10 */
       len = (unsigned int)tmp_2;
     }
     break;
     case '\a':
     { /* sequence */
-      tmp_3 = snprintf_va_11(buf,size,"\"\\a\"");
+      tmp_3 = snprintf(buf,size,"\"\\a\""); /* snprintf_va_11 */
       len = (unsigned int)tmp_3;
     }
     break;
     case '\b':
     { /* sequence */
-      tmp_4 = snprintf_va_12(buf,size,"\"\\b\"");
+      tmp_4 = snprintf(buf,size,"\"\\b\""); /* snprintf_va_12 */
       len = (unsigned int)tmp_4;
     }
     break;
     default: tmp_7 = isprint((int)byte);
     if (tmp_7) {
       int tmp_5;
-      tmp_5 = snprintf_va_13(buf,size,"\"%c\"",(int)byte);
+      tmp_5 = snprintf(buf,size,"\"%c\"",(int)byte); /* snprintf_va_13 */
       len = (unsigned int)tmp_5;
     }
     else {
       int tmp_6;
-      tmp_6 = snprintf_va_14(buf,size,"\"\\x%02x\"",
-                             (unsigned int)((int)((unsigned char)byte)));
+      tmp_6 = snprintf(buf,size,"\"\\x%02x\"",
+                       (unsigned int)((int)((unsigned char)byte))); /* snprintf_va_14 */
       len = (unsigned int)tmp_6;
     }
     break;
@@ -5036,8 +5036,8 @@ static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte)
   char cbuf[8];
   char sbuf[128];
   chrtos(cbuf,sizeof(cbuf),byte);
-  snprintf_va_15(sbuf,sizeof(sbuf),
-                 "Protocol error, got %s as reply type byte",cbuf);
+  snprintf(sbuf,sizeof(sbuf),"Protocol error, got %s as reply type byte",
+           cbuf); /* snprintf_va_15 */
   __redisReaderSetError(r,4,(char const *)(sbuf));
   return;
 }
@@ -7360,7 +7360,7 @@ static redisContext *select_database(redisContext *c)
   else {
     _LAND:
     {
-      printf_va_1("Database #9 is not empty, test can not continue\n");
+      printf("Database #9 is not empty, test can not continue\n"); /* printf_va_1 */
       exit(1);
     }
   }
@@ -7457,18 +7457,18 @@ static redisContext *do_connect(struct config config)
           redisContext *dummy_ctx = redisConnectUnix(config.unix_sock.path);
           if (dummy_ctx) {
             int fd = disconnect(dummy_ctx,1);
-            printf_va_2("Connecting to inherited fd %d\n",fd);
+            printf("Connecting to inherited fd %d\n",fd); /* printf_va_2 */
             c = redisConnectFd(fd);
           }
         }
         else __FC_assert((void *)0 != (void *)0,"test.c",148,"NULL");
   if (c == (redisContext *)0) {
-    printf_va_3("Connection error: can\'t allocate redis context\n");
+    printf("Connection error: can\'t allocate redis context\n"); /* printf_va_3 */
     exit(1);
   }
   else 
     if (c->err) {
-      printf_va_4("Connection error: %s\n",c->errstr);
+      printf("Connection error: %s\n",c->errstr); /* printf_va_4 */
       redisFree(c);
       exit(1);
     }
@@ -8678,8 +8678,8 @@ static void test_format_commands(void)
   int tmp_20;
   int tmp_21;
   tests ++;
-  printf_va_5("#%02d ",tests);
-  printf_va_6("Format command without interpolation: ");
+  printf("#%02d ",tests); /* printf_va_5 */
+  printf("Format command without interpolation: "); /* printf_va_6 */
   {
     void *__va_args[1] = {(void *)0};
     len = redisFormatCommand(& cmd,"SET foo bar",(void * const *)(__va_args));
@@ -8689,19 +8689,20 @@ static void test_format_commands(void)
                 (unsigned int)len);
   if (tmp == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_7("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_7 */
     else goto _LAND;
   }
   else {
-    _LAND: {
-             printf_va_8("\033[0;31mFAILED\033[0;0m\n");
-             fails ++;
-           }
+    _LAND:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_8 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_9("#%02d ",tests);
-  printf_va_10("Format command with %%s string interpolation: ");
+  printf("#%02d ",tests); /* printf_va_9 */
+  printf("Format command with %%s string interpolation: "); /* printf_va_10 */
   {
     char const *__va_arg0 = "foo";
     char const *__va_arg1 = "bar";
@@ -8714,19 +8715,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_0 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_11("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_11 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_12("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_12 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_13("#%02d ",tests);
-  printf_va_14("Format command with %%s and an empty string: ");
+  printf("#%02d ",tests); /* printf_va_13 */
+  printf("Format command with %%s and an empty string: "); /* printf_va_14 */
   {
     char const *__va_arg0_48 = "foo";
     char const *__va_arg1_50 = "";
@@ -8739,19 +8741,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_1 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (0 + 2)) 
-      printf_va_15("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_15 */
     else goto _LAND_1;
   }
   else {
-    _LAND_1: {
-               printf_va_16("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_1:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_16 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_17("#%02d ",tests);
-  printf_va_18("Format command with an empty string in between proper interpolations: ");
+  printf("#%02d ",tests); /* printf_va_17 */
+  printf("Format command with an empty string in between proper interpolations: "); /* printf_va_18 */
   {
     char const *__va_arg0_54 = "";
     char const *__va_arg1_56 = "foo";
@@ -8764,19 +8767,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_2 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (0 + 2)) + 4) + (3 + 2)) 
-      printf_va_19("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_19 */
     else goto _LAND_2;
   }
   else {
-    _LAND_2: {
-               printf_va_20("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_2:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_20 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_21("#%02d ",tests);
-  printf_va_22("Format command with %%b string interpolation: ");
+  printf("#%02d ",tests); /* printf_va_21 */
+  printf("Format command with %%b string interpolation: "); /* printf_va_22 */
   {
     char const *__va_arg0_60 = "foo";
     unsigned int __va_arg1_62 = (unsigned int)3;
@@ -8792,19 +8796,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_3 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_23("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_23 */
     else goto _LAND_3;
   }
   else {
-    _LAND_3: {
-               printf_va_24("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_3:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_24 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_25("#%02d ",tests);
-  printf_va_26("Format command with %%b and an empty string: ");
+  printf("#%02d ",tests); /* printf_va_25 */
+  printf("Format command with %%b and an empty string: "); /* printf_va_26 */
   {
     char const *__va_arg0_68 = "foo";
     unsigned int __va_arg1_70 = (unsigned int)3;
@@ -8820,19 +8825,20 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_4 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (0 + 2)) 
-      printf_va_27("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_27 */
     else goto _LAND_4;
   }
   else {
-    _LAND_4: {
-               printf_va_28("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_4:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_28 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_29("#%02d ",tests);
-  printf_va_30("Format command with literal %%: ");
+  printf("#%02d ",tests); /* printf_va_29 */
+  printf("Format command with literal %%: "); /* printf_va_30 */
   {
     void *__va_args_78[1] = {(void *)0};
     len = redisFormatCommand(& cmd,"SET %% %%",
@@ -8843,22 +8849,23 @@ static void test_format_commands(void)
                   (unsigned int)len);
   if (tmp_5 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (1 + 2)) + 4) + (1 + 2)) 
-      printf_va_31("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_31 */
     else goto _LAND_5;
   }
   else {
-    _LAND_5: {
-               printf_va_32("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_5:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_32 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   {
     int tmp_6;
     int value = 123;
     tests ++;
-    printf_va_33("#%02d ",tests);
-    printf_va_34("Format command with printf-delegation (int): ");
+    printf("#%02d ",tests); /* printf_va_33 */
+    printf("Format command with printf-delegation (int): "); /* printf_va_34 */
     {
       int __va_arg0_80 = value;
       char const *__va_arg1_82 = "hello";
@@ -8870,14 +8877,15 @@ static void test_format_commands(void)
                     "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                     (unsigned int)len);
     if (tmp_6 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_35("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_35 */
       else goto _LAND_6;
     }
     else {
-      _LAND_6: {
-                 printf_va_36("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_6:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_36 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8885,8 +8893,8 @@ static void test_format_commands(void)
     int tmp_7;
     char value_0 = (char)123;
     tests ++;
-    printf_va_37("#%02d ",tests);
-    printf_va_38("Format command with printf-delegation (char): ");
+    printf("#%02d ",tests); /* printf_va_37 */
+    printf("Format command with printf-delegation (char): "); /* printf_va_38 */
     {
       int __va_arg0_86 = (int)value_0;
       char const *__va_arg1_88 = "hello";
@@ -8898,14 +8906,15 @@ static void test_format_commands(void)
                     "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                     (unsigned int)len);
     if (tmp_7 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_39("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_39 */
       else goto _LAND_7;
     }
     else {
-      _LAND_7: {
-                 printf_va_40("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_7:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_40 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8913,8 +8922,8 @@ static void test_format_commands(void)
     int tmp_8;
     short value_1 = (short)123;
     tests ++;
-    printf_va_41("#%02d ",tests);
-    printf_va_42("Format command with printf-delegation (short): ");
+    printf("#%02d ",tests); /* printf_va_41 */
+    printf("Format command with printf-delegation (short): "); /* printf_va_42 */
     {
       int __va_arg0_92 = (int)value_1;
       char const *__va_arg1_94 = "hello";
@@ -8926,14 +8935,15 @@ static void test_format_commands(void)
                     "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                     (unsigned int)len);
     if (tmp_8 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_43("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_43 */
       else goto _LAND_8;
     }
     else {
-      _LAND_8: {
-                 printf_va_44("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_8:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_44 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8941,8 +8951,8 @@ static void test_format_commands(void)
     int tmp_9;
     long value_2 = (long)123;
     tests ++;
-    printf_va_45("#%02d ",tests);
-    printf_va_46("Format command with printf-delegation (long): ");
+    printf("#%02d ",tests); /* printf_va_45 */
+    printf("Format command with printf-delegation (long): "); /* printf_va_46 */
     {
       long __va_arg0_98 = value_2;
       char const *__va_arg1_100 = "hello";
@@ -8954,14 +8964,15 @@ static void test_format_commands(void)
                     "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                     (unsigned int)len);
     if (tmp_9 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_47("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_47 */
       else goto _LAND_9;
     }
     else {
-      _LAND_9: {
-                 printf_va_48("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_9:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_48 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8969,8 +8980,8 @@ static void test_format_commands(void)
     int tmp_10;
     long long value_3 = (long long)123;
     tests ++;
-    printf_va_49("#%02d ",tests);
-    printf_va_50("Format command with printf-delegation (long long): ");
+    printf("#%02d ",tests); /* printf_va_49 */
+    printf("Format command with printf-delegation (long long): "); /* printf_va_50 */
     {
       long long __va_arg0_104 = value_3;
       char const *__va_arg1_106 = "hello";
@@ -8982,14 +8993,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_10 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_51("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_51 */
       else goto _LAND_10;
     }
     else {
-      _LAND_10: {
-                  printf_va_52("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_10:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_52 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -8997,8 +9009,8 @@ static void test_format_commands(void)
     int tmp_11;
     unsigned int value_4 = (unsigned int)123;
     tests ++;
-    printf_va_53("#%02d ",tests);
-    printf_va_54("Format command with printf-delegation (unsigned int): ");
+    printf("#%02d ",tests); /* printf_va_53 */
+    printf("Format command with printf-delegation (unsigned int): "); /* printf_va_54 */
     {
       unsigned int __va_arg0_110 = value_4;
       char const *__va_arg1_112 = "hello";
@@ -9010,14 +9022,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_11 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_55("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_55 */
       else goto _LAND_11;
     }
     else {
-      _LAND_11: {
-                  printf_va_56("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_11:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_56 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9025,8 +9038,8 @@ static void test_format_commands(void)
     int tmp_12;
     unsigned char value_5 = (unsigned char)123;
     tests ++;
-    printf_va_57("#%02d ",tests);
-    printf_va_58("Format command with printf-delegation (unsigned char): ");
+    printf("#%02d ",tests); /* printf_va_57 */
+    printf("Format command with printf-delegation (unsigned char): "); /* printf_va_58 */
     {
       int __va_arg0_116 = (int)value_5;
       char const *__va_arg1_118 = "hello";
@@ -9038,14 +9051,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_12 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_59("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_59 */
       else goto _LAND_12;
     }
     else {
-      _LAND_12: {
-                  printf_va_60("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_12:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_60 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9053,8 +9067,8 @@ static void test_format_commands(void)
     int tmp_13;
     unsigned short value_6 = (unsigned short)123;
     tests ++;
-    printf_va_61("#%02d ",tests);
-    printf_va_62("Format command with printf-delegation (unsigned short): ");
+    printf("#%02d ",tests); /* printf_va_61 */
+    printf("Format command with printf-delegation (unsigned short): "); /* printf_va_62 */
     {
       int __va_arg0_122 = (int)value_6;
       char const *__va_arg1_124 = "hello";
@@ -9066,14 +9080,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_13 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_63("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_63 */
       else goto _LAND_13;
     }
     else {
-      _LAND_13: {
-                  printf_va_64("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_13:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_64 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9081,8 +9096,8 @@ static void test_format_commands(void)
     int tmp_14;
     unsigned long value_7 = (unsigned long)123;
     tests ++;
-    printf_va_65("#%02d ",tests);
-    printf_va_66("Format command with printf-delegation (unsigned long): ");
+    printf("#%02d ",tests); /* printf_va_65 */
+    printf("Format command with printf-delegation (unsigned long): "); /* printf_va_66 */
     {
       unsigned long __va_arg0_128 = value_7;
       char const *__va_arg1_130 = "hello";
@@ -9094,14 +9109,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_14 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_67("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_67 */
       else goto _LAND_14;
     }
     else {
-      _LAND_14: {
-                  printf_va_68("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_14:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_68 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9109,8 +9125,8 @@ static void test_format_commands(void)
     int tmp_15;
     unsigned long long value_8 = (unsigned long long)123;
     tests ++;
-    printf_va_69("#%02d ",tests);
-    printf_va_70("Format command with printf-delegation (unsigned long long): ");
+    printf("#%02d ",tests); /* printf_va_69 */
+    printf("Format command with printf-delegation (unsigned long long): "); /* printf_va_70 */
     {
       unsigned long long __va_arg0_134 = value_8;
       char const *__va_arg1_136 = "hello";
@@ -9122,14 +9138,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_15 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_71("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_71 */
       else goto _LAND_15;
     }
     else {
-      _LAND_15: {
-                  printf_va_72("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_15:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_72 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9137,8 +9154,8 @@ static void test_format_commands(void)
     int tmp_16;
     float value_9 = (float)123.0;
     tests ++;
-    printf_va_73("#%02d ",tests);
-    printf_va_74("Format command with printf-delegation (float): ");
+    printf("#%02d ",tests); /* printf_va_73 */
+    printf("Format command with printf-delegation (float): "); /* printf_va_74 */
     {
       double __va_arg0_140 = (double)value_9;
       char const *__va_arg1_142 = "hello";
@@ -9150,14 +9167,15 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_16 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_75("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_75 */
       else goto _LAND_16;
     }
     else {
-      _LAND_16: {
-                  printf_va_76("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_16:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_76 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
@@ -9165,8 +9183,8 @@ static void test_format_commands(void)
     int tmp_17;
     double value_10 = 123.0;
     tests ++;
-    printf_va_77("#%02d ",tests);
-    printf_va_78("Format command with printf-delegation (double): ");
+    printf("#%02d ",tests); /* printf_va_77 */
+    printf("Format command with printf-delegation (double): "); /* printf_va_78 */
     {
       double __va_arg0_146 = value_10;
       char const *__va_arg1_148 = "hello";
@@ -9178,20 +9196,21 @@ static void test_format_commands(void)
                      "*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",
                      (unsigned int)len);
     if (tmp_17 == 0) {
-      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf_va_79("\033[0;32mPASSED\033[0;0m\n");
+      if (len == (((4 + 5) + (12 + 2)) + 4) + (9 + 2)) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_79 */
       else goto _LAND_17;
     }
     else {
-      _LAND_17: {
-                  printf_va_80("\033[0;31mFAILED\033[0;0m\n");
-                  fails ++;
-                }
+      _LAND_17:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_80 */
+        fails ++;
+      }
     }
     free((void *)cmd);
   }
   tests ++;
-  printf_va_81("#%02d ",tests);
-  printf_va_82("Format command with invalid printf format: ");
+  printf("#%02d ",tests); /* printf_va_81 */
+  printf("Format command with invalid printf format: "); /* printf_va_82 */
   {
     void *__va_arg0_152 = (void *)1234;
     char const *__va_arg1_154 = "foo";
@@ -9201,9 +9220,9 @@ static void test_format_commands(void)
     len = redisFormatCommand(& cmd,"key:%08p %b",
                              (void * const *)(__va_args_158));
   }
-  if (len == -1) printf_va_83("\033[0;32mPASSED\033[0;0m\n");
+  if (len == -1) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_83 */
   else {
-    printf_va_84("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_84 */
     fails ++;
   }
   argv[0] = "SET";
@@ -9212,81 +9231,85 @@ static void test_format_commands(void)
   size_t lens[3] = {(unsigned int)3, (unsigned int)7, (unsigned int)3};
   int argc = 3;
   tests ++;
-  printf_va_85("#%02d ",tests);
-  printf_va_86("Format command by passing argc/argv without lengths: ");
+  printf("#%02d ",tests); /* printf_va_85 */
+  printf("Format command by passing argc/argv without lengths: "); /* printf_va_86 */
   len = redisFormatCommandArgv(& cmd,argc,argv,(size_t const *)0);
   tmp_18 = strncmp((char const *)cmd,
                    "*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",
                    (unsigned int)len);
   if (tmp_18 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_87("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_87 */
     else goto _LAND_18;
   }
   else {
-    _LAND_18: {
-                printf_va_88("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_18:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_88 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   tests ++;
-  printf_va_89("#%02d ",tests);
-  printf_va_90("Format command by passing argc/argv with lengths: ");
+  printf("#%02d ",tests); /* printf_va_89 */
+  printf("Format command by passing argc/argv with lengths: "); /* printf_va_90 */
   len = redisFormatCommandArgv(& cmd,argc,argv,(size_t const *)(lens));
   tmp_19 = strncmp((char const *)cmd,
                    "*3\r\n$3\r\nSET\r\n$7\r\nfoo\000xxx\r\n$3\r\nbar\r\n",
                    (unsigned int)len);
   if (tmp_19 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (7 + 2)) + 4) + (3 + 2)) 
-      printf_va_91("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_91 */
     else goto _LAND_19;
   }
   else {
-    _LAND_19: {
-                printf_va_92("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_19:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_92 */
+      fails ++;
+    }
   }
   free((void *)cmd);
   sds_cmd = (char *)0;
   tests ++;
-  printf_va_93("#%02d ",tests);
-  printf_va_94("Format command into sds by passing argc/argv without lengths: ");
+  printf("#%02d ",tests); /* printf_va_93 */
+  printf("Format command into sds by passing argc/argv without lengths: "); /* printf_va_94 */
   len = redisFormatSdsCommandArgv(& sds_cmd,argc,argv,(size_t const *)0);
   tmp_20 = strncmp((char const *)sds_cmd,
                    "*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",
                    (unsigned int)len);
   if (tmp_20 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (3 + 2)) + 4) + (3 + 2)) 
-      printf_va_95("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_95 */
     else goto _LAND_20;
   }
   else {
-    _LAND_20: {
-                printf_va_96("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_20:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_96 */
+      fails ++;
+    }
   }
   sdsfree(sds_cmd);
   sds_cmd = (char *)0;
   tests ++;
-  printf_va_97("#%02d ",tests);
-  printf_va_98("Format command into sds by passing argc/argv with lengths: ");
+  printf("#%02d ",tests); /* printf_va_97 */
+  printf("Format command into sds by passing argc/argv with lengths: "); /* printf_va_98 */
   len = redisFormatSdsCommandArgv(& sds_cmd,argc,argv,(size_t const *)(lens));
   tmp_21 = strncmp((char const *)sds_cmd,
                    "*3\r\n$3\r\nSET\r\n$7\r\nfoo\000xxx\r\n$3\r\nbar\r\n",
                    (unsigned int)len);
   if (tmp_21 == 0) {
     if (len == (((((4 + 4) + (3 + 2)) + 4) + (7 + 2)) + 4) + (3 + 2)) 
-      printf_va_99("\033[0;32mPASSED\033[0;0m\n");
+      printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_99 */
     else goto _LAND_21;
   }
   else {
-    _LAND_21: {
-                printf_va_100("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_21:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_100 */
+      fails ++;
+    }
   }
   sdsfree(sds_cmd);
   return;
@@ -9351,16 +9374,16 @@ static void test_append_formatted_commands(struct config config)
   int tmp_0;
   c = do_connect(config);
   tests ++;
-  printf_va_101("#%02d ",tests);
-  printf_va_102("Append format command: ");
+  printf("#%02d ",tests); /* printf_va_101 */
+  printf("Append format command: "); /* printf_va_102 */
   {
     void *__va_args[1] = {(void *)0};
     len = redisFormatCommand(& cmd,"SET foo bar",(void * const *)(__va_args));
   }
   tmp = redisAppendFormattedCommand(c,(char const *)cmd,(unsigned int)len);
-  if (tmp == 0) printf_va_103("\033[0;32mPASSED\033[0;0m\n");
+  if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_103 */
   else {
-    printf_va_104("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_104 */
     fails ++;
   }
   tmp_0 = redisGetReply(c,(void **)(& reply));
@@ -10115,8 +10138,8 @@ static void test_reply_reader(void)
   int i;
   int tmp_8;
   tests ++;
-  printf_va_105("#%02d ",tests);
-  printf_va_106("Error handling in reply parser: ");
+  printf("#%02d ",tests); /* printf_va_105 */
+  printf("Error handling in reply parser: "); /* printf_va_106 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"@foo\r\n",(unsigned int)6);
   ret = redisReaderGetReply(reader,(void **)0);
@@ -10124,19 +10147,20 @@ static void test_reply_reader(void)
     int tmp;
     tmp = strcasecmp((char const *)(reader->errstr),
                      "Protocol error, got \"@\" as reply type byte");
-    if (tmp == 0) printf_va_107("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_107 */
     else goto _LAND;
   }
   else {
-    _LAND: {
-             printf_va_108("\033[0;31mFAILED\033[0;0m\n");
-             fails ++;
-           }
+    _LAND:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_108 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_109("#%02d ",tests);
-  printf_va_110("Memory cleanup in reply parser: ");
+  printf("#%02d ",tests); /* printf_va_109 */
+  printf("Memory cleanup in reply parser: "); /* printf_va_110 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"*2\r\n",(unsigned int)4);
   redisReaderFeed(reader,"$5\r\nhello\r\n",(unsigned int)11);
@@ -10146,19 +10170,20 @@ static void test_reply_reader(void)
     int tmp_0;
     tmp_0 = strcasecmp((char const *)(reader->errstr),
                        "Protocol error, got \"@\" as reply type byte");
-    if (tmp_0 == 0) printf_va_111("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_0 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_111 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_112("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_112 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_113("#%02d ",tests);
-  printf_va_114("Set error on nested multi bulks with depth > 7: ");
+  printf("#%02d ",tests); /* printf_va_113 */
+  printf("Set error on nested multi bulks with depth > 7: "); /* printf_va_114 */
   reader = redisReaderCreate();
   i = 0;
   while (i < 9) {
@@ -10170,103 +10195,108 @@ static void test_reply_reader(void)
     int tmp_1;
     tmp_1 = strncasecmp((char const *)(reader->errstr),"No support for",
                         (unsigned int)14);
-    if (tmp_1 == 0) printf_va_115("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_1 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_115 */
     else goto _LAND_1;
   }
   else {
-    _LAND_1: {
-               printf_va_116("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_1:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_116 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_117("#%02d ",tests);
-  printf_va_118("Correctly parses LLONG_MAX: ");
+  printf("#%02d ",tests); /* printf_va_117 */
+  printf("Correctly parses LLONG_MAX: "); /* printf_va_118 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,":9223372036854775807\r\n",(unsigned int)22);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
     if (((redisReply *)reply)->type == 3) {
-      if (((redisReply *)reply)->integer == 9223372036854775807LL) printf_va_119
-                                                                   ("\033[0;32mPASSED\033[0;0m\n");
+      if (((redisReply *)reply)->integer == 9223372036854775807LL) printf
+                                                                   ("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_119 */
       else goto _LAND_3;
     }
     else goto _LAND_3;
   }
   else {
-    _LAND_3: {
-               printf_va_120("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_3:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_120 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_121("#%02d ",tests);
-  printf_va_122("Set error when > LLONG_MAX: ");
+  printf("#%02d ",tests); /* printf_va_121 */
+  printf("Set error when > LLONG_MAX: "); /* printf_va_122 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,":9223372036854775808\r\n",(unsigned int)22);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == -1) {
     int tmp_2;
     tmp_2 = strcasecmp((char const *)(reader->errstr),"Bad integer value");
-    if (tmp_2 == 0) printf_va_123("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_2 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_123 */
     else goto _LAND_4;
   }
   else {
-    _LAND_4: {
-               printf_va_124("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_4:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_124 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_125("#%02d ",tests);
-  printf_va_126("Correctly parses LLONG_MIN: ");
+  printf("#%02d ",tests); /* printf_va_125 */
+  printf("Correctly parses LLONG_MIN: "); /* printf_va_126 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,":-9223372036854775808\r\n",(unsigned int)23);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
     if (((redisReply *)reply)->type == 3) {
       if (((redisReply *)reply)->integer == -9223372036854775807LL - 1LL) 
-        printf_va_127("\033[0;32mPASSED\033[0;0m\n");
+        printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_127 */
       else goto _LAND_6;
     }
     else goto _LAND_6;
   }
   else {
-    _LAND_6: {
-               printf_va_128("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_6:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_128 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_129("#%02d ",tests);
-  printf_va_130("Set error when < LLONG_MIN: ");
+  printf("#%02d ",tests); /* printf_va_129 */
+  printf("Set error when < LLONG_MIN: "); /* printf_va_130 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,":-9223372036854775809\r\n",(unsigned int)23);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == -1) {
     int tmp_3;
     tmp_3 = strcasecmp((char const *)(reader->errstr),"Bad integer value");
-    if (tmp_3 == 0) printf_va_131("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_3 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_131 */
     else goto _LAND_7;
   }
   else {
-    _LAND_7: {
-               printf_va_132("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_7:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_132 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_133("#%02d ",tests);
-  printf_va_134("Set error when array < -1: ");
+  printf("#%02d ",tests); /* printf_va_133 */
+  printf("Set error when array < -1: "); /* printf_va_134 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"*-2\r\n+asdf\r\n",(unsigned int)12);
   ret = redisReaderGetReply(reader,& reply);
@@ -10274,20 +10304,21 @@ static void test_reply_reader(void)
     int tmp_4;
     tmp_4 = strcasecmp((char const *)(reader->errstr),
                        "Multi-bulk length out of range");
-    if (tmp_4 == 0) printf_va_135("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_4 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_135 */
     else goto _LAND_8;
   }
   else {
-    _LAND_8: {
-               printf_va_136("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_8:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_136 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_137("#%02d ",tests);
-  printf_va_138("Set error when bulk < -1: ");
+  printf("#%02d ",tests); /* printf_va_137 */
+  printf("Set error when bulk < -1: "); /* printf_va_138 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"$-2\r\nasdf\r\n",(unsigned int)11);
   ret = redisReaderGetReply(reader,& reply);
@@ -10295,20 +10326,21 @@ static void test_reply_reader(void)
     int tmp_5;
     tmp_5 = strcasecmp((char const *)(reader->errstr),
                        "Bulk string length out of range");
-    if (tmp_5 == 0) printf_va_139("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_5 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_139 */
     else goto _LAND_9;
   }
   else {
-    _LAND_9: {
-               printf_va_140("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_9:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_140 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_141("#%02d ",tests);
-  printf_va_142("Set error when array > SIZE_MAX: ");
+  printf("#%02d ",tests); /* printf_va_141 */
+  printf("Set error when array > SIZE_MAX: "); /* printf_va_142 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"*9223372036854775807\r\n+asdf\r\n",
                   (unsigned int)29);
@@ -10317,20 +10349,21 @@ static void test_reply_reader(void)
     int tmp_6;
     tmp_6 = strcasecmp((char const *)(reader->errstr),
                        "Multi-bulk length out of range");
-    if (tmp_6 == 0) printf_va_143("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_6 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_143 */
     else goto _LAND_10;
   }
   else {
-    _LAND_10: {
-                printf_va_144("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_10:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_144 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_145("#%02d ",tests);
-  printf_va_146("Set error when bulk > SIZE_MAX: ");
+  printf("#%02d ",tests); /* printf_va_145 */
+  printf("Set error when bulk > SIZE_MAX: "); /* printf_va_146 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"$9223372036854775807\r\nasdf\r\n",(unsigned int)28);
   ret = redisReaderGetReply(reader,& reply);
@@ -10338,38 +10371,40 @@ static void test_reply_reader(void)
     int tmp_7;
     tmp_7 = strcasecmp((char const *)(reader->errstr),
                        "Bulk string length out of range");
-    if (tmp_7 == 0) printf_va_147("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_7 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_147 */
     else goto _LAND_11;
   }
   else {
-    _LAND_11: {
-                printf_va_148("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_11:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_148 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
   tests ++;
-  printf_va_149("#%02d ",tests);
-  printf_va_150("Works with NULL functions for reply: ");
+  printf("#%02d ",tests); /* printf_va_149 */
+  printf("Works with NULL functions for reply: "); /* printf_va_150 */
   reader = redisReaderCreate();
   reader->fn = (redisReplyObjectFunctions *)0;
   redisReaderFeed(reader,"+OK\r\n",(unsigned int)5);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
-    if (reply == (void *)5) printf_va_151("\033[0;32mPASSED\033[0;0m\n");
+    if (reply == (void *)5) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_151 */
     else goto _LAND_12;
   }
   else {
-    _LAND_12: {
-                printf_va_152("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_12:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_152 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_153("#%02d ",tests);
-  printf_va_154("Works when a single newline (\\r\\n) covers two calls to feed: ");
+  printf("#%02d ",tests); /* printf_va_153 */
+  printf("Works when a single newline (\\r\\n) covers two calls to feed: "); /* printf_va_154 */
   reader = redisReaderCreate();
   reader->fn = (redisReplyObjectFunctions *)0;
   redisReaderFeed(reader,"+OK\r",(unsigned int)4);
@@ -10381,19 +10416,20 @@ static void test_reply_reader(void)
   redisReaderFeed(reader,"\n",(unsigned int)1);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
-    if (reply == (void *)5) printf_va_155("\033[0;32mPASSED\033[0;0m\n");
+    if (reply == (void *)5) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_155 */
     else goto _LAND_13;
   }
   else {
-    _LAND_13: {
-                printf_va_156("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_13:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_156 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_157("#%02d ",tests);
-  printf_va_158("Don\'t reset state after protocol error: ");
+  printf("#%02d ",tests); /* printf_va_157 */
+  printf("Don\'t reset state after protocol error: "); /* printf_va_158 */
   reader = redisReaderCreate();
   reader->fn = (redisReplyObjectFunctions *)0;
   redisReaderFeed(reader,"x",(unsigned int)1);
@@ -10401,35 +10437,36 @@ static void test_reply_reader(void)
   __FC_assert((ret == -1) != 0,"test.c",455,"ret == REDIS_ERR");
   ret = redisReaderGetReply(reader,& reply);
   if (ret == -1) {
-    if (reply == (void *)0) printf_va_159("\033[0;32mPASSED\033[0;0m\n");
+    if (reply == (void *)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_159 */
     else goto _LAND_14;
   }
   else {
-    _LAND_14: {
-                printf_va_160("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_14:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_160 */
+      fails ++;
+    }
   }
   redisReaderFree(reader);
   tests ++;
-  printf_va_161("#%02d ",tests);
-  printf_va_162("Don\'t do empty allocation for empty multi bulk: ");
+  printf("#%02d ",tests); /* printf_va_161 */
+  printf("Don\'t do empty allocation for empty multi bulk: "); /* printf_va_162 */
   reader = redisReaderCreate();
   redisReaderFeed(reader,"*0\r\n",(unsigned int)4);
   ret = redisReaderGetReply(reader,& reply);
   if (ret == 0) {
     if (((redisReply *)reply)->type == 2) {
-      if (((redisReply *)reply)->elements == (size_t)0) printf_va_163
-                                                        ("\033[0;32mPASSED\033[0;0m\n");
+      if (((redisReply *)reply)->elements == (size_t)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_163 */
       else goto _LAND_16;
     }
     else goto _LAND_16;
   }
   else {
-    _LAND_16: {
-                printf_va_164("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_16:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_164 */
+      fails ++;
+    }
   }
   freeReplyObject(reply);
   redisReaderFree(reader);
@@ -10539,21 +10576,21 @@ static void test_free_null(void)
   void *redisCtx = (void *)0;
   void *reply = (void *)0;
   tests ++;
-  printf_va_165("#%02d ",tests);
-  printf_va_166("Don\'t fail when redisFree is passed a NULL value: ");
+  printf("#%02d ",tests); /* printf_va_165 */
+  printf("Don\'t fail when redisFree is passed a NULL value: "); /* printf_va_166 */
   redisFree((redisContext *)redisCtx);
-  if (redisCtx == (void *)0) printf_va_167("\033[0;32mPASSED\033[0;0m\n");
+  if (redisCtx == (void *)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_167 */
   else {
-    printf_va_168("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_168 */
     fails ++;
   }
   tests ++;
-  printf_va_169("#%02d ",tests);
-  printf_va_170("Don\'t fail when freeReplyObject is passed a NULL value: ");
+  printf("#%02d ",tests); /* printf_va_169 */
+  printf("Don\'t fail when freeReplyObject is passed a NULL value: "); /* printf_va_170 */
   freeReplyObject(reply);
-  if (reply == (void *)0) printf_va_171("\033[0;32mPASSED\033[0;0m\n");
+  if (reply == (void *)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_171 */
   else {
-    printf_va_172("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_172 */
     fails ++;
   }
   return;
@@ -10832,52 +10869,52 @@ static void test_blocking_connection_errors(void)
                 (struct addrinfo const *)(& hints),& ai_tmp);
   if (rv != 0) {
     tests ++;
-    printf_va_173("#%02d ",tests);
-    printf_va_174("Returns error when host cannot be resolved: ");
+    printf("#%02d ",tests); /* printf_va_173 */
+    printf("Returns error when host cannot be resolved: "); /* printf_va_174 */
     c = redisConnect("idontexist-noreally.com",6379);
     if (c->err == 2) {
       int tmp_0;
       tmp_0 = strcmp((char const *)(c->errstr),"Name or service not known");
-      if (tmp_0 == 0) printf_va_175("\033[0;32mPASSED\033[0;0m\n");
+      if (tmp_0 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_175 */
       else {
         int tmp_1;
         tmp_1 = strcmp((char const *)(c->errstr),
                        "Can\'t resolve: idontexist-noreally.com");
-        if (tmp_1 == 0) printf_va_176("\033[0;32mPASSED\033[0;0m\n");
+        if (tmp_1 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_176 */
         else {
           int tmp_2;
           tmp_2 = strcmp((char const *)(c->errstr),"Name does not resolve");
-          if (tmp_2 == 0) printf_va_177("\033[0;32mPASSED\033[0;0m\n");
+          if (tmp_2 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_177 */
           else {
             int tmp_3;
             tmp_3 = strcmp((char const *)(c->errstr),
                            "nodename nor servname provided, or not known");
-            if (tmp_3 == 0) printf_va_178("\033[0;32mPASSED\033[0;0m\n");
+            if (tmp_3 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_178 */
             else {
               int tmp_4;
               tmp_4 = strcmp((char const *)(c->errstr),
                              "No address associated with hostname");
-              if (tmp_4 == 0) printf_va_179("\033[0;32mPASSED\033[0;0m\n");
+              if (tmp_4 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_179 */
               else {
                 int tmp_5;
                 tmp_5 = strcmp((char const *)(c->errstr),
                                "Temporary failure in name resolution");
-                if (tmp_5 == 0) printf_va_180("\033[0;32mPASSED\033[0;0m\n");
+                if (tmp_5 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_180 */
                 else {
                   int tmp_6;
                   tmp_6 = strcmp((char const *)(c->errstr),
                                  "hostname nor servname provided, or not known");
-                  if (tmp_6 == 0) printf_va_181("\033[0;32mPASSED\033[0;0m\n");
+                  if (tmp_6 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_181 */
                   else {
                     int tmp_7;
                     tmp_7 = strcmp((char const *)(c->errstr),
                                    "no address associated with name");
-                    if (tmp_7 == 0) printf_va_182("\033[0;32mPASSED\033[0;0m\n");
+                    if (tmp_7 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_182 */
                     else {
                       int tmp_8;
                       tmp_8 = strcmp((char const *)(c->errstr),
                                      "No such host is known. ");
-                      if (tmp_8 == 0) printf_va_183("\033[0;32mPASSED\033[0;0m\n");
+                      if (tmp_8 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_183 */
                       else goto _LAND;
                     }
                   }
@@ -10889,41 +10926,43 @@ static void test_blocking_connection_errors(void)
       }
     }
     else {
-      _LAND: {
-               printf_va_184("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+      _LAND:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_184 */
+        fails ++;
+      }
     }
     redisFree(c);
   }
   else {
-    printf_va_185("Skipping NXDOMAIN test. Found evil ISP!\n");
+    printf("Skipping NXDOMAIN test. Found evil ISP!\n"); /* printf_va_185 */
     freeaddrinfo(ai_tmp);
   }
   tests ++;
-  printf_va_186("#%02d ",tests);
-  printf_va_187("Returns error when the port is not open: ");
+  printf("#%02d ",tests); /* printf_va_186 */
+  printf("Returns error when the port is not open: "); /* printf_va_187 */
   c = redisConnect("localhost",1);
   if (c->err == 1) {
     int tmp_9;
     tmp_9 = strcmp((char const *)(c->errstr),"Connection refused");
-    if (tmp_9 == 0) printf_va_188("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_9 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_188 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_189("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_189 */
+      fails ++;
+    }
   }
   redisFree(c);
   tests ++;
-  printf_va_190("#%02d ",tests);
-  printf_va_191("Returns error when the unix_sock socket path doesn\'t accept connections: ");
+  printf("#%02d ",tests); /* printf_va_190 */
+  printf("Returns error when the unix_sock socket path doesn\'t accept connections: "); /* printf_va_191 */
   c = redisConnectUnix("/tmp/idontexist.sock");
-  if (c->err == 1) printf_va_192("\033[0;32mPASSED\033[0;0m\n");
+  if (c->err == 1) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_192 */
   else {
-    printf_va_193("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_193 */
     fails ++;
   }
   redisFree(c);
@@ -11433,8 +11472,8 @@ static void test_blocking_connection(struct config config)
   int tmp_14;
   c = do_connect(config);
   tests ++;
-  printf_va_194("#%02d ",tests);
-  printf_va_195("Is able to deliver commands: ");
+  printf("#%02d ",tests); /* printf_va_194 */
+  printf("Is able to deliver commands: "); /* printf_va_195 */
   {
     void *__va_args[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"PING",(void * const *)(__va_args));
@@ -11442,19 +11481,20 @@ static void test_blocking_connection(struct config config)
   if (reply->type == 5) {
     int tmp;
     tmp = strcasecmp((char const *)reply->str,"pong");
-    if (tmp == 0) printf_va_196("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_196 */
     else goto _LAND;
   }
   else {
-    _LAND: {
-             printf_va_197("\033[0;31mFAILED\033[0;0m\n");
-             fails ++;
-           }
+    _LAND:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_197 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_198("#%02d ",tests);
-  printf_va_199("Is a able to send commands verbatim: ");
+  printf("#%02d ",tests); /* printf_va_198 */
+  printf("Is a able to send commands verbatim: "); /* printf_va_199 */
   {
     void *__va_args_22[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"SET foo bar",
@@ -11463,19 +11503,20 @@ static void test_blocking_connection(struct config config)
   if (reply->type == 5) {
     int tmp_0;
     tmp_0 = strcasecmp((char const *)reply->str,"ok");
-    if (tmp_0 == 0) printf_va_200("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_0 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_200 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_201("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_201 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_202("#%02d ",tests);
-  printf_va_203("%%s String interpolation works: ");
+  printf("#%02d ",tests); /* printf_va_202 */
+  printf("%%s String interpolation works: "); /* printf_va_203 */
   {
     char const *__va_arg0 = "foo";
     char const *__va_arg1 = "hello world";
@@ -11492,19 +11533,20 @@ static void test_blocking_connection(struct config config)
   if (reply->type == 1) {
     int tmp_1;
     tmp_1 = strcmp((char const *)reply->str,"hello world");
-    if (tmp_1 == 0) printf_va_204("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_1 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_204 */
     else goto _LAND_1;
   }
   else {
-    _LAND_1: {
-               printf_va_205("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_1:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_205 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_206("#%02d ",tests);
-  printf_va_207("%%b String interpolation works: ");
+  printf("#%02d ",tests); /* printf_va_206 */
+  printf("%%b String interpolation works: "); /* printf_va_207 */
   {
     char const *__va_arg0_30 = "foo";
     unsigned int __va_arg1_32 = (unsigned int)3;
@@ -11525,60 +11567,62 @@ static void test_blocking_connection(struct config config)
     int tmp_2;
     tmp_2 = memcmp((void const *)reply->str,(void const *)"hello\000world",
                    (unsigned int)11);
-    if (tmp_2 == 0) printf_va_208("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_2 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_208 */
     else goto _LAND_2;
   }
   else {
-    _LAND_2: {
-               printf_va_209("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_2:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_209 */
+      fails ++;
+    }
   }
   tests ++;
-  printf_va_210("#%02d ",tests);
-  printf_va_211("Binary reply length is correct: ");
-  if (reply->len == (size_t)11) printf_va_212("\033[0;32mPASSED\033[0;0m\n");
+  printf("#%02d ",tests); /* printf_va_210 */
+  printf("Binary reply length is correct: "); /* printf_va_211 */
+  if (reply->len == (size_t)11) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_212 */
   else {
-    printf_va_213("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_213 */
     fails ++;
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_214("#%02d ",tests);
-  printf_va_215("Can parse nil replies: ");
+  printf("#%02d ",tests); /* printf_va_214 */
+  printf("Can parse nil replies: "); /* printf_va_215 */
   {
     void *__va_args_40[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"GET nokey",
                                        (void * const *)(__va_args_40));
   }
-  if (reply->type == 4) printf_va_216("\033[0;32mPASSED\033[0;0m\n");
+  if (reply->type == 4) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_216 */
   else {
-    printf_va_217("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_217 */
     fails ++;
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_218("#%02d ",tests);
-  printf_va_219("Can parse integer replies: ");
+  printf("#%02d ",tests); /* printf_va_218 */
+  printf("Can parse integer replies: "); /* printf_va_219 */
   {
     void *__va_args_42[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"INCR mycounter",
                                        (void * const *)(__va_args_42));
   }
   if (reply->type == 3) {
-    if (reply->integer == (long long)1) printf_va_220("\033[0;32mPASSED\033[0;0m\n");
+    if (reply->integer == (long long)1) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_220 */
     else goto _LAND_3;
   }
   else {
-    _LAND_3: {
-               printf_va_221("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_3:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_221 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_222("#%02d ",tests);
-  printf_va_223("Can parse multi bulk replies: ");
+  printf("#%02d ",tests); /* printf_va_222 */
+  printf("Can parse multi bulk replies: "); /* printf_va_223 */
   {
     void *__va_args_44[1] = {(void *)0};
     tmp_3 = redisCommand(c,"LPUSH mylist foo",(void * const *)(__va_args_44));
@@ -11605,21 +11649,22 @@ static void test_blocking_connection(struct config config)
         tmp_6 = memcmp((void const *)(*(reply->element + 1))->str,
                        (void const *)"foo",(unsigned int)3);
         if (tmp_6) goto _LAND_6;
-        else printf_va_224("\033[0;32mPASSED\033[0;0m\n");
+        else printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_224 */
       }
     }
     else goto _LAND_6;
   }
   else {
-    _LAND_6: {
-               printf_va_225("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_6:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_225 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_226("#%02d ",tests);
-  printf_va_227("Can handle nested multi bulk replies: ");
+  printf("#%02d ",tests); /* printf_va_226 */
+  printf("Can handle nested multi bulk replies: "); /* printf_va_227 */
   {
     void *__va_args_50[1] = {(void *)0};
     tmp_7 = redisCommand(c,"MULTI",(void * const *)(__va_args_50));
@@ -11659,7 +11704,7 @@ static void test_blocking_connection(struct config config)
                 int tmp_12;
                 tmp_12 = strcasecmp((char const *)(*(reply->element + 1))->str,
                                     "pong");
-                if (tmp_12 == 0) printf_va_228("\033[0;32mPASSED\033[0;0m\n");
+                if (tmp_12 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_228 */
                 else goto _LAND_13;
               }
               else goto _LAND_13;
@@ -11672,15 +11717,16 @@ static void test_blocking_connection(struct config config)
     else goto _LAND_13;
   }
   else {
-    _LAND_13: {
-                printf_va_229("\033[0;31mFAILED\033[0;0m\n");
-                fails ++;
-              }
+    _LAND_13:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_229 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_230("#%02d ",tests);
-  printf_va_231("Can pass NULL to redisGetReply: ");
+  printf("#%02d ",tests); /* printf_va_230 */
+  printf("Can pass NULL to redisGetReply: "); /* printf_va_231 */
   {
     void *__va_args_58[1] = {(void *)0};
     tmp_13 = redisAppendCommand(c,"PING",(void * const *)(__va_args_58));
@@ -11688,9 +11734,9 @@ static void test_blocking_connection(struct config config)
   __FC_assert((tmp_13 == 0) != 0,"test.c",605,
               "redisAppendCommand(c, \"PING\") == REDIS_OK");
   tmp_14 = redisGetReply(c,(void **)0);
-  if (tmp_14 == 0) printf_va_232("\033[0;32mPASSED\033[0;0m\n");
+  if (tmp_14 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_232 */
   else {
-    printf_va_233("\033[0;31mFAILED\033[0;0m\n");
+    printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_233 */
     fails ++;
   }
   disconnect(c,0);
@@ -11725,9 +11771,9 @@ static int detect_debug_sleep(redisContext *c)
         char const *tmp_0;
         if (c->err) tmp_0 = (char const *)(c->errstr); else tmp_0 = "(none)";
         char const *cause = tmp_0;
-        fprintf_va_1(__fc_stderr,
-                     "Error testing for DEBUG SLEEP (Redis error: %s), exiting\n",
-                     (char *)cause);
+        fprintf(__fc_stderr,
+                "Error testing for DEBUG SLEEP (Redis error: %s), exiting\n",
+                (char *)cause); /* fprintf_va_1 */
         exit(-1);
       }
     }
@@ -11954,8 +12000,8 @@ static void test_blocking_connection_timeouts(struct config config)
   char const *sleep_cmd = "DEBUG SLEEP 3\r\n";
   c = do_connect(config);
   tests ++;
-  printf_va_234("#%02d ",tests);
-  printf_va_235("Successfully completes a command when the timeout is not exceeded: ");
+  printf("#%02d ",tests); /* printf_va_234 */
+  printf("Successfully completes a command when the timeout is not exceeded: "); /* printf_va_235 */
   {
     void *__va_args[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"SET foo fast",
@@ -11975,23 +12021,24 @@ static void test_blocking_connection_timeouts(struct config config)
       int tmp;
       tmp = memcmp((void const *)reply->str,(void const *)"fast",
                    (unsigned int)4);
-      if (tmp == 0) printf_va_236("\033[0;32mPASSED\033[0;0m\n");
+      if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_236 */
       else goto _LAND_0;
     }
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_237("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_237 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   disconnect(c,0);
   c = do_connect(config);
   tests ++;
-  printf_va_238("#%02d ",tests);
-  printf_va_239("Does not return a reply when the command times out: ");
+  printf("#%02d ",tests); /* printf_va_238 */
+  printf("Does not return a reply when the command times out: "); /* printf_va_239 */
   tmp_2 = detect_debug_sleep(c);
   if (tmp_2) {
     size_t tmp_0;
@@ -12014,7 +12061,7 @@ static void test_blocking_connection_timeouts(struct config config)
           int tmp_1;
           tmp_1 = strcmp((char const *)(c->errstr),
                          "Resource temporarily unavailable");
-          if (tmp_1 == 0) printf_va_240("\033[0;32mPASSED\033[0;0m\n");
+          if (tmp_1 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_240 */
           else goto _LAND_3;
         }
         else goto _LAND_3;
@@ -12022,20 +12069,21 @@ static void test_blocking_connection_timeouts(struct config config)
       else goto _LAND_3;
     }
     else {
-      _LAND_3: {
-                 printf_va_241("\033[0;31mFAILED\033[0;0m\n");
-                 fails ++;
-               }
+      _LAND_3:
+      {
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_241 */
+        fails ++;
+      }
     }
     freeReplyObject((void *)reply);
   }
   else {
-    printf_va_242("\033[01;33mSKIPPED\033[0;0m\n");
+    printf("\033[01;33mSKIPPED\033[0;0m\n"); /* printf_va_242 */
     skips ++;
   }
   tests ++;
-  printf_va_243("#%02d ",tests);
-  printf_va_244("Reconnect properly reconnects after a timeout: ");
+  printf("#%02d ",tests); /* printf_va_243 */
+  printf("Reconnect properly reconnects after a timeout: "); /* printf_va_244 */
   do_reconnect(c,config);
   {
     void *__va_args_19[1] = {(void *)0};
@@ -12046,21 +12094,22 @@ static void test_blocking_connection_timeouts(struct config config)
     if (reply->type == 5) {
       int tmp_3;
       tmp_3 = strcmp((char const *)reply->str,"PONG");
-      if (tmp_3 == 0) printf_va_245("\033[0;32mPASSED\033[0;0m\n");
+      if (tmp_3 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_245 */
       else goto _LAND_5;
     }
     else goto _LAND_5;
   }
   else {
-    _LAND_5: {
-               printf_va_246("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_5:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_246 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   tests ++;
-  printf_va_247("#%02d ",tests);
-  printf_va_248("Reconnect properly uses owned parameters: ");
+  printf("#%02d ",tests); /* printf_va_247 */
+  printf("Reconnect properly uses owned parameters: "); /* printf_va_248 */
   config.tcp.host = "foo";
   config.unix_sock.path = "foo";
   do_reconnect(c,config);
@@ -12073,16 +12122,17 @@ static void test_blocking_connection_timeouts(struct config config)
     if (reply->type == 5) {
       int tmp_4;
       tmp_4 = strcmp((char const *)reply->str,"PONG");
-      if (tmp_4 == 0) printf_va_249("\033[0;32mPASSED\033[0;0m\n");
+      if (tmp_4 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_249 */
       else goto _LAND_7;
     }
     else goto _LAND_7;
   }
   else {
-    _LAND_7: {
-               printf_va_250("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_7:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_250 */
+      fails ++;
+    }
   }
   freeReplyObject((void *)reply);
   disconnect(c,0);
@@ -12240,8 +12290,8 @@ static void test_blocking_io_errors(struct config config)
     freeReplyObject((void *)reply);
   }
   tests ++;
-  printf_va_251("#%02d ",tests);
-  printf_va_252("Returns I/O error when the connection is lost: ");
+  printf("#%02d ",tests); /* printf_va_251 */
+  printf("Returns I/O error when the connection is lost: "); /* printf_va_252 */
   {
     void *__va_args_21[1] = {(void *)0};
     reply = (redisReply *)redisCommand(c,"QUIT",
@@ -12258,13 +12308,13 @@ static void test_blocking_io_errors(struct config config)
           if (tmp_0 == 0) {
             int tmp_1;
             tmp_1 = redisGetReply(c,& _reply);
-            if (tmp_1 == -1) printf_va_253("\033[0;32mPASSED\033[0;0m\n");
+            if (tmp_1 == -1) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_253 */
             else goto _LAND;
           }
           else {
             _LAND:
             {
-              printf_va_254("\033[0;31mFAILED\033[0;0m\n");
+              printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_254 */
               fails ++;
             }
           }
@@ -12275,9 +12325,9 @@ static void test_blocking_io_errors(struct config config)
     }
     else 
       _LAND_0:
-      if (reply == (redisReply *)0) printf_va_255("\033[0;32mPASSED\033[0;0m\n");
+      if (reply == (redisReply *)0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_255 */
       else {
-        printf_va_256("\033[0;31mFAILED\033[0;0m\n");
+        printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_256 */
         fails ++;
       }
   if (c->err == 3) {
@@ -12291,8 +12341,8 @@ static void test_blocking_io_errors(struct config config)
   redisFree(c);
   c = do_connect(config);
   tests ++;
-  printf_va_257("#%02d ",tests);
-  printf_va_258("Returns I/O error on socket timeout: ");
+  printf("#%02d ",tests); /* printf_va_257 */
+  printf("Returns I/O error on socket timeout: "); /* printf_va_258 */
   struct timeval tv = {.tv_sec = (long)0, .tv_usec = 1000};
   tmp_4 = redisSetTimeout(c,tv);
   __FC_assert((tmp_4 == 0) != 0,"test.c",732,
@@ -12300,16 +12350,17 @@ static void test_blocking_io_errors(struct config config)
   int respcode = redisGetReply(c,& _reply);
   if (respcode == -1) {
     if (c->err == 1) {
-      if (__fc_errno == 11) printf_va_259("\033[0;32mPASSED\033[0;0m\n");
+      if (__fc_errno == 11) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_259 */
       else goto _LAND_2;
     }
     else goto _LAND_2;
   }
   else {
-    _LAND_2: {
-               printf_va_260("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_2:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_260 */
+      fails ++;
+    }
   }
   redisFree(c);
   return;
@@ -12417,8 +12468,8 @@ static void test_invalid_timeout_errors(struct config config)
 {
   redisContext *c;
   tests ++;
-  printf_va_261("#%02d ",tests);
-  printf_va_262("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: ");
+  printf("#%02d ",tests); /* printf_va_261 */
+  printf("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: "); /* printf_va_262 */
   config.tcp.timeout.tv_sec = (long)0;
   config.tcp.timeout.tv_usec = 10000001;
   c = redisConnectWithTimeout(config.tcp.host,config.tcp.port,
@@ -12426,19 +12477,20 @@ static void test_invalid_timeout_errors(struct config config)
   if (c->err == 1) {
     int tmp;
     tmp = strcmp((char const *)(c->errstr),"Invalid timeout specified");
-    if (tmp == 0) printf_va_263("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_263 */
     else goto _LAND;
   }
   else {
-    _LAND: {
-             printf_va_264("\033[0;31mFAILED\033[0;0m\n");
-             fails ++;
-           }
+    _LAND:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_264 */
+      fails ++;
+    }
   }
   redisFree(c);
   tests ++;
-  printf_va_265("#%02d ",tests);
-  printf_va_266("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
+  printf("#%02d ",tests); /* printf_va_265 */
+  printf("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: "); /* printf_va_266 */
   config.tcp.timeout.tv_sec = (2147483647L - (long)999) / (long)1000 + (long)1;
   config.tcp.timeout.tv_usec = 0;
   c = redisConnectWithTimeout(config.tcp.host,config.tcp.port,
@@ -12446,14 +12498,15 @@ static void test_invalid_timeout_errors(struct config config)
   if (c->err == 1) {
     int tmp_0;
     tmp_0 = strcmp((char const *)(c->errstr),"Invalid timeout specified");
-    if (tmp_0 == 0) printf_va_267("\033[0;32mPASSED\033[0;0m\n");
+    if (tmp_0 == 0) printf("\033[0;32mPASSED\033[0;0m\n"); /* printf_va_267 */
     else goto _LAND_0;
   }
   else {
-    _LAND_0: {
-               printf_va_268("\033[0;31mFAILED\033[0;0m\n");
-               fails ++;
-             }
+    _LAND_0:
+    {
+      printf("\033[0;31mFAILED\033[0;0m\n"); /* printf_va_268 */
+      fails ++;
+    }
   }
   redisFree(c);
   return;
@@ -12577,8 +12630,8 @@ static void test_throughput(struct config config)
   long long t2;
   redisContext *c = do_connect(config);
   tests ++;
-  printf_va_269("#%02d ",tests);
-  printf_va_270("Throughput:\n");
+  printf("#%02d ",tests); /* printf_va_269 */
+  printf("Throughput:\n"); /* printf_va_270 */
   i = 0;
   while (i < 500) {
     void *tmp_0;
@@ -12616,7 +12669,7 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_271("\t(%dx PING: %.3fs)\n",num,(double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx PING: %.3fs)\n",num,(double)(t2 - t1) / 1000000.0); /* printf_va_271 */
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   t1 = usec();
   i = 0;
@@ -12650,8 +12703,8 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_272("\t(%dx LRANGE with 500 elements: %.3fs)\n",num,
-                (double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx LRANGE with 500 elements: %.3fs)\n",num,
+         (double)(t2 - t1) / 1000000.0); /* printf_va_272 */
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   t1 = usec();
   i = 0;
@@ -12679,7 +12732,7 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_273("\t(%dx INCRBY: %.3fs)\n",num,(double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx INCRBY: %.3fs)\n",num,(double)(t2 - t1) / 1000000.0); /* printf_va_273 */
   num = 10000;
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   i = 0;
@@ -12714,8 +12767,8 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_274("\t(%dx PING (pipelined): %.3fs)\n",num,
-                (double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx PING (pipelined): %.3fs)\n",num,
+         (double)(t2 - t1) / 1000000.0); /* printf_va_274 */
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   i = 0;
   while (i < num) {
@@ -12757,8 +12810,8 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_275("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n",num,
-                (double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n",num,
+         (double)(t2 - t1) / 1000000.0); /* printf_va_275 */
   replies = (redisReply **)malloc(sizeof(redisReply *) * (unsigned int)num);
   i = 0;
   while (i < num) {
@@ -12794,8 +12847,8 @@ static void test_throughput(struct config config)
     i ++;
   }
   free((void *)replies);
-  printf_va_276("\t(%dx INCRBY (pipelined): %.3fs)\n",num,
-                (double)(t2 - t1) / 1000000.0);
+  printf("\t(%dx INCRBY (pipelined): %.3fs)\n",num,
+         (double)(t2 - t1) / 1000000.0); /* printf_va_276 */
   disconnect(c,0);
   return;
 }
@@ -12933,8 +12986,7 @@ int main(int argc, char **argv)
               else {
                 _LAND:
                 {
-                  fprintf_va_2(__fc_stderr,"Invalid argument: %s\n",
-                               *(argv + 0));
+                  fprintf(__fc_stderr,"Invalid argument: %s\n",*(argv + 0)); /* fprintf_va_2 */
                   exit(1);
                 }
               }
@@ -12958,13 +13010,13 @@ int main(int argc, char **argv)
       if (skips) {
         _LOR:
         {
-          printf_va_277("*** %d TESTS FAILED ***\n",fails);
-          if (skips) printf_va_278("*** %d TESTS SKIPPED ***\n",skips);
+          printf("*** %d TESTS FAILED ***\n",fails); /* printf_va_277 */
+          if (skips) printf("*** %d TESTS SKIPPED ***\n",skips); /* printf_va_278 */
           __retres = 1;
           goto return_label;
         }
       }
-  printf_va_279("ALL TESTS PASSED (%d skipped)\n",skips);
+  printf("ALL TESTS PASSED (%d skipped)\n",skips); /* printf_va_279 */
   __retres = 0;
   return_label: return __retres;
 }
diff --git a/itc-benchmarks/.frama-c/01_w_Defects.parse/framac.ast b/itc-benchmarks/.frama-c/01_w_Defects.parse/framac.ast
index 9cd95a54c785e5959d58aa1da95ad678e4cec30a..1194b48127ae7d0a650d553880b79d909a187436 100644
--- a/itc-benchmarks/.frama-c/01_w_Defects.parse/framac.ast
+++ b/itc-benchmarks/.frama-c/01_w_Defects.parse/framac.ast
@@ -582,8 +582,8 @@ int main(int argc, char **argv)
     vflag_file = (int)tmp;
     tmp_0 = floor((double)(vflag_copy % 1000));
     vflag = (int)tmp_0;
-    printf_va_1("vflag_file = %d vflag_func = %d vflag_copy =%d \n",
-                vflag_file,vflag,vflag_copy);
+    printf("vflag_file = %d vflag_func = %d vflag_copy =%d \n",vflag_file,
+           vflag,vflag_copy); /* printf_va_1 */
     if (vflag_file == 1) goto _LOR;
     else 
       if (vflag_file == 888) _LOR: bit_shift_main();
@@ -662,13 +662,13 @@ int main(int argc, char **argv)
     if (vflag_file == 51) goto _LOR_24;
     else 
       if (vflag_file == 888) _LOR_24: zero_division_main();
-    printf_va_2("Printed from main function ");
+    printf("Printed from main function "); /* printf_va_2 */
   }
   else {
-    printf_va_3("Enter File XXX and Function XXX \n");
-    printf_va_4("Example: To Execute 2nd File 3rd Function , Enter 002003 \n");
-    printf_va_5("Example: To Execute All Files ,Enter 888888 \n");
-    printf_va_6("Example: To Execute All functions in a File :Sample - To execute all functions in 3rd file,Enter 003888 \n");
+    printf("Enter File XXX and Function XXX \n"); /* printf_va_3 */
+    printf("Example: To Execute 2nd File 3rd Function , Enter 002003 \n"); /* printf_va_4 */
+    printf("Example: To Execute All Files ,Enter 888888 \n"); /* printf_va_5 */
+    printf("Example: To Execute All functions in a File :Sample - To execute all functions in 3rd file,Enter 003888 \n"); /* printf_va_6 */
   }
   __retres = 0;
   return __retres;
@@ -962,7 +962,7 @@ void dynamic_buffer_overrun_003(void)
     }
     ret = *(buf + 5);
     free((void *)buf);
-    printf_va_7("%d",ret);
+    printf("%d",ret); /* printf_va_7 */
   }
   return;
 }
@@ -1513,7 +1513,7 @@ void dynamic_buffer_underrun_001(void)
 {
   int i;
   char *buf = calloc((unsigned int)5,sizeof(char));
-  printf_va_8("print bufferundr");
+  printf("print bufferundr"); /* printf_va_8 */
   if (buf != (char *)0) {
     i = 4;
     while (i >= -1) {
@@ -1539,7 +1539,7 @@ int printf_va_9(char const * __restrict format);
 
 void dynamic_buffer_underrun_002(void)
 {
-  printf_va_9("underrun2");
+  printf("underrun2"); /* printf_va_9 */
   short *buf = calloc((unsigned int)5,sizeof(short));
   if (buf != (short *)0) {
     *(buf - 5) = (short)1;
@@ -1574,7 +1574,7 @@ void dynamic_buffer_underrun_003(void)
     }
     ret = *(buf + -1);
     free((void *)buf);
-    printf_va_10("%d",ret);
+    printf("%d",ret); /* printf_va_10 */
   }
   return;
 }
@@ -3663,7 +3663,7 @@ void invalid_memory_access_002(void)
   }
   else _LAND: free((void *)dptr);
   if (! (invalid_memory_access_002_staticflag == 10)) a_0 = *(dptr + 1);
-  printf_va_11("%lf",a_0);
+  printf("%lf",a_0); /* printf_va_11 */
   return;
 }
 
@@ -3711,7 +3711,7 @@ void invalid_memory_access_004(void)
       free((void *)buf);
     }
   }
-  if (staticflag1) printf_va_12("String= %s",buf);
+  if (staticflag1) printf("String= %s",buf); /* printf_va_12 */
   return;
 }
 
@@ -3918,7 +3918,7 @@ void invalid_memory_access_012(void)
 {
   int ret;
   ret = invalid_memory_access_012_func_001(1);
-  printf_va_13("%d",ret);
+  printf("%d",ret); /* printf_va_13 */
   return;
 }
 
@@ -3994,7 +3994,7 @@ void invalid_memory_access_013(void)
   invalid_memory_access_013_func_001(1);
   ret = invalid_memory_access_013_func_002(1);
   invalid_memory_access_013_func_003(0);
-  printf_va_14("%d",ret);
+  printf("%d",ret); /* printf_va_14 */
   return;
 }
 
@@ -4284,7 +4284,7 @@ void littlemem_st_001(void)
   }
   p = (littlemem_st_001_s_001 *)(buf);
   ret = p->c;
-  printf_va_15("%d \n",p->c);
+  printf("%d \n",p->c); /* printf_va_15 */
   return;
 }
 
@@ -4779,8 +4779,8 @@ char *memory_allocation_failure_008_func_001(char const *msg)
     break;
     i ++;
   }
-  if (buffer != (char *)0) snprintf_va_1(buffer,max_buffer * sizeof(char),
-                                         "Error: %s",(char *)error_log);
+  if (buffer != (char *)0) snprintf(buffer,max_buffer * sizeof(char),
+                                    "Error: %s",(char *)error_log); /* snprintf_va_1 */
   return buffer;
 }
 
@@ -4822,7 +4822,7 @@ void memory_allocation_failure_009_func_002(void *vptr_0)
   char *buf = (char *)0;
   memory_allocation_failure_009_func_001(buf);
   buf = *cptr;
-  printf_va_16("%s",buf);
+  printf("%s",buf); /* printf_va_16 */
   return;
 }
 
@@ -4944,7 +4944,7 @@ void memory_allocation_failure_012_func_002(int **pbuf)
   *(pbuf + 3) = buf4;
   *(pbuf + 4) = buf5;
   ret = *(*(pbuf + 1) + 1);
-  printf_va_17("%d",ret);
+  printf("%d",ret); /* printf_va_17 */
   return;
 }
 
@@ -5033,7 +5033,7 @@ void memory_allocation_failure_013(void)
     free((void *)dptr);
     dptr = (char **)0;
   }
-  printf_va_18("%d",(int)a_0);
+  printf("%d",(int)a_0); /* printf_va_18 */
   sink = (int)b;
   return;
 }
@@ -5127,9 +5127,8 @@ void memory_allocation_failure_014(void)
     free((void *)dptr);
     free((void *)ptr1);
   }
-  if (memory_allocation_failure_014_staticflag == 10) printf_va_19("%d %lf",
-                                                                   (int)a_0,
-                                                                   b);
+  if (memory_allocation_failure_014_staticflag == 10) printf("%d %lf",
+                                                             (int)a_0,b); /* printf_va_19 */
   return;
 }
 
@@ -5185,7 +5184,7 @@ void memory_allocation_failure_015(void)
 {
   int flag;
   flag = memory_allocation_failure_015_func_003(1);
-  printf_va_20("%d",flag);
+  printf("%d",flag); /* printf_va_20 */
   return;
 }
 
@@ -7614,7 +7613,7 @@ void uninit_memory_access_001(void)
   unsigned long a_0;
   unsigned long *ret;
   ret = & a_0;
-  printf_va_21("%lu ",*ret);
+  printf("%lu ",*ret); /* printf_va_21 */
   return;
 }
 
@@ -7635,7 +7634,7 @@ void uninit_memory_access_002(void)
 {
   double *a_0 = malloc((unsigned int)3 * sizeof(double));
   if (a_0 != (double *)0) {
-    printf_va_22("%lf ",*(a_0 + 1));
+    printf("%lf ",*(a_0 + 1)); /* printf_va_22 */
     free((void *)a_0);
   }
   return;
@@ -7663,7 +7662,7 @@ void uninit_memory_access_003(void)
   char *str1 = calloc((unsigned int)25,sizeof(char));
   if (str1 != (char *)0) {
     strcpy(str1,(char const *)str2);
-    printf_va_23("%s %s\n",str1,str2);
+    printf("%s %s\n",str1,str2); /* printf_va_23 */
     free((void *)str1);
   }
   return;
@@ -7689,7 +7688,7 @@ void uninit_memory_access_004(void)
   short *p2 = (short *)0;
   if (p1 != (short *)0) p2 = p1;
   ptr = & p2;
-  printf_va_24("%d \n",(int)*(*ptr));
+  printf("%d \n",(int)*(*ptr)); /* printf_va_24 */
   free((void *)p1);
   return;
 }
@@ -7735,7 +7734,7 @@ int printf_va_25(char const * __restrict format);
 void uninit_memory_access_006_func_001(char *dst, char const *src)
 {
   if (src == (char const *)0) {
-    printf_va_25("Null Assignment:\n");
+    printf("Null Assignment:\n"); /* printf_va_25 */
     goto return_label;
   }
   else {
@@ -7768,7 +7767,7 @@ void uninit_memory_access_006(void)
   char *str2;
   char *str1 = calloc((unsigned int)25,sizeof(char));
   uninit_memory_access_006_func_001(str1,(char const *)str2);
-  printf_va_26("%s\n",str1);
+  printf("%s\n",str1); /* printf_va_26 */
   return;
 }
 
@@ -7945,8 +7944,8 @@ void uninit_memory_access_011_func_001(char const *msg)
 {
   char buffer[max_buffer_0];
   char const *error_log = msg;
-  snprintf_va_2(buffer,sizeof(buffer),"Error: %s",(char *)error_log);
-  printf_va_27(" test %s\n",buffer);
+  snprintf(buffer,sizeof(buffer),"Error: %s",(char *)error_log); /* snprintf_va_2 */
+  printf(" test %s\n",buffer); /* printf_va_27 */
   return;
 }
 
diff --git a/itc-benchmarks/.frama-c/02_wo_Defects.parse/framac.ast b/itc-benchmarks/.frama-c/02_wo_Defects.parse/framac.ast
index e0fecf09b54e6a57204431f88f7f16d09fd5bd62..5f1594d9c1c7f91ef8026596c5bd8187e046dbaf 100644
--- a/itc-benchmarks/.frama-c/02_wo_Defects.parse/framac.ast
+++ b/itc-benchmarks/.frama-c/02_wo_Defects.parse/framac.ast
@@ -582,8 +582,8 @@ int main(int argc, char **argv)
     vflag_file = (int)tmp;
     tmp_0 = floor((double)(vflag_copy % 1000));
     vflag = (int)tmp_0;
-    printf_va_1("vflag_file = %d vflag_func = %d vflag_copy =%d \n",
-                vflag_file,vflag,vflag_copy);
+    printf("vflag_file = %d vflag_func = %d vflag_copy =%d \n",vflag_file,
+           vflag,vflag_copy); /* printf_va_1 */
     if (vflag_file == 1) goto _LOR;
     else 
       if (vflag_file == 888) _LOR: bit_shift_main();
@@ -662,13 +662,13 @@ int main(int argc, char **argv)
     if (vflag_file == 51) goto _LOR_24;
     else 
       if (vflag_file == 888) _LOR_24: zero_division_main();
-    printf_va_2("Printed from main function ");
+    printf("Printed from main function "); /* printf_va_2 */
   }
   else {
-    printf_va_3("Enter File XXX and Function XXX \n");
-    printf_va_4("Example: To Execute 2nd File 3rd Function , Enter 002003 \n");
-    printf_va_5("Example: To Execute All Files ,Enter 888888 \n");
-    printf_va_6("Example: To Execute All functions in a File :Sample - To execute all functions in 3rd file,Enter 003888 \n");
+    printf("Enter File XXX and Function XXX \n"); /* printf_va_3 */
+    printf("Example: To Execute 2nd File 3rd Function , Enter 002003 \n"); /* printf_va_4 */
+    printf("Example: To Execute All Files ,Enter 888888 \n"); /* printf_va_5 */
+    printf("Example: To Execute All functions in a File :Sample - To execute all functions in 3rd file,Enter 003888 \n"); /* printf_va_6 */
   }
   __retres = 0;
   return __retres;
@@ -964,7 +964,7 @@ void dynamic_buffer_overrun_003(void)
     }
     ret = *(buf_0 + 4);
     free((void *)buf_0);
-    printf_va_7("%d",ret);
+    printf("%d",ret); /* printf_va_7 */
   }
   return;
 }
@@ -1550,7 +1550,7 @@ void dynamic_buffer_underrun_003(void)
     }
     ret = *(buf_0 + 0);
     free((void *)buf_0);
-    printf_va_8("%d",ret);
+    printf("%d",ret); /* printf_va_8 */
   }
   return;
 }
@@ -3462,7 +3462,7 @@ void free_nondynamic_allocated_memory_010(void)
   while (i < 1) {
     {
       char *ptr = (char *)"g";
-      printf_va_9("%s",ptr);
+      printf("%s",ptr); /* printf_va_9 */
     }
     i ++;
   }
@@ -3643,7 +3643,7 @@ void invalid_memory_access_001(void)
     }
     if (flag == 10) {
       a_0 = *(ptr + 1);
-      printf_va_10("%d",a_0);
+      printf("%d",a_0); /* printf_va_10 */
     }
     if (flag == 10) {
       free((void *)ptr);
@@ -3683,7 +3683,7 @@ void invalid_memory_access_002(void)
   if (invalid_memory_access_002_staticflag == 10) 
     if (ptr != (double *)0) a_0 = *(ptr + 1); else a_0 = *(dptr + 1);
   else a_0 = *(dptr + 1);
-  printf_va_11("%lf",a_0);
+  printf("%lf",a_0); /* printf_va_11 */
   if (invalid_memory_access_002_staticflag == 10) {
     if (ptr != (double *)0) {
       free((void *)ptr);
@@ -3933,7 +3933,7 @@ void invalid_memory_access_012(void)
 {
   int ret;
   ret = invalid_memory_access_012_func_001(1);
-  printf_va_12("%d",ret);
+  printf("%d",ret); /* printf_va_12 */
   return;
 }
 
@@ -4007,7 +4007,7 @@ void invalid_memory_access_013(void)
   invalid_memory_access_013_func_001(1);
   invalid_memory_access_013_func_003(1);
   ret = invalid_memory_access_013_func_002(1);
-  printf_va_13("%d",ret);
+  printf("%d",ret); /* printf_va_13 */
   return;
 }
 
@@ -4164,10 +4164,9 @@ int printf_va_15(char const * __restrict format, char *param0);
 void invalid_memory_access_016_func_003(void)
 {
   char s_0[10];
-  printf_va_14("invalid gbl= %s \n",
-               *(invalid_memory_access_016_doubleptr_gbl + 0));
+  printf("invalid gbl= %s \n",*(invalid_memory_access_016_doubleptr_gbl + 0)); /* printf_va_14 */
   strcpy(s_0,(char const *)*(invalid_memory_access_016_doubleptr_gbl + 0));
-  printf_va_15("invalid str= %s \n",s_0);
+  printf("invalid str= %s \n",s_0); /* printf_va_15 */
   return;
 }
 
@@ -4245,9 +4244,9 @@ int printf_va_17(char const * __restrict format, char *param0);
 void invalid_memory_access_017_func_004(void)
 {
   char s_0[10];
-  printf_va_16("invalid gbl= %s \n",invalid_memory_access_017_doubleptr_gbl);
+  printf("invalid gbl= %s \n",invalid_memory_access_017_doubleptr_gbl); /* printf_va_16 */
   strcpy(s_0,(char const *)invalid_memory_access_017_doubleptr_gbl);
-  printf_va_17("invalid str= %s \n",s_0);
+  printf("invalid str= %s \n",s_0); /* printf_va_17 */
   return;
 }
 
@@ -4354,7 +4353,7 @@ void littlemem_st_001(void)
   }
   p = (littlemem_st_001_s_001 *)(buf_0);
   ret = p->c;
-  printf_va_18("%d \n",p->c);
+  printf("%d \n",p->c); /* printf_va_18 */
   return;
 }
 
@@ -4855,9 +4854,9 @@ char *memory_allocation_failure_008_func_001(char const *msg)
     break;
     i ++;
   }
-  if (buffer != (char *)0) snprintf_va_1(buffer,
-                                         (unsigned int)max_buffer * sizeof(char),
-                                         "Error: %s",(char *)error_log);
+  if (buffer != (char *)0) snprintf(buffer,
+                                    (unsigned int)max_buffer * sizeof(char),
+                                    "Error: %s",(char *)error_log); /* snprintf_va_1 */
   return buffer;
 }
 
@@ -4899,7 +4898,7 @@ void memory_allocation_failure_009_func_002(void *vptr_0)
   char *buf_0 = (char *)0;
   memory_allocation_failure_009_func_001(buf_0);
   buf_0 = *cptr;
-  printf_va_19("%s",buf_0);
+  printf("%s",buf_0); /* printf_va_19 */
   return;
 }
 
@@ -5020,7 +5019,7 @@ void memory_allocation_failure_012_func_002(int **pbuf)
   *(pbuf + 3) = buf4;
   *(pbuf + 4) = buf5;
   ret = *(*(pbuf + 1) + 1);
-  printf_va_20("%d",ret);
+  printf("%d",ret); /* printf_va_20 */
   return;
 }
 
@@ -5151,7 +5150,7 @@ void memory_allocation_failure_014(void)
     free((void *)dptr);
     free((void *)ptr1);
   }
-  printf_va_21("%d %lf",(int)a_0,b);
+  printf("%d %lf",(int)a_0,b); /* printf_va_21 */
   return;
 }
 
@@ -5206,7 +5205,7 @@ void memory_allocation_failure_015(void)
 {
   int flag;
   flag = memory_allocation_failure_015_func_003(1);
-  printf_va_22("%d",flag);
+  printf("%d",flag); /* printf_va_22 */
   return;
 }
 
@@ -7682,7 +7681,7 @@ void uninit_memory_access_001(void)
   unsigned long *ret;
   unsigned long a_0 = (unsigned long)10;
   ret = & a_0;
-  printf_va_23("%lu ",*ret);
+  printf("%lu ",*ret); /* printf_va_23 */
   return;
 }
 
@@ -7704,7 +7703,7 @@ void uninit_memory_access_002(void)
   double *a_0 = calloc((unsigned int)3,sizeof(double));
   if (a_0 != (double *)0) {
     *(a_0 + 1) = 10.00000;
-    printf_va_24("%lf ",*(a_0 + 1));
+    printf("%lf ",*(a_0 + 1)); /* printf_va_24 */
     free((void *)a_0);
   }
   return;
@@ -7732,7 +7731,7 @@ void uninit_memory_access_003(void)
   char *str2 = (char *)"THIS IS STRING";
   if (str1 != (char *)0) {
     strcpy(str1,(char const *)str2);
-    printf_va_25("%s %s\n",str1,str2);
+    printf("%s %s\n",str1,str2); /* printf_va_25 */
     free((void *)str1);
   }
   return;
@@ -7761,7 +7760,7 @@ void uninit_memory_access_004(void)
     p2 = p1;
   }
   ptr = & p2;
-  printf_va_26("%d \n",(int)*(*ptr));
+  printf("%d \n",(int)*(*ptr)); /* printf_va_26 */
   free((void *)p1);
   return;
 }
@@ -7807,7 +7806,7 @@ int printf_va_27(char const * __restrict format);
 void uninit_memory_access_006_func_001(char *dst, char const *src)
 {
   if (src == (char const *)0) {
-    printf_va_27("Null Assignment:\n");
+    printf("Null Assignment:\n"); /* printf_va_27 */
     goto return_label;
   }
   else {
@@ -7840,7 +7839,7 @@ void uninit_memory_access_006(void)
   char *str1 = calloc((unsigned int)25,sizeof(char));
   char *str2 = (char *)"STRING";
   uninit_memory_access_006_func_001(str1,(char const *)str2);
-  printf_va_28("%s\n",str1);
+  printf("%s\n",str1); /* printf_va_28 */
   return;
 }
 
@@ -8029,8 +8028,8 @@ void uninit_memory_access_011_func_001(char const *msg)
 {
   char buffer[max_buffer_0];
   char const *error_log = msg;
-  snprintf_va_2(buffer,sizeof(buffer),"Error: %s",(char *)error_log);
-  printf_va_29(" test %s\n",buffer);
+  snprintf(buffer,sizeof(buffer),"Error: %s",(char *)error_log); /* snprintf_va_2 */
+  printf(" test %s\n",buffer); /* printf_va_29 */
   return;
 }
 
@@ -8333,7 +8332,7 @@ void uninit_pointer_007(void)
   i = 0;
   while (i < 5) {
     *(*(pbuf[i]) + j) = (char)'a';
-    printf_va_30("uninit %c \n",(int)*(*(pbuf[i]) + j));
+    printf("uninit %c \n",(int)*(*(pbuf[i]) + j)); /* printf_va_30 */
     i ++;
   }
   free((void *)buf1);
@@ -8597,10 +8596,9 @@ void uninit_pointer_016(void)
     while (i < 10) {
       if (*(uninit_pointer_016_gbl_doubleptr + i) != (char *)0) {
         if (i == 7) {
-          printf_va_31("unint p %s \n",
-                       *(uninit_pointer_016_gbl_doubleptr + i));
+          printf("unint p %s \n",*(uninit_pointer_016_gbl_doubleptr + i)); /* printf_va_31 */
           strcpy(s_0,(char const *)*(uninit_pointer_016_gbl_doubleptr + i));
-          printf_va_32("unint p %s \n",s_0);
+          printf("unint p %s \n",s_0); /* printf_va_32 */
         }
         free((void *)*(uninit_pointer_016_gbl_doubleptr + i));
       }
diff --git a/jsmn/.frama-c/jsmn-example.parse/framac.ast b/jsmn/.frama-c/jsmn-example.parse/framac.ast
index 98d2100b5f1d3fc0ab93dd33f66668dcae927434..e8f66b01dfddd7c7543c596133a3b38183a34ff9 100644
--- a/jsmn/.frama-c/jsmn-example.parse/framac.ast
+++ b/jsmn/.frama-c/jsmn-example.parse/framac.ast
@@ -484,7 +484,7 @@ int main(void)
   ;
   r = jsmn_parse(& p,JSON_STRING,tmp,t,sizeof(t) / sizeof(t[0]));
   if (r < 0) {
-    printf_va_1("Failed to parse JSON: %d\n",r);
+    printf("Failed to parse JSON: %d\n",r); /* printf_va_1 */
     __retres = 1;
     goto return_label;
   }
@@ -493,7 +493,7 @@ int main(void)
     if (t[0].type != (unsigned int)JSMN_OBJECT) {
       _LOR:
       {
-        printf_va_2("Object expected\n");
+        printf("Object expected\n"); /* printf_va_2 */
         __retres = 1;
         goto return_label;
       }
@@ -504,24 +504,24 @@ int main(void)
       int tmp_3;
       tmp_3 = jsoneq(JSON_STRING,& t[i],"user");
       if (tmp_3 == 0) {
-        printf_va_3("- User: %.*s\n",t[i + 1].end - t[i + 1].start,
-                    (char *)(JSON_STRING + t[i + 1].start));
+        printf("- User: %.*s\n",t[i + 1].end - t[i + 1].start,
+               (char *)(JSON_STRING + t[i + 1].start)); /* printf_va_3 */
         i ++;
       }
       else {
         int tmp_2;
         tmp_2 = jsoneq(JSON_STRING,& t[i],"admin");
         if (tmp_2 == 0) {
-          printf_va_4("- Admin: %.*s\n",t[i + 1].end - t[i + 1].start,
-                      (char *)(JSON_STRING + t[i + 1].start));
+          printf("- Admin: %.*s\n",t[i + 1].end - t[i + 1].start,
+                 (char *)(JSON_STRING + t[i + 1].start)); /* printf_va_4 */
           i ++;
         }
         else {
           int tmp_1;
           tmp_1 = jsoneq(JSON_STRING,& t[i],"uid");
           if (tmp_1 == 0) {
-            printf_va_5("- UID: %.*s\n",t[i + 1].end - t[i + 1].start,
-                        (char *)(JSON_STRING + t[i + 1].start));
+            printf("- UID: %.*s\n",t[i + 1].end - t[i + 1].start,
+                   (char *)(JSON_STRING + t[i + 1].start)); /* printf_va_5 */
             i ++;
           }
           else {
@@ -529,21 +529,21 @@ int main(void)
             tmp_0 = jsoneq(JSON_STRING,& t[i],"groups");
             if (tmp_0 == 0) {
               int j;
-              printf_va_6("- Groups:\n");
+              printf("- Groups:\n"); /* printf_va_6 */
               if (t[i + 1].type != (unsigned int)JSMN_ARRAY) goto __Cont;
               j = 0;
               while (j < t[i + 1].size) {
                 {
                   jsmntok_t *g = & t[(i + j) + 2];
-                  printf_va_7("  * %.*s\n",g->end - g->start,
-                              (char *)(JSON_STRING + g->start));
+                  printf("  * %.*s\n",g->end - g->start,
+                         (char *)(JSON_STRING + g->start)); /* printf_va_7 */
                 }
                 j ++;
               }
               i += t[i + 1].size + 1;
             }
-            else printf_va_8("Unexpected key: %.*s\n",t[i].end - t[i].start,
-                             (char *)(JSON_STRING + t[i].start));
+            else printf("Unexpected key: %.*s\n",t[i].end - t[i].start,
+                        (char *)(JSON_STRING + t[i].start)); /* printf_va_8 */
           }
         }
       }
diff --git a/jsmn/.frama-c/jsmn-main.parse/framac.ast b/jsmn/.frama-c/jsmn-main.parse/framac.ast
index 484dc7e8dbb12558afe23dd9cbb20b522c1e2d45..aab20e1f6e517a8cbe31afe4432dda8aac9fbd2a 100644
--- a/jsmn/.frama-c/jsmn-main.parse/framac.ast
+++ b/jsmn/.frama-c/jsmn-main.parse/framac.ast
@@ -57,7 +57,7 @@ static void test(int (*func)(void), char const *name)
   if (r == 0) test_passed ++;
   else {
     test_failed ++;
-    printf_va_1("FAILED: %s (at line %d)\n",(char *)name,r);
+    printf("FAILED: %s (at line %d)\n",(char *)name,r); /* printf_va_1 */
   }
   return;
 }
@@ -486,28 +486,26 @@ static int vtokeq(char const *s, jsmntok_t *t, int numtok, va_list ap)
           value = (char *)0;
         }
       if ((t + i)->type != (unsigned int)type) {
-        printf_va_2("token %d type is %d, not %d\n",i,(int)(t + i)->type,
-                    type);
+        printf("token %d type is %d, not %d\n",i,(int)(t + i)->type,type); /* printf_va_2 */
         __retres = 0;
         goto return_label;
       }
       if (start != -1) 
         if (end != -1) {
           if ((t + i)->start != start) {
-            printf_va_3("token %d start is %d, not %d\n",i,(t + i)->start,
-                        start);
+            printf("token %d start is %d, not %d\n",i,(t + i)->start,start); /* printf_va_3 */
             __retres = 0;
             goto return_label;
           }
           if ((t + i)->end != end) {
-            printf_va_4("token %d end is %d, not %d\n",i,(t + i)->end,end);
+            printf("token %d end is %d, not %d\n",i,(t + i)->end,end); /* printf_va_4 */
             __retres = 0;
             goto return_label;
           }
         }
       if (size != -1) 
         if ((t + i)->size != size) {
-          printf_va_5("token %d size is %d, not %d\n",i,(t + i)->size,size);
+          printf("token %d size is %d, not %d\n",i,(t + i)->size,size); /* printf_va_5 */
           __retres = 0;
           goto return_label;
         }
@@ -525,9 +523,9 @@ static int vtokeq(char const *s, jsmntok_t *t, int numtok, va_list ap)
             if (tmp_0 != 0) {
               _LOR:
               {
-                printf_va_6("token %d value is %.*s, not %s\n",i,
-                            (t + i)->end - (t + i)->start,
-                            (char *)(s + (t + i)->start),value);
+                printf("token %d value is %.*s, not %s\n",i,
+                       (t + i)->end - (t + i)->start,
+                       (char *)(s + (t + i)->start),value); /* printf_va_6 */
                 __retres = 0;
                 goto return_label;
               }
@@ -582,7 +580,7 @@ static int parse(char const *s, int status, int numtok,
   ;
   r = jsmn_parse(& p,s,tmp_0,t,(unsigned int)numtok);
   if (r != status) {
-    printf_va_7("status is %d, not %d\n",r,status);
+    printf("status is %d, not %d\n",r,status); /* printf_va_7 */
     __retres = 0;
     goto return_label;
   }
@@ -2013,7 +2011,7 @@ int main(void)
   test(& test_count,"test tokens count estimation");
   test(& test_nonstrict,"test for non-strict mode");
   test(& test_unmatched_brackets,"test for unmatched brackets");
-  printf_va_8("\nPASSED: %d\nFAILED: %d\n",test_passed,test_failed);
+  printf("\nPASSED: %d\nFAILED: %d\n",test_passed,test_failed); /* printf_va_8 */
   __retres = test_failed > 0;
   return __retres;
 }
diff --git a/kilo/.frama-c/kilo.parse/framac.ast b/kilo/.frama-c/kilo.parse/framac.ast
index dcdd85abfe598d96e30f2d1cbd948d2fb6a2b26c..7749a21dbe947e2b9d69078e5d6617ae279b20f9 100644
--- a/kilo/.frama-c/kilo.parse/framac.ast
+++ b/kilo/.frama-c/kilo.parse/framac.ast
@@ -296,7 +296,7 @@ int getCursorPosition(int ifd, int ofd, int *rows, int *cols)
       __retres = -1;
       goto return_label;
     }
-  tmp_1 = sscanf_va_1((char const *)(& buf[2]),"%d;%d",rows,cols);
+  tmp_1 = sscanf((char const *)(& buf[2]),"%d;%d",rows,cols); /* sscanf_va_1 */
   if (tmp_1 != 2) {
     __retres = -1;
     goto return_label;
@@ -324,7 +324,7 @@ int getWindowSize(int ifd, int ofd, int *rows, int *cols)
   int __retres;
   struct winsize ws;
   int tmp_2;
-  tmp_2 = __va_ioctl_ptr(1,0x5413,(void *)(& ws));
+  tmp_2 = ioctl(1,0x5413,(void *)(& ws)); /* __va_ioctl_ptr */
   if (tmp_2 == -1) goto _LOR;
   else 
     if ((int)ws.ws_col == 0) {
@@ -343,7 +343,7 @@ int getWindowSize(int ifd, int ofd, int *rows, int *cols)
         if (tmp != 12) goto failed;
         retval = getCursorPosition(ifd,ofd,rows,cols);
         if (retval == -1) goto failed;
-        snprintf_va_1(seq,(unsigned int)32,"\033[%d;%dH",orig_row,orig_col);
+        snprintf(seq,(unsigned int)32,"\033[%d;%dH",orig_row,orig_col); /* snprintf_va_1 */
         tmp_0 = strlen((char const *)(seq));
         ;
         tmp_1 = write(ofd,(void const *)(seq),tmp_0);
@@ -1162,8 +1162,8 @@ void editorRefreshScreen(void)
   if (E.dirty) tmp_3 = "(modified)"; else tmp_3 = "";
   ;
   ;
-  tmp_4 = snprintf_va_4(status,sizeof(status),"%.20s - %d lines %s",
-                        E.filename,E.numrows,(char *)tmp_3);
+  tmp_4 = snprintf(status,sizeof(status),"%.20s - %d lines %s",E.filename,
+                   E.numrows,(char *)tmp_3); /* snprintf_va_4 */
   int len_0 = tmp_4;
   int rlen =
     snprintf_va_5(rstatus,sizeof(rstatus),"%d/%d",(E.rowoff + E.cy) + 1,
@@ -1208,7 +1208,7 @@ void editorRefreshScreen(void)
       j_0 ++;
     }
   }
-  snprintf_va_6(buf,sizeof(buf),"\033[%d;%dH",E.cy + 1,cx);
+  snprintf(buf,sizeof(buf),"\033[%d;%dH",E.cy + 1,cx); /* snprintf_va_6 */
   tmp_10 = strlen((char const *)(buf));
   abAppend(& ab,(char const *)(buf),(int)tmp_10);
   abAppend(& ab,"\033[?25h",6);
@@ -1534,7 +1534,7 @@ int main(int argc, char **argv)
 {
   int __retres;
   if (argc != 2) {
-    fprintf_va_1(__fc_stderr,"Usage: kilo <filename>\n");
+    fprintf(__fc_stderr,"Usage: kilo <filename>\n"); /* fprintf_va_1 */
     exit(1);
   }
   initEditor();
diff --git a/libmodbus/.frama-c/libmodbus-random-client.parse/framac.ast b/libmodbus/.frama-c/libmodbus-random-client.parse/framac.ast
index 47ae0ed7fbeae2b664d9eff9f87700443fc735ca..8057c94685e0dfb8393a538c2f88592243185ea9 100644
--- a/libmodbus/.frama-c/libmodbus-random-client.parse/framac.ast
+++ b/libmodbus/.frama-c/libmodbus-random-client.parse/framac.ast
@@ -1082,9 +1082,9 @@ static void _modbus_rtu_ioctl_rts(modbus_t *ctx, int on)
 {
   int flags;
   int fd = ctx->s;
-  __va_ioctl_ptr(fd,0x5415,(void *)(& flags));
+  ioctl(fd,0x5415,(void *)(& flags)); /* __va_ioctl_ptr */
   if (on) flags |= 0x004; else flags &= ~ 0x004;
-  __va_ioctl_ptr(fd,0x5418,(void *)(& flags));
+  ioctl(fd,0x5418,(void *)(& flags)); /* __va_ioctl_ptr */
   return;
 }
 
@@ -1107,8 +1107,7 @@ static ssize_t _modbus_rtu_send(modbus_t *ctx, uint8_t const *req,
   modbus_rtu_t *ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
   if (ctx_rtu->rts != 0) {
     ssize_t size;
-    if (ctx->debug) fprintf_va_1(__fc_stderr,
-                                 "Sending request using RTS signal\n");
+    if (ctx->debug) fprintf(__fc_stderr,"Sending request using RTS signal\n"); /* fprintf_va_1 */
     (*(ctx_rtu->set_rts))(ctx,ctx_rtu->rts == 1);
     usleep((unsigned int)ctx_rtu->rts_delay);
     size = write(ctx->s,(void const *)req,(unsigned long)req_length);
@@ -1146,7 +1145,7 @@ static int _modbus_rtu_receive(modbus_t *ctx, uint8_t *req)
     _modbus_receive_msg(ctx,req,MSG_CONFIRMATION);
     ctx_rtu->confirmation_to_ignore = 0;
     rc = 0;
-    if (ctx->debug) printf_va_1("Confirmation to ignore\n");
+    if (ctx->debug) printf("Confirmation to ignore\n"); /* printf_va_1 */
   }
   else {
     rc = _modbus_receive_msg(ctx,req,MSG_INDICATION);
@@ -1186,9 +1185,9 @@ static int _modbus_rtu_pre_check_confirmation(modbus_t *ctx,
   int __retres;
   if ((int)*(req + 0) != (int)*(rsp + 0)) {
     if ((int)*(req + 0) != 0) {
-      if (ctx->debug) fprintf_va_2(__fc_stderr,
-                                   "The responding slave %d isn\'t the requested slave %d\n",
-                                   (int)*(rsp + 0),(int)*(req + 0));
+      if (ctx->debug) fprintf(__fc_stderr,
+                              "The responding slave %d isn\'t the requested slave %d\n",
+                              (int)*(rsp + 0),(int)*(req + 0)); /* fprintf_va_2 */
       __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 6;
       __retres = -1;
       goto return_label;
@@ -1241,8 +1240,8 @@ static int _modbus_rtu_check_integrity(modbus_t *ctx, uint8_t *msg,
   int slave = (int)*(msg + 0);
   if (slave != ctx->slave) 
     if (slave != 0) {
-      if (ctx->debug) printf_va_2("Request for slave %d ignored (not %d)\n",
-                                  slave,ctx->slave);
+      if (ctx->debug) printf("Request for slave %d ignored (not %d)\n",slave,
+                             ctx->slave); /* printf_va_2 */
       __retres = 0;
       goto return_label;
     }
@@ -1254,10 +1253,10 @@ static int _modbus_rtu_check_integrity(modbus_t *ctx, uint8_t *msg,
     goto return_label;
   }
   else {
-    if (ctx->debug) fprintf_va_3(__fc_stderr,
-                                 "ERROR CRC received 0x%0X != CRC calculated 0x%0X\n",
-                                 (unsigned int)((int)crc_received),
-                                 (unsigned int)((int)crc_calculated));
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR CRC received 0x%0X != CRC calculated 0x%0X\n",
+                            (unsigned int)((int)crc_received),
+                            (unsigned int)((int)crc_calculated)); /* fprintf_va_3 */
     if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_PROTOCOL) _modbus_rtu_flush
                                                               (ctx);
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 1;
@@ -1325,21 +1324,20 @@ static int _modbus_rtu_connect(modbus_t *ctx)
   int tmp_0;
   int tmp_2;
   modbus_rtu_t *ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
-  if (ctx->debug) printf_va_3("Opening %s at %d bauds (%c, %d, %d)\n",
-                              ctx_rtu->device,ctx_rtu->baud,
-                              (int)ctx_rtu->parity,(int)ctx_rtu->data_bit,
-                              (int)ctx_rtu->stop_bit);
+  if (ctx->debug) printf("Opening %s at %d bauds (%c, %d, %d)\n",
+                         ctx_rtu->device,ctx_rtu->baud,(int)ctx_rtu->parity,
+                         (int)ctx_rtu->data_bit,(int)ctx_rtu->stop_bit); /* printf_va_3 */
   flags = ((2 | 0x100) | 0x800) | 0x80;
   flags |= 0x80000;
-  ctx->s = __va_open_void((char const *)ctx_rtu->device,flags);
+  ctx->s = open((char const *)ctx_rtu->device,flags); /* __va_open_void */
   if (ctx->s == -1) {
     if (ctx->debug) {
       char *tmp;
       tmp = strerror(__fc_errno);
       ;
       ;
-      fprintf_va_4(__fc_stderr,"ERROR Can\'t open the device %s (%s)\n",
-                   ctx_rtu->device,tmp);
+      fprintf(__fc_stderr,"ERROR Can\'t open the device %s (%s)\n",
+              ctx_rtu->device,tmp); /* fprintf_va_4 */
     }
     __retres = -1;
     goto return_label;
@@ -1394,9 +1392,9 @@ static int _modbus_rtu_connect(modbus_t *ctx)
     case 4000000: speed = (unsigned int)0010017;
     break;
     default: speed = (unsigned int)0000015;
-    if (ctx->debug) fprintf_va_5(__fc_stderr,
-                                 "WARNING Unknown baud rate %d for %s (B9600 used)\n",
-                                 ctx_rtu->baud,ctx_rtu->device);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "WARNING Unknown baud rate %d for %s (B9600 used)\n",
+                            ctx_rtu->baud,ctx_rtu->device); /* fprintf_va_5 */
   }
   tmp_0 = cfsetispeed(& tios,speed);
   if (tmp_0 < 0) goto _LOR;
@@ -1475,8 +1473,8 @@ int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode)
     goto return_label;
   }
   if ((ctx->backend)->backend_type == (unsigned int)_MODBUS_BACKEND_TYPE_RTU) {
-    if (ctx->debug) fprintf_va_6(__fc_stderr,
-                                 "This function isn\'t supported on your platform\n");
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "This function isn\'t supported on your platform\n"); /* fprintf_va_6 */
     __fc_errno = 95;
     __retres = -1;
     goto return_label;
@@ -1507,8 +1505,8 @@ int modbus_rtu_get_serial_mode(modbus_t *ctx)
     goto return_label;
   }
   if ((ctx->backend)->backend_type == (unsigned int)_MODBUS_BACKEND_TYPE_RTU) {
-    if (ctx->debug) fprintf_va_7(__fc_stderr,
-                                 "This function isn\'t supported on your platform\n");
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "This function isn\'t supported on your platform\n"); /* fprintf_va_7 */
     __fc_errno = 95;
     __retres = -1;
     goto return_label;
@@ -1687,8 +1685,8 @@ static int _modbus_rtu_select(modbus_t *ctx, fd_set *rset,
     s_rc = select(ctx->s + 1,rset,(fd_set *)0,(fd_set *)0,tv);
     if (! (s_rc == -1)) break;
     if (__fc_errno == 4) {
-      if (ctx->debug) fprintf_va_8(__fc_stderr,
-                                   "A non blocked signal was caught\n");
+      if (ctx->debug) fprintf(__fc_stderr,
+                              "A non blocked signal was caught\n"); /* fprintf_va_8 */
       FD_ZERO(rset);
       FD_SET(ctx->s,rset);
     }
@@ -1772,14 +1770,14 @@ modbus_t *modbus_new_rtu(char const *device, int baud, char parity,
     if ((int)*device == 0) {
       _LOR:
       {
-        fprintf_va_9(__fc_stderr,"The device string is empty\n");
+        fprintf(__fc_stderr,"The device string is empty\n"); /* fprintf_va_9 */
         __fc_errno = 22;
         __retres = (modbus_t *)0;
         goto return_label;
       }
     }
   if (baud == 0) {
-    fprintf_va_10(__fc_stderr,"The baud rate value must not be zero\n");
+    fprintf(__fc_stderr,"The baud rate value must not be zero\n"); /* fprintf_va_10 */
     __fc_errno = 22;
     __retres = (modbus_t *)0;
     goto return_label;
@@ -1953,12 +1951,12 @@ static int _modbus_tcp_pre_check_confirmation(modbus_t *ctx,
     if ((int)*(req + 1) != (int)*(rsp + 1)) {
       _LOR:
       {
-        if (ctx->debug) fprintf_va_11(__fc_stderr,
-                                      "Invalid transaction ID received 0x%X (not 0x%X)\n",
-                                      (unsigned int)(((int)*(rsp + 0) << 8) + (int)*(
-                                                     rsp + 1)),
-                                      (unsigned int)(((int)*(req + 0) << 8) + (int)*(
-                                                     req + 1)));
+        if (ctx->debug) fprintf(__fc_stderr,
+                                "Invalid transaction ID received 0x%X (not 0x%X)\n",
+                                (unsigned int)(((int)*(rsp + 0) << 8) + (int)*(
+                                               rsp + 1)),
+                                (unsigned int)(((int)*(req + 0) << 8) + (int)*(
+                                               req + 1))); /* fprintf_va_11 */
         __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 2;
         __retres = -1;
         goto return_label;
@@ -1966,10 +1964,10 @@ static int _modbus_tcp_pre_check_confirmation(modbus_t *ctx,
     }
   if ((int)*(rsp + 2) != 0x0) 
     if ((int)*(rsp + 3) != 0x0) {
-      if (ctx->debug) fprintf_va_12(__fc_stderr,
-                                    "Invalid protocol ID received 0x%X (not 0x0)\n",
-                                    (unsigned int)(((int)*(rsp + 2) << 8) + (int)*(
-                                                   rsp + 3)));
+      if (ctx->debug) fprintf(__fc_stderr,
+                              "Invalid protocol ID received 0x%X (not 0x0)\n",
+                              (unsigned int)(((int)*(rsp + 2) << 8) + (int)*(
+                                             rsp + 3))); /* fprintf_va_12 */
       __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 2;
       __retres = -1;
       goto return_label;
@@ -2074,8 +2072,7 @@ static int _modbus_tcp_connect(modbus_t *ctx)
     __retres = -1;
     goto return_label;
   }
-  if (ctx->debug) printf_va_4("Connecting to %s:%d\n",ctx_tcp->ip,
-                              ctx_tcp->port);
+  if (ctx->debug) printf("Connecting to %s:%d\n",ctx_tcp->ip,ctx_tcp->port); /* printf_va_4 */
   addr.sin_family = (unsigned short)2;
   addr.sin_port = htons((unsigned short)ctx_tcp->port);
   addr.sin_addr.s_addr = inet_addr((char const *)(ctx_tcp->ip));
@@ -2146,8 +2143,7 @@ static int _modbus_tcp_pi_connect(modbus_t *ctx)
       char const *tmp;
       tmp = gai_strerror(rc);
       ;
-      fprintf_va_13(__fc_stderr,"Error returned by getaddrinfo: %s\n",
-                    (char *)tmp);
+      fprintf(__fc_stderr,"Error returned by getaddrinfo: %s\n",(char *)tmp); /* fprintf_va_13 */
     }
     __fc_errno = 111;
     __retres = -1;
@@ -2162,8 +2158,8 @@ static int _modbus_tcp_pi_connect(modbus_t *ctx)
       s = socket(ai_ptr->ai_family,flags,ai_ptr->ai_protocol);
       if (s < 0) goto __Cont;
       if (ai_ptr->ai_family == 2) _modbus_tcp_set_ipv4_options(s);
-      if (ctx->debug) printf_va_5("Connecting to [%s]:%s\n",ctx_tcp_pi->node,
-                                  ctx_tcp_pi->service);
+      if (ctx->debug) printf("Connecting to [%s]:%s\n",ctx_tcp_pi->node,
+                             ctx_tcp_pi->service); /* printf_va_5 */
       rc = _connect(s,(struct sockaddr const *)ai_ptr->ai_addr,
                     ai_ptr->ai_addrlen,
                     (struct timeval const *)(& ctx->response_timeout));
@@ -2314,8 +2310,7 @@ int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection)
       char const *tmp;
       tmp = gai_strerror(rc);
       ;
-      fprintf_va_14(__fc_stderr,"Error returned by getaddrinfo: %s\n",
-                    (char *)tmp);
+      fprintf(__fc_stderr,"Error returned by getaddrinfo: %s\n",(char *)tmp); /* fprintf_va_14 */
     }
     __fc_errno = 111;
     __retres = -1;
@@ -2401,7 +2396,7 @@ int modbus_tcp_accept(modbus_t *ctx, int *s)
   if (ctx->debug) {
     char *tmp;
     tmp = inet_ntoa(addr.sin_addr);
-    printf_va_6("The client connection from %s is accepted\n",tmp);
+    printf("The client connection from %s is accepted\n",tmp); /* printf_va_6 */
   }
   __retres = ctx->s;
   return_label: return __retres;
@@ -2435,7 +2430,7 @@ int modbus_tcp_pi_accept(modbus_t *ctx, int *s)
     __retres = -1;
     goto return_label;
   }
-  if (ctx->debug) printf_va_7("The client connection is accepted.\n");
+  if (ctx->debug) printf("The client connection is accepted.\n"); /* printf_va_7 */
   __retres = ctx->s;
   return_label: return __retres;
 }
@@ -2461,8 +2456,8 @@ static int _modbus_tcp_select(modbus_t *ctx, fd_set *rset,
     s_rc = select(ctx->s + 1,rset,(fd_set *)0,(fd_set *)0,tv);
     if (! (s_rc == -1)) break;
     if (__fc_errno == 4) {
-      if (ctx->debug) fprintf_va_15(__fc_stderr,
-                                    "A non blocked signal was caught\n");
+      if (ctx->debug) fprintf(__fc_stderr,
+                              "A non blocked signal was caught\n"); /* fprintf_va_15 */
       FD_ZERO(rset);
       FD_SET(ctx->s,rset);
     }
@@ -2573,14 +2568,14 @@ modbus_t *modbus_new_tcp(char const *ip, int port)
     dest_size = sizeof(char) * (unsigned long)16;
     ret_size = strlcpy(ctx_tcp->ip,ip,dest_size);
     if (ret_size == (size_t)0) {
-      fprintf_va_16(__fc_stderr,"The IP string is empty\n");
+      fprintf(__fc_stderr,"The IP string is empty\n"); /* fprintf_va_16 */
       modbus_free(ctx);
       __fc_errno = 22;
       __retres = (modbus_t *)0;
       goto return_label;
     }
     if (ret_size >= dest_size) {
-      fprintf_va_17(__fc_stderr,"The IP string has been truncated\n");
+      fprintf(__fc_stderr,"The IP string has been truncated\n"); /* fprintf_va_17 */
       modbus_free(ctx);
       __fc_errno = 22;
       __retres = (modbus_t *)0;
@@ -2660,14 +2655,14 @@ modbus_t *modbus_new_tcp_pi(char const *node, char const *service)
     dest_size = sizeof(char) * (unsigned long)1025;
     ret_size = strlcpy(ctx_tcp_pi->node,node,dest_size);
     if (ret_size == (size_t)0) {
-      fprintf_va_18(__fc_stderr,"The node string is empty\n");
+      fprintf(__fc_stderr,"The node string is empty\n"); /* fprintf_va_18 */
       modbus_free(ctx);
       __fc_errno = 22;
       __retres = (modbus_t *)0;
       goto return_label;
     }
     if (ret_size >= dest_size) {
-      fprintf_va_19(__fc_stderr,"The node string has been truncated\n");
+      fprintf(__fc_stderr,"The node string has been truncated\n"); /* fprintf_va_19 */
       modbus_free(ctx);
       __fc_errno = 22;
       __retres = (modbus_t *)0;
@@ -2680,14 +2675,14 @@ modbus_t *modbus_new_tcp_pi(char const *node, char const *service)
   }
   else ret_size = (unsigned long)0;
   if (ret_size == (size_t)0) {
-    fprintf_va_20(__fc_stderr,"The service string is empty\n");
+    fprintf(__fc_stderr,"The service string is empty\n"); /* fprintf_va_20 */
     modbus_free(ctx);
     __fc_errno = 22;
     __retres = (modbus_t *)0;
     goto return_label;
   }
   if (ret_size >= dest_size) {
-    fprintf_va_21(__fc_stderr,"The service string has been truncated\n");
+    fprintf(__fc_stderr,"The service string has been truncated\n"); /* fprintf_va_21 */
     modbus_free(ctx);
     __fc_errno = 22;
     __retres = (modbus_t *)0;
@@ -2803,10 +2798,10 @@ void _error_print(modbus_t *ctx, char const *context)
     char const *tmp;
     tmp = modbus_strerror(__fc_errno);
     ;
-    fprintf_va_22(__fc_stderr,"ERROR %s",(char *)tmp);
-    if (context != (char const *)0) fprintf_va_23(__fc_stderr,": %s\n",
-                                                  (char *)context);
-    else fprintf_va_24(__fc_stderr,"\n");
+    fprintf(__fc_stderr,"ERROR %s",(char *)tmp); /* fprintf_va_22 */
+    if (context != (char const *)0) fprintf(__fc_stderr,": %s\n",
+                                            (char *)context); /* fprintf_va_23 */
+    else fprintf(__fc_stderr,"\n"); /* fprintf_va_24 */
   }
   return;
 }
@@ -2853,7 +2848,7 @@ int modbus_flush(modbus_t *ctx)
   }
   rc = (*((ctx->backend)->flush))(ctx);
   if (rc != -1) 
-    if (ctx->debug) printf_va_8("Bytes flushed (%d)\n",rc);
+    if (ctx->debug) printf("Bytes flushed (%d)\n",rc); /* printf_va_8 */
   __retres = rc;
   return_label: return __retres;
 }
@@ -2925,10 +2920,10 @@ static int send_msg(modbus_t *ctx, uint8_t *msg, int msg_length)
     i = 0;
     /*@ loop unroll 260; */
     while (i < msg_length) {
-      printf_va_9("[%.2X]",(unsigned int)((int)*(msg + i)));
+      printf("[%.2X]",(unsigned int)((int)*(msg + i))); /* printf_va_9 */
       i ++;
     }
-    printf_va_10("\n");
+    printf("\n"); /* printf_va_10 */
   }
   while (1) {
     {
@@ -3126,8 +3121,8 @@ int _modbus_receive_msg(modbus_t *ctx, uint8_t *msg, msg_type_t msg_type)
   int tmp_1;
   int msg_length = 0;
   if (ctx->debug) 
-    if (msg_type == (unsigned int)MSG_INDICATION) printf_va_11("Waiting for a indication...\n");
-    else printf_va_12("Waiting for a confirmation...\n");
+    if (msg_type == (unsigned int)MSG_INDICATION) printf("Waiting for a indication...\n"); /* printf_va_11 */
+    else printf("Waiting for a confirmation...\n"); /* printf_va_12 */
   FD_ZERO(& rset);
   FD_SET(ctx->s,& rset);
   step = _STEP_FUNCTION;
@@ -3188,7 +3183,7 @@ int _modbus_receive_msg(modbus_t *ctx, uint8_t *msg, msg_type_t msg_type)
       int i;
       i = 0;
       while (i < rc) {
-        printf_va_13("<%.2X>",(unsigned int)((int)*(msg + (msg_length + i))));
+        printf("<%.2X>",(unsigned int)((int)*(msg + (msg_length + i)))); /* printf_va_13 */
         i ++;
       }
     }
@@ -3231,7 +3226,7 @@ int _modbus_receive_msg(modbus_t *ctx, uint8_t *msg, msg_type_t msg_type)
           }
         }
   }
-  if (ctx->debug) printf_va_14("\n");
+  if (ctx->debug) printf("\n"); /* printf_va_14 */
   tmp_1 = (*((ctx->backend)->check_integrity))(ctx,msg,msg_length);
   __retres = tmp_1;
   return_label: return __retres;
@@ -3361,10 +3356,10 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req, uint8_t *rsp,
         int req_nb_value;
         int rsp_nb_value;
         if (function != (int)*(req + offset)) {
-          if (ctx->debug) fprintf_va_25(__fc_stderr,
-                                        "Received function not corresponding to the request (0x%X != 0x%X)\n",
-                                        (unsigned int)function,
-                                        (unsigned int)((int)*(req + offset)));
+          if (ctx->debug) fprintf(__fc_stderr,
+                                  "Received function not corresponding to the request (0x%X != 0x%X)\n",
+                                  (unsigned int)function,
+                                  (unsigned int)((int)*(req + offset))); /* fprintf_va_25 */
           if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_PROTOCOL) {
             _sleep_response_timeout(ctx);
             modbus_flush(ctx);
@@ -3407,9 +3402,9 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req, uint8_t *rsp,
         }
         if (req_nb_value == rsp_nb_value) rc = rsp_nb_value;
         else {
-          if (ctx->debug) fprintf_va_26(__fc_stderr,
-                                        "Quantity not corresponding to the request (%d != %d)\n",
-                                        rsp_nb_value,req_nb_value);
+          if (ctx->debug) fprintf(__fc_stderr,
+                                  "Quantity not corresponding to the request (%d != %d)\n",
+                                  rsp_nb_value,req_nb_value); /* fprintf_va_26 */
           if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_PROTOCOL) {
             _sleep_response_timeout(ctx);
             modbus_flush(ctx);
@@ -3423,9 +3418,9 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req, uint8_t *rsp,
     else {
       _LAND_0:
       {
-        if (ctx->debug) fprintf_va_27(__fc_stderr,
-                                      "Message length not corresponding to the computed length (%d != %d)\n",
-                                      rsp_length,rsp_length_computed);
+        if (ctx->debug) fprintf(__fc_stderr,
+                                "Message length not corresponding to the computed length (%d != %d)\n",
+                                rsp_length,rsp_length_computed); /* fprintf_va_27 */
         if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_PROTOCOL) {
           _sleep_response_timeout(ctx);
           modbus_flush(ctx);
@@ -3903,7 +3898,7 @@ int modbus_reply(modbus_t *ctx, uint8_t const *req, int req_length,
     }
     break;
     case 0x07: ;
-    if (ctx->debug) fprintf_va_28(__fc_stderr,"FIXME Not implemented\n");
+    if (ctx->debug) fprintf(__fc_stderr,"FIXME Not implemented\n"); /* fprintf_va_28 */
     __fc_errno = 92;
     __retres = -1;
     goto return_label;
@@ -4186,9 +4181,9 @@ int modbus_read_bits(modbus_t *ctx, int addr, int nb, uint8_t *dest)
     goto return_label;
   }
   if (nb > 2000) {
-    if (ctx->debug) fprintf_va_29(__fc_stderr,
-                                  "ERROR Too many bits requested (%d > %d)\n",
-                                  nb,2000);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many bits requested (%d > %d)\n",nb,
+                            2000); /* fprintf_va_29 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4229,9 +4224,9 @@ int modbus_read_input_bits(modbus_t *ctx, int addr, int nb, uint8_t *dest)
     goto return_label;
   }
   if (nb > 2000) {
-    if (ctx->debug) fprintf_va_30(__fc_stderr,
-                                  "ERROR Too many discrete inputs requested (%d > %d)\n",
-                                  nb,2000);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many discrete inputs requested (%d > %d)\n",
+                            nb,2000); /* fprintf_va_30 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4271,9 +4266,9 @@ static int read_registers(modbus_t *ctx, int function, int addr, int nb,
   uint8_t req[12];
   uint8_t rsp[260];
   if (nb > 125) {
-    if (ctx->debug) fprintf_va_31(__fc_stderr,
-                                  "ERROR Too many registers requested (%d > %d)\n",
-                                  nb,125);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many registers requested (%d > %d)\n",
+                            nb,125); /* fprintf_va_31 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4331,9 +4326,9 @@ int modbus_read_registers(modbus_t *ctx, int addr, int nb, uint16_t *dest)
     goto return_label;
   }
   if (nb > 125) {
-    if (ctx->debug) fprintf_va_32(__fc_stderr,
-                                  "ERROR Too many registers requested (%d > %d)\n",
-                                  nb,125);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many registers requested (%d > %d)\n",
+                            nb,125); /* fprintf_va_32 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4368,9 +4363,8 @@ int modbus_read_input_registers(modbus_t *ctx, int addr, int nb,
     goto return_label;
   }
   if (nb > 125) {
-    fprintf_va_33(__fc_stderr,
-                  "ERROR Too many input registers requested (%d > %d)\n",nb,
-                  125);
+    fprintf(__fc_stderr,
+            "ERROR Too many input registers requested (%d > %d)\n",nb,125); /* fprintf_va_33 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4471,9 +4465,9 @@ int modbus_write_bits(modbus_t *ctx, int addr, int nb, uint8_t const *src)
     goto return_label;
   }
   if (nb > 1968) {
-    if (ctx->debug) fprintf_va_34(__fc_stderr,
-                                  "ERROR Writing too many bits (%d > %d)\n",
-                                  nb,1968);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Writing too many bits (%d > %d)\n",nb,
+                            1968); /* fprintf_va_34 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4558,9 +4552,9 @@ int modbus_write_registers(modbus_t *ctx, int addr, int nb,
     goto return_label;
   }
   if (nb > 123) {
-    if (ctx->debug) fprintf_va_35(__fc_stderr,
-                                  "ERROR Trying to write to too many registers (%d > %d)\n",
-                                  nb,123);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Trying to write to too many registers (%d > %d)\n",
+                            nb,123); /* fprintf_va_35 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4689,17 +4683,17 @@ int modbus_write_and_read_registers(modbus_t *ctx, int write_addr,
     goto return_label;
   }
   if (write_nb > 121) {
-    if (ctx->debug) fprintf_va_36(__fc_stderr,
-                                  "ERROR Too many registers to write (%d > %d)\n",
-                                  write_nb,121);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many registers to write (%d > %d)\n",
+                            write_nb,121); /* fprintf_va_36 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
   }
   if (read_nb > 125) {
-    if (ctx->debug) fprintf_va_37(__fc_stderr,
-                                  "ERROR Too many registers requested (%d > %d)\n",
-                                  read_nb,125);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many registers requested (%d > %d)\n",
+                            read_nb,125); /* fprintf_va_37 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -5599,7 +5593,7 @@ int main(void)
     char const *tmp;
     tmp = modbus_strerror(__fc_errno);
     ;
-    fprintf_va_38(__fc_stderr,"Connection failed: %s\n",(char *)tmp);
+    fprintf(__fc_stderr,"Connection failed: %s\n",(char *)tmp); /* fprintf_va_38 */
     modbus_free(ctx);
     __retres = -1;
     goto return_label;
@@ -5663,9 +5657,8 @@ int main(void)
         nb = 99 - addr;
         rc = modbus_write_bit(ctx,addr,(int)*(tab_rq_bits + 0));
         if (rc != 1) {
-          printf_va_15("ERROR modbus_write_bit (%d)\n",rc);
-          printf_va_16("Address = %d, value = %d\n",addr,
-                       (int)*(tab_rq_bits + 0));
+          printf("ERROR modbus_write_bit (%d)\n",rc); /* printf_va_15 */
+          printf("Address = %d, value = %d\n",addr,(int)*(tab_rq_bits + 0)); /* printf_va_16 */
           nb_fail ++;
         }
         else {
@@ -5675,23 +5668,23 @@ int main(void)
             if ((int)*(tab_rq_bits + 0) != (int)*(tab_rp_bits + 0)) {
               _LOR:
               {
-                printf_va_17("ERROR modbus_read_bits single (%d)\n",rc);
-                printf_va_18("address = %d\n",addr);
+                printf("ERROR modbus_read_bits single (%d)\n",rc); /* printf_va_17 */
+                printf("address = %d\n",addr); /* printf_va_18 */
                 nb_fail ++;
               }
             }
         }
         rc = modbus_write_bits(ctx,addr,nb,(uint8_t const *)tab_rq_bits);
         if (rc != nb) {
-          printf_va_19("ERROR modbus_write_bits (%d)\n",rc);
-          printf_va_20("Address = %d, nb = %d\n",addr,nb);
+          printf("ERROR modbus_write_bits (%d)\n",rc); /* printf_va_19 */
+          printf("Address = %d, nb = %d\n",addr,nb); /* printf_va_20 */
           nb_fail ++;
         }
         else {
           rc = modbus_read_bits(ctx,addr,nb,tab_rp_bits);
           if (rc != nb) {
-            printf_va_21("ERROR modbus_read_bits\n");
-            printf_va_22("Address = %d, nb = %d\n",addr,nb);
+            printf("ERROR modbus_read_bits\n"); /* printf_va_21 */
+            printf("Address = %d, nb = %d\n",addr,nb); /* printf_va_22 */
             nb_fail ++;
           }
           else {
@@ -5699,12 +5692,12 @@ int main(void)
             /*@ loop unroll 100; */
             while (i < nb) {
               if ((int)*(tab_rp_bits + i) != (int)*(tab_rq_bits + i)) {
-                printf_va_23("ERROR modbus_read_bits\n");
-                printf_va_24("Address = %d, value %d (0x%X) != %d (0x%X)\n",
-                             addr,(int)*(tab_rq_bits + i),
-                             (unsigned int)((int)*(tab_rq_bits + i)),
-                             (int)*(tab_rp_bits + i),
-                             (unsigned int)((int)*(tab_rp_bits + i)));
+                printf("ERROR modbus_read_bits\n"); /* printf_va_23 */
+                printf("Address = %d, value %d (0x%X) != %d (0x%X)\n",addr,
+                       (int)*(tab_rq_bits + i),
+                       (unsigned int)((int)*(tab_rq_bits + i)),
+                       (int)*(tab_rp_bits + i),
+                       (unsigned int)((int)*(tab_rp_bits + i))); /* printf_va_24 */
                 nb_fail ++;
               }
               i ++;
@@ -5713,42 +5706,42 @@ int main(void)
         }
         rc = modbus_write_register(ctx,addr,(int)*(tab_rq_registers + 0));
         if (rc != 1) {
-          printf_va_25("ERROR modbus_write_register (%d)\n",rc);
-          printf_va_26("Address = %d, value = %d (0x%X)\n",addr,
-                       (int)*(tab_rq_registers + 0),
-                       (unsigned int)((int)*(tab_rq_registers + 0)));
+          printf("ERROR modbus_write_register (%d)\n",rc); /* printf_va_25 */
+          printf("Address = %d, value = %d (0x%X)\n",addr,
+                 (int)*(tab_rq_registers + 0),
+                 (unsigned int)((int)*(tab_rq_registers + 0))); /* printf_va_26 */
           nb_fail ++;
         }
         else {
           rc = modbus_read_registers(ctx,addr,1,tab_rp_registers);
           if (rc != 1) {
-            printf_va_27("ERROR modbus_read_registers single (%d)\n",rc);
-            printf_va_28("Address = %d\n",addr);
+            printf("ERROR modbus_read_registers single (%d)\n",rc); /* printf_va_27 */
+            printf("Address = %d\n",addr); /* printf_va_28 */
             nb_fail ++;
           }
           else 
             if ((int)*(tab_rq_registers + 0) != (int)*(tab_rp_registers + 0)) {
-              printf_va_29("ERROR modbus_read_registers single\n");
-              printf_va_30("Address = %d, value = %d (0x%X) != %d (0x%X)\n",
-                           addr,(int)*(tab_rq_registers + 0),
-                           (unsigned int)((int)*(tab_rq_registers + 0)),
-                           (int)*(tab_rp_registers + 0),
-                           (unsigned int)((int)*(tab_rp_registers + 0)));
+              printf("ERROR modbus_read_registers single\n"); /* printf_va_29 */
+              printf("Address = %d, value = %d (0x%X) != %d (0x%X)\n",addr,
+                     (int)*(tab_rq_registers + 0),
+                     (unsigned int)((int)*(tab_rq_registers + 0)),
+                     (int)*(tab_rp_registers + 0),
+                     (unsigned int)((int)*(tab_rp_registers + 0))); /* printf_va_30 */
               nb_fail ++;
             }
         }
         rc = modbus_write_registers(ctx,addr,nb,
                                     (uint16_t const *)tab_rq_registers);
         if (rc != nb) {
-          printf_va_31("ERROR modbus_write_registers (%d)\n",rc);
-          printf_va_32("Address = %d, nb = %d\n",addr,nb);
+          printf("ERROR modbus_write_registers (%d)\n",rc); /* printf_va_31 */
+          printf("Address = %d, nb = %d\n",addr,nb); /* printf_va_32 */
           nb_fail ++;
         }
         else {
           rc = modbus_read_registers(ctx,addr,nb,tab_rp_registers);
           if (rc != nb) {
-            printf_va_33("ERROR modbus_read_registers (%d)\n",rc);
-            printf_va_34("Address = %d, nb = %d\n",addr,nb);
+            printf("ERROR modbus_read_registers (%d)\n",rc); /* printf_va_33 */
+            printf("Address = %d, nb = %d\n",addr,nb); /* printf_va_34 */
             nb_fail ++;
           }
           else {
@@ -5756,12 +5749,12 @@ int main(void)
             /*@ loop unroll 100; */
             while (i < nb) {
               if ((int)*(tab_rq_registers + i) != (int)*(tab_rp_registers + i)) {
-                printf_va_35("ERROR modbus_read_registers\n");
-                printf_va_36("Address = %d, value %d (0x%X) != %d (0x%X)\n",
-                             addr,(int)*(tab_rq_registers + i),
-                             (unsigned int)((int)*(tab_rq_registers + i)),
-                             (int)*(tab_rp_registers + i),
-                             (unsigned int)((int)*(tab_rp_registers + i)));
+                printf("ERROR modbus_read_registers\n"); /* printf_va_35 */
+                printf("Address = %d, value %d (0x%X) != %d (0x%X)\n",addr,
+                       (int)*(tab_rq_registers + i),
+                       (unsigned int)((int)*(tab_rq_registers + i)),
+                       (int)*(tab_rp_registers + i),
+                       (unsigned int)((int)*(tab_rp_registers + i))); /* printf_va_36 */
                 nb_fail ++;
               }
               i ++;
@@ -5772,8 +5765,8 @@ int main(void)
                                              (uint16_t const *)tab_rw_rq_registers,
                                              addr,nb,tab_rp_registers);
         if (rc != nb) {
-          printf_va_37("ERROR modbus_read_and_write_registers (%d)\n",rc);
-          printf_va_38("Address = %d, nb = %d\n",addr,nb);
+          printf("ERROR modbus_read_and_write_registers (%d)\n",rc); /* printf_va_37 */
+          printf("Address = %d, nb = %d\n",addr,nb); /* printf_va_38 */
           nb_fail ++;
         }
         else {
@@ -5781,20 +5774,20 @@ int main(void)
           /*@ loop unroll 100; */
           while (i < nb) {
             if ((int)*(tab_rp_registers + i) != (int)*(tab_rw_rq_registers + i)) {
-              printf_va_39("ERROR modbus_read_and_write_registers READ\n");
-              printf_va_40("Address = %d, value %d (0x%X) != %d (0x%X)\n",
-                           addr,(int)*(tab_rp_registers + i),
-                           (unsigned int)((int)*(tab_rw_rq_registers + i)),
-                           (int)*(tab_rp_registers + i),
-                           (unsigned int)((int)*(tab_rw_rq_registers + i)));
+              printf("ERROR modbus_read_and_write_registers READ\n"); /* printf_va_39 */
+              printf("Address = %d, value %d (0x%X) != %d (0x%X)\n",addr,
+                     (int)*(tab_rp_registers + i),
+                     (unsigned int)((int)*(tab_rw_rq_registers + i)),
+                     (int)*(tab_rp_registers + i),
+                     (unsigned int)((int)*(tab_rw_rq_registers + i))); /* printf_va_40 */
               nb_fail ++;
             }
             i ++;
           }
           rc = modbus_read_registers(ctx,addr,nb,tab_rp_registers);
           if (rc != nb) {
-            printf_va_41("ERROR modbus_read_registers (%d)\n",rc);
-            printf_va_42("Address = %d, nb = %d\n",addr,nb);
+            printf("ERROR modbus_read_registers (%d)\n",rc); /* printf_va_41 */
+            printf("Address = %d, nb = %d\n",addr,nb); /* printf_va_42 */
             nb_fail ++;
           }
           else {
@@ -5802,12 +5795,12 @@ int main(void)
             /*@ loop unroll 100; */
             while (i < nb) {
               if ((int)*(tab_rw_rq_registers + i) != (int)*(tab_rp_registers + i)) {
-                printf_va_43("ERROR modbus_read_and_write_registers WRITE\n");
-                printf_va_44("Address = %d, value %d (0x%X) != %d (0x%X)\n",
-                             addr,(int)*(tab_rw_rq_registers + i),
-                             (unsigned int)((int)*(tab_rw_rq_registers + i)),
-                             (int)*(tab_rp_registers + i),
-                             (unsigned int)((int)*(tab_rp_registers + i)));
+                printf("ERROR modbus_read_and_write_registers WRITE\n"); /* printf_va_43 */
+                printf("Address = %d, value %d (0x%X) != %d (0x%X)\n",addr,
+                       (int)*(tab_rw_rq_registers + i),
+                       (unsigned int)((int)*(tab_rw_rq_registers + i)),
+                       (int)*(tab_rp_registers + i),
+                       (unsigned int)((int)*(tab_rp_registers + i))); /* printf_va_44 */
                 nb_fail ++;
               }
               i ++;
@@ -5817,9 +5810,9 @@ int main(void)
       }
       addr ++;
     }
-    printf_va_45("Test: ");
-    if (nb_fail) printf_va_46("%d FAILS\n",nb_fail);
-    else printf_va_47("SUCCESS\n");
+    printf("Test: "); /* printf_va_45 */
+    if (nb_fail) printf("%d FAILS\n",nb_fail); /* printf_va_46 */
+    else printf("SUCCESS\n"); /* printf_va_47 */
   }
   free((void *)tab_rq_bits);
   free((void *)tab_rp_bits);
diff --git a/libmodbus/.frama-c/libmodbus-unit-server.eva/alarms.csv b/libmodbus/.frama-c/libmodbus-unit-server.eva/alarms.csv
index f91de2c3c596ce1548410d862febae68d9671720..85c8ffdd73a2bc2785fd90d6fe921254b78333fb 100644
--- a/libmodbus/.frama-c/libmodbus-unit-server.eva/alarms.csv
+++ b/libmodbus/.frama-c/libmodbus-unit-server.eva/alarms.csv
@@ -13,8 +13,8 @@ FRAMAC_SHARE/libc	unistd.h	1133	write	precondition	Unknown	buf_has_room: \valid_
 FRAMAC_SHARE/libc/sys	socket.h	301	accept	precondition	Unknown	valid_sockfd: 0 ≤ sockfd < 1024
 FRAMAC_SHARE/libc/sys	socket.h	436	recv	precondition	Unknown	valid_sockfd: 0 ≤ sockfd < 1024
 FRAMAC_SHARE/libc/sys	socket.h	437	recv	precondition	Unknown	valid_buffer_length: \valid((char *)buf + (0 .. len - 1))
-FRAMAC_SHARE/libc/sys	socket.h	472	send	precondition	Unknown	available_sockfd: 0 ≤ sockfd < 1024
-FRAMAC_SHARE/libc/sys	socket.h	473	send	precondition	Unknown	buf_len_ok: \valid_read((char *)buf + (0 .. len - 1))
+FRAMAC_SHARE/libc/sys	socket.h	493	send	precondition	Unknown	available_sockfd: 0 ≤ sockfd < 1024
+FRAMAC_SHARE/libc/sys	socket.h	494	send	precondition	Unknown	buf_len_ok: \valid_read((char *)buf + (0 .. len - 1))
 src	modbus-data.c	89	modbus_set_bits_from_bytes	initialization	Unknown	\initialized(tab_byte + (unsigned int)((unsigned int)(i - (unsigned int)idx) / 8))
 src	modbus-data.c	89	modbus_set_bits_from_bytes	mem_access	Unknown	\valid(dest + i)
 src	modbus-data.c	89	modbus_set_bits_from_bytes	mem_access	Unknown	\valid_read(tab_byte + (unsigned int)((unsigned int)(i - (unsigned int)idx) / 8))
diff --git a/libmodbus/.frama-c/libmodbus-unit-server.parse/framac.ast b/libmodbus/.frama-c/libmodbus-unit-server.parse/framac.ast
index aa66f98e5a4e6c683317afa0e1090ee5363dbdfd..7e9d041c7f58adec60a5ed5b286225a684b1495b 100644
--- a/libmodbus/.frama-c/libmodbus-unit-server.parse/framac.ast
+++ b/libmodbus/.frama-c/libmodbus-unit-server.parse/framac.ast
@@ -1088,9 +1088,9 @@ static void _modbus_rtu_ioctl_rts(modbus_t *ctx, int on)
 {
   int flags;
   int fd = ctx->s;
-  __va_ioctl_ptr(fd,0x5415,(void *)(& flags));
+  ioctl(fd,0x5415,(void *)(& flags)); /* __va_ioctl_ptr */
   if (on) flags |= 0x004; else flags &= ~ 0x004;
-  __va_ioctl_ptr(fd,0x5418,(void *)(& flags));
+  ioctl(fd,0x5418,(void *)(& flags)); /* __va_ioctl_ptr */
   return;
 }
 
@@ -1113,8 +1113,7 @@ static ssize_t _modbus_rtu_send(modbus_t *ctx, uint8_t const *req,
   modbus_rtu_t *ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
   if (ctx_rtu->rts != 0) {
     ssize_t size;
-    if (ctx->debug) fprintf_va_1(__fc_stderr,
-                                 "Sending request using RTS signal\n");
+    if (ctx->debug) fprintf(__fc_stderr,"Sending request using RTS signal\n"); /* fprintf_va_1 */
     (*(ctx_rtu->set_rts))(ctx,ctx_rtu->rts == 1);
     usleep((unsigned int)ctx_rtu->rts_delay);
     size = write(ctx->s,(void const *)req,(unsigned long)req_length);
@@ -1152,7 +1151,7 @@ static int _modbus_rtu_receive(modbus_t *ctx, uint8_t *req)
     _modbus_receive_msg(ctx,req,MSG_CONFIRMATION);
     ctx_rtu->confirmation_to_ignore = 0;
     rc = 0;
-    if (ctx->debug) printf_va_1("Confirmation to ignore\n");
+    if (ctx->debug) printf("Confirmation to ignore\n"); /* printf_va_1 */
   }
   else {
     rc = _modbus_receive_msg(ctx,req,MSG_INDICATION);
@@ -1192,9 +1191,9 @@ static int _modbus_rtu_pre_check_confirmation(modbus_t *ctx,
   int __retres;
   if ((int)*(req + 0) != (int)*(rsp + 0)) {
     if ((int)*(req + 0) != 0) {
-      if (ctx->debug) fprintf_va_2(__fc_stderr,
-                                   "The responding slave %d isn\'t the requested slave %d\n",
-                                   (int)*(rsp + 0),(int)*(req + 0));
+      if (ctx->debug) fprintf(__fc_stderr,
+                              "The responding slave %d isn\'t the requested slave %d\n",
+                              (int)*(rsp + 0),(int)*(req + 0)); /* fprintf_va_2 */
       __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 6;
       __retres = -1;
       goto return_label;
@@ -1247,8 +1246,8 @@ static int _modbus_rtu_check_integrity(modbus_t *ctx, uint8_t *msg,
   int slave = (int)*(msg + 0);
   if (slave != ctx->slave) 
     if (slave != 0) {
-      if (ctx->debug) printf_va_2("Request for slave %d ignored (not %d)\n",
-                                  slave,ctx->slave);
+      if (ctx->debug) printf("Request for slave %d ignored (not %d)\n",slave,
+                             ctx->slave); /* printf_va_2 */
       __retres = 0;
       goto return_label;
     }
@@ -1260,10 +1259,10 @@ static int _modbus_rtu_check_integrity(modbus_t *ctx, uint8_t *msg,
     goto return_label;
   }
   else {
-    if (ctx->debug) fprintf_va_3(__fc_stderr,
-                                 "ERROR CRC received 0x%0X != CRC calculated 0x%0X\n",
-                                 (unsigned int)((int)crc_received),
-                                 (unsigned int)((int)crc_calculated));
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR CRC received 0x%0X != CRC calculated 0x%0X\n",
+                            (unsigned int)((int)crc_received),
+                            (unsigned int)((int)crc_calculated)); /* fprintf_va_3 */
     if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_PROTOCOL) _modbus_rtu_flush
                                                               (ctx);
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 1;
@@ -1331,21 +1330,20 @@ static int _modbus_rtu_connect(modbus_t *ctx)
   int tmp_0;
   int tmp_2;
   modbus_rtu_t *ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
-  if (ctx->debug) printf_va_3("Opening %s at %d bauds (%c, %d, %d)\n",
-                              ctx_rtu->device,ctx_rtu->baud,
-                              (int)ctx_rtu->parity,(int)ctx_rtu->data_bit,
-                              (int)ctx_rtu->stop_bit);
+  if (ctx->debug) printf("Opening %s at %d bauds (%c, %d, %d)\n",
+                         ctx_rtu->device,ctx_rtu->baud,(int)ctx_rtu->parity,
+                         (int)ctx_rtu->data_bit,(int)ctx_rtu->stop_bit); /* printf_va_3 */
   flags = ((2 | 0x100) | 0x800) | 0x80;
   flags |= 0x80000;
-  ctx->s = __va_open_void((char const *)ctx_rtu->device,flags);
+  ctx->s = open((char const *)ctx_rtu->device,flags); /* __va_open_void */
   if (ctx->s == -1) {
     if (ctx->debug) {
       char *tmp;
       tmp = strerror(__fc_errno);
       ;
       ;
-      fprintf_va_4(__fc_stderr,"ERROR Can\'t open the device %s (%s)\n",
-                   ctx_rtu->device,tmp);
+      fprintf(__fc_stderr,"ERROR Can\'t open the device %s (%s)\n",
+              ctx_rtu->device,tmp); /* fprintf_va_4 */
     }
     __retres = -1;
     goto return_label;
@@ -1400,9 +1398,9 @@ static int _modbus_rtu_connect(modbus_t *ctx)
     case 4000000: speed = (unsigned int)0010017;
     break;
     default: speed = (unsigned int)0000015;
-    if (ctx->debug) fprintf_va_5(__fc_stderr,
-                                 "WARNING Unknown baud rate %d for %s (B9600 used)\n",
-                                 ctx_rtu->baud,ctx_rtu->device);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "WARNING Unknown baud rate %d for %s (B9600 used)\n",
+                            ctx_rtu->baud,ctx_rtu->device); /* fprintf_va_5 */
   }
   tmp_0 = cfsetispeed(& tios,speed);
   if (tmp_0 < 0) goto _LOR;
@@ -1481,8 +1479,8 @@ int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode)
     goto return_label;
   }
   if ((ctx->backend)->backend_type == (unsigned int)_MODBUS_BACKEND_TYPE_RTU) {
-    if (ctx->debug) fprintf_va_6(__fc_stderr,
-                                 "This function isn\'t supported on your platform\n");
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "This function isn\'t supported on your platform\n"); /* fprintf_va_6 */
     __fc_errno = 95;
     __retres = -1;
     goto return_label;
@@ -1513,8 +1511,8 @@ int modbus_rtu_get_serial_mode(modbus_t *ctx)
     goto return_label;
   }
   if ((ctx->backend)->backend_type == (unsigned int)_MODBUS_BACKEND_TYPE_RTU) {
-    if (ctx->debug) fprintf_va_7(__fc_stderr,
-                                 "This function isn\'t supported on your platform\n");
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "This function isn\'t supported on your platform\n"); /* fprintf_va_7 */
     __fc_errno = 95;
     __retres = -1;
     goto return_label;
@@ -1693,8 +1691,8 @@ static int _modbus_rtu_select(modbus_t *ctx, fd_set *rset,
     s_rc = select(ctx->s + 1,rset,(fd_set *)0,(fd_set *)0,tv);
     if (! (s_rc == -1)) break;
     if (__fc_errno == 4) {
-      if (ctx->debug) fprintf_va_8(__fc_stderr,
-                                   "A non blocked signal was caught\n");
+      if (ctx->debug) fprintf(__fc_stderr,
+                              "A non blocked signal was caught\n"); /* fprintf_va_8 */
       FD_ZERO(rset);
       FD_SET(ctx->s,rset);
     }
@@ -1778,14 +1776,14 @@ modbus_t *modbus_new_rtu(char const *device, int baud, char parity,
     if ((int)*device == 0) {
       _LOR:
       {
-        fprintf_va_9(__fc_stderr,"The device string is empty\n");
+        fprintf(__fc_stderr,"The device string is empty\n"); /* fprintf_va_9 */
         __fc_errno = 22;
         __retres = (modbus_t *)0;
         goto return_label;
       }
     }
   if (baud == 0) {
-    fprintf_va_10(__fc_stderr,"The baud rate value must not be zero\n");
+    fprintf(__fc_stderr,"The baud rate value must not be zero\n"); /* fprintf_va_10 */
     __fc_errno = 22;
     __retres = (modbus_t *)0;
     goto return_label;
@@ -1959,12 +1957,12 @@ static int _modbus_tcp_pre_check_confirmation(modbus_t *ctx,
     if ((int)*(req + 1) != (int)*(rsp + 1)) {
       _LOR:
       {
-        if (ctx->debug) fprintf_va_11(__fc_stderr,
-                                      "Invalid transaction ID received 0x%X (not 0x%X)\n",
-                                      (unsigned int)(((int)*(rsp + 0) << 8) + (int)*(
-                                                     rsp + 1)),
-                                      (unsigned int)(((int)*(req + 0) << 8) + (int)*(
-                                                     req + 1)));
+        if (ctx->debug) fprintf(__fc_stderr,
+                                "Invalid transaction ID received 0x%X (not 0x%X)\n",
+                                (unsigned int)(((int)*(rsp + 0) << 8) + (int)*(
+                                               rsp + 1)),
+                                (unsigned int)(((int)*(req + 0) << 8) + (int)*(
+                                               req + 1))); /* fprintf_va_11 */
         __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 2;
         __retres = -1;
         goto return_label;
@@ -1972,10 +1970,10 @@ static int _modbus_tcp_pre_check_confirmation(modbus_t *ctx,
     }
   if ((int)*(rsp + 2) != 0x0) 
     if ((int)*(rsp + 3) != 0x0) {
-      if (ctx->debug) fprintf_va_12(__fc_stderr,
-                                    "Invalid protocol ID received 0x%X (not 0x0)\n",
-                                    (unsigned int)(((int)*(rsp + 2) << 8) + (int)*(
-                                                   rsp + 3)));
+      if (ctx->debug) fprintf(__fc_stderr,
+                              "Invalid protocol ID received 0x%X (not 0x0)\n",
+                              (unsigned int)(((int)*(rsp + 2) << 8) + (int)*(
+                                             rsp + 3))); /* fprintf_va_12 */
       __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 2;
       __retres = -1;
       goto return_label;
@@ -2080,8 +2078,7 @@ static int _modbus_tcp_connect(modbus_t *ctx)
     __retres = -1;
     goto return_label;
   }
-  if (ctx->debug) printf_va_4("Connecting to %s:%d\n",ctx_tcp->ip,
-                              ctx_tcp->port);
+  if (ctx->debug) printf("Connecting to %s:%d\n",ctx_tcp->ip,ctx_tcp->port); /* printf_va_4 */
   addr.sin_family = (unsigned short)2;
   addr.sin_port = htons((unsigned short)ctx_tcp->port);
   addr.sin_addr.s_addr = inet_addr((char const *)(ctx_tcp->ip));
@@ -2152,8 +2149,7 @@ static int _modbus_tcp_pi_connect(modbus_t *ctx)
       char const *tmp;
       tmp = gai_strerror(rc);
       ;
-      fprintf_va_13(__fc_stderr,"Error returned by getaddrinfo: %s\n",
-                    (char *)tmp);
+      fprintf(__fc_stderr,"Error returned by getaddrinfo: %s\n",(char *)tmp); /* fprintf_va_13 */
     }
     __fc_errno = 111;
     __retres = -1;
@@ -2168,8 +2164,8 @@ static int _modbus_tcp_pi_connect(modbus_t *ctx)
       s = socket(ai_ptr->ai_family,flags,ai_ptr->ai_protocol);
       if (s < 0) goto __Cont;
       if (ai_ptr->ai_family == 2) _modbus_tcp_set_ipv4_options(s);
-      if (ctx->debug) printf_va_5("Connecting to [%s]:%s\n",ctx_tcp_pi->node,
-                                  ctx_tcp_pi->service);
+      if (ctx->debug) printf("Connecting to [%s]:%s\n",ctx_tcp_pi->node,
+                             ctx_tcp_pi->service); /* printf_va_5 */
       rc = _connect(s,(struct sockaddr const *)ai_ptr->ai_addr,
                     ai_ptr->ai_addrlen,
                     (struct timeval const *)(& ctx->response_timeout));
@@ -2320,8 +2316,7 @@ int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection)
       char const *tmp;
       tmp = gai_strerror(rc);
       ;
-      fprintf_va_14(__fc_stderr,"Error returned by getaddrinfo: %s\n",
-                    (char *)tmp);
+      fprintf(__fc_stderr,"Error returned by getaddrinfo: %s\n",(char *)tmp); /* fprintf_va_14 */
     }
     __fc_errno = 111;
     __retres = -1;
@@ -2407,7 +2402,7 @@ int modbus_tcp_accept(modbus_t *ctx, int *s)
   if (ctx->debug) {
     char *tmp;
     tmp = inet_ntoa(addr.sin_addr);
-    printf_va_6("The client connection from %s is accepted\n",tmp);
+    printf("The client connection from %s is accepted\n",tmp); /* printf_va_6 */
   }
   __retres = ctx->s;
   return_label: return __retres;
@@ -2441,7 +2436,7 @@ int modbus_tcp_pi_accept(modbus_t *ctx, int *s)
     __retres = -1;
     goto return_label;
   }
-  if (ctx->debug) printf_va_7("The client connection is accepted.\n");
+  if (ctx->debug) printf("The client connection is accepted.\n"); /* printf_va_7 */
   __retres = ctx->s;
   return_label: return __retres;
 }
@@ -2467,8 +2462,8 @@ static int _modbus_tcp_select(modbus_t *ctx, fd_set *rset,
     s_rc = select(ctx->s + 1,rset,(fd_set *)0,(fd_set *)0,tv);
     if (! (s_rc == -1)) break;
     if (__fc_errno == 4) {
-      if (ctx->debug) fprintf_va_15(__fc_stderr,
-                                    "A non blocked signal was caught\n");
+      if (ctx->debug) fprintf(__fc_stderr,
+                              "A non blocked signal was caught\n"); /* fprintf_va_15 */
       FD_ZERO(rset);
       FD_SET(ctx->s,rset);
     }
@@ -2579,14 +2574,14 @@ modbus_t *modbus_new_tcp(char const *ip, int port)
     dest_size = sizeof(char) * (unsigned long)16;
     ret_size = strlcpy(ctx_tcp->ip,ip,dest_size);
     if (ret_size == (size_t)0) {
-      fprintf_va_16(__fc_stderr,"The IP string is empty\n");
+      fprintf(__fc_stderr,"The IP string is empty\n"); /* fprintf_va_16 */
       modbus_free(ctx);
       __fc_errno = 22;
       __retres = (modbus_t *)0;
       goto return_label;
     }
     if (ret_size >= dest_size) {
-      fprintf_va_17(__fc_stderr,"The IP string has been truncated\n");
+      fprintf(__fc_stderr,"The IP string has been truncated\n"); /* fprintf_va_17 */
       modbus_free(ctx);
       __fc_errno = 22;
       __retres = (modbus_t *)0;
@@ -2666,14 +2661,14 @@ modbus_t *modbus_new_tcp_pi(char const *node, char const *service)
     dest_size = sizeof(char) * (unsigned long)1025;
     ret_size = strlcpy(ctx_tcp_pi->node,node,dest_size);
     if (ret_size == (size_t)0) {
-      fprintf_va_18(__fc_stderr,"The node string is empty\n");
+      fprintf(__fc_stderr,"The node string is empty\n"); /* fprintf_va_18 */
       modbus_free(ctx);
       __fc_errno = 22;
       __retres = (modbus_t *)0;
       goto return_label;
     }
     if (ret_size >= dest_size) {
-      fprintf_va_19(__fc_stderr,"The node string has been truncated\n");
+      fprintf(__fc_stderr,"The node string has been truncated\n"); /* fprintf_va_19 */
       modbus_free(ctx);
       __fc_errno = 22;
       __retres = (modbus_t *)0;
@@ -2686,14 +2681,14 @@ modbus_t *modbus_new_tcp_pi(char const *node, char const *service)
   }
   else ret_size = (unsigned long)0;
   if (ret_size == (size_t)0) {
-    fprintf_va_20(__fc_stderr,"The service string is empty\n");
+    fprintf(__fc_stderr,"The service string is empty\n"); /* fprintf_va_20 */
     modbus_free(ctx);
     __fc_errno = 22;
     __retres = (modbus_t *)0;
     goto return_label;
   }
   if (ret_size >= dest_size) {
-    fprintf_va_21(__fc_stderr,"The service string has been truncated\n");
+    fprintf(__fc_stderr,"The service string has been truncated\n"); /* fprintf_va_21 */
     modbus_free(ctx);
     __fc_errno = 22;
     __retres = (modbus_t *)0;
@@ -2809,10 +2804,10 @@ void _error_print(modbus_t *ctx, char const *context)
     char const *tmp;
     tmp = modbus_strerror(__fc_errno);
     ;
-    fprintf_va_22(__fc_stderr,"ERROR %s",(char *)tmp);
-    if (context != (char const *)0) fprintf_va_23(__fc_stderr,": %s\n",
-                                                  (char *)context);
-    else fprintf_va_24(__fc_stderr,"\n");
+    fprintf(__fc_stderr,"ERROR %s",(char *)tmp); /* fprintf_va_22 */
+    if (context != (char const *)0) fprintf(__fc_stderr,": %s\n",
+                                            (char *)context); /* fprintf_va_23 */
+    else fprintf(__fc_stderr,"\n"); /* fprintf_va_24 */
   }
   return;
 }
@@ -2859,7 +2854,7 @@ int modbus_flush(modbus_t *ctx)
   }
   rc = (*((ctx->backend)->flush))(ctx);
   if (rc != -1) 
-    if (ctx->debug) printf_va_8("Bytes flushed (%d)\n",rc);
+    if (ctx->debug) printf("Bytes flushed (%d)\n",rc); /* printf_va_8 */
   __retres = rc;
   return_label: return __retres;
 }
@@ -2931,10 +2926,10 @@ static int send_msg(modbus_t *ctx, uint8_t *msg, int msg_length)
     i = 0;
     /*@ loop unroll 260; */
     while (i < msg_length) {
-      printf_va_9("[%.2X]",(unsigned int)((int)*(msg + i)));
+      printf("[%.2X]",(unsigned int)((int)*(msg + i))); /* printf_va_9 */
       i ++;
     }
-    printf_va_10("\n");
+    printf("\n"); /* printf_va_10 */
   }
   while (1) {
     {
@@ -3132,8 +3127,8 @@ int _modbus_receive_msg(modbus_t *ctx, uint8_t *msg, msg_type_t msg_type)
   int tmp_1;
   int msg_length = 0;
   if (ctx->debug) 
-    if (msg_type == (unsigned int)MSG_INDICATION) printf_va_11("Waiting for a indication...\n");
-    else printf_va_12("Waiting for a confirmation...\n");
+    if (msg_type == (unsigned int)MSG_INDICATION) printf("Waiting for a indication...\n"); /* printf_va_11 */
+    else printf("Waiting for a confirmation...\n"); /* printf_va_12 */
   FD_ZERO(& rset);
   FD_SET(ctx->s,& rset);
   step = _STEP_FUNCTION;
@@ -3194,7 +3189,7 @@ int _modbus_receive_msg(modbus_t *ctx, uint8_t *msg, msg_type_t msg_type)
       int i;
       i = 0;
       while (i < rc) {
-        printf_va_13("<%.2X>",(unsigned int)((int)*(msg + (msg_length + i))));
+        printf("<%.2X>",(unsigned int)((int)*(msg + (msg_length + i)))); /* printf_va_13 */
         i ++;
       }
     }
@@ -3237,7 +3232,7 @@ int _modbus_receive_msg(modbus_t *ctx, uint8_t *msg, msg_type_t msg_type)
           }
         }
   }
-  if (ctx->debug) printf_va_14("\n");
+  if (ctx->debug) printf("\n"); /* printf_va_14 */
   tmp_1 = (*((ctx->backend)->check_integrity))(ctx,msg,msg_length);
   __retres = tmp_1;
   return_label: return __retres;
@@ -3367,10 +3362,10 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req, uint8_t *rsp,
         int req_nb_value;
         int rsp_nb_value;
         if (function != (int)*(req + offset)) {
-          if (ctx->debug) fprintf_va_25(__fc_stderr,
-                                        "Received function not corresponding to the request (0x%X != 0x%X)\n",
-                                        (unsigned int)function,
-                                        (unsigned int)((int)*(req + offset)));
+          if (ctx->debug) fprintf(__fc_stderr,
+                                  "Received function not corresponding to the request (0x%X != 0x%X)\n",
+                                  (unsigned int)function,
+                                  (unsigned int)((int)*(req + offset))); /* fprintf_va_25 */
           if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_PROTOCOL) {
             _sleep_response_timeout(ctx);
             modbus_flush(ctx);
@@ -3413,9 +3408,9 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req, uint8_t *rsp,
         }
         if (req_nb_value == rsp_nb_value) rc = rsp_nb_value;
         else {
-          if (ctx->debug) fprintf_va_26(__fc_stderr,
-                                        "Quantity not corresponding to the request (%d != %d)\n",
-                                        rsp_nb_value,req_nb_value);
+          if (ctx->debug) fprintf(__fc_stderr,
+                                  "Quantity not corresponding to the request (%d != %d)\n",
+                                  rsp_nb_value,req_nb_value); /* fprintf_va_26 */
           if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_PROTOCOL) {
             _sleep_response_timeout(ctx);
             modbus_flush(ctx);
@@ -3429,9 +3424,9 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req, uint8_t *rsp,
     else {
       _LAND_0:
       {
-        if (ctx->debug) fprintf_va_27(__fc_stderr,
-                                      "Message length not corresponding to the computed length (%d != %d)\n",
-                                      rsp_length,rsp_length_computed);
+        if (ctx->debug) fprintf(__fc_stderr,
+                                "Message length not corresponding to the computed length (%d != %d)\n",
+                                rsp_length,rsp_length_computed); /* fprintf_va_27 */
         if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_PROTOCOL) {
           _sleep_response_timeout(ctx);
           modbus_flush(ctx);
@@ -3909,7 +3904,7 @@ int modbus_reply(modbus_t *ctx, uint8_t const *req, int req_length,
     }
     break;
     case 0x07: ;
-    if (ctx->debug) fprintf_va_28(__fc_stderr,"FIXME Not implemented\n");
+    if (ctx->debug) fprintf(__fc_stderr,"FIXME Not implemented\n"); /* fprintf_va_28 */
     __fc_errno = 92;
     __retres = -1;
     goto return_label;
@@ -4192,9 +4187,9 @@ int modbus_read_bits(modbus_t *ctx, int addr, int nb, uint8_t *dest)
     goto return_label;
   }
   if (nb > 2000) {
-    if (ctx->debug) fprintf_va_29(__fc_stderr,
-                                  "ERROR Too many bits requested (%d > %d)\n",
-                                  nb,2000);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many bits requested (%d > %d)\n",nb,
+                            2000); /* fprintf_va_29 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4235,9 +4230,9 @@ int modbus_read_input_bits(modbus_t *ctx, int addr, int nb, uint8_t *dest)
     goto return_label;
   }
   if (nb > 2000) {
-    if (ctx->debug) fprintf_va_30(__fc_stderr,
-                                  "ERROR Too many discrete inputs requested (%d > %d)\n",
-                                  nb,2000);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many discrete inputs requested (%d > %d)\n",
+                            nb,2000); /* fprintf_va_30 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4277,9 +4272,9 @@ static int read_registers(modbus_t *ctx, int function, int addr, int nb,
   uint8_t req[12];
   uint8_t rsp[260];
   if (nb > 125) {
-    if (ctx->debug) fprintf_va_31(__fc_stderr,
-                                  "ERROR Too many registers requested (%d > %d)\n",
-                                  nb,125);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many registers requested (%d > %d)\n",
+                            nb,125); /* fprintf_va_31 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4337,9 +4332,9 @@ int modbus_read_registers(modbus_t *ctx, int addr, int nb, uint16_t *dest)
     goto return_label;
   }
   if (nb > 125) {
-    if (ctx->debug) fprintf_va_32(__fc_stderr,
-                                  "ERROR Too many registers requested (%d > %d)\n",
-                                  nb,125);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many registers requested (%d > %d)\n",
+                            nb,125); /* fprintf_va_32 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4374,9 +4369,8 @@ int modbus_read_input_registers(modbus_t *ctx, int addr, int nb,
     goto return_label;
   }
   if (nb > 125) {
-    fprintf_va_33(__fc_stderr,
-                  "ERROR Too many input registers requested (%d > %d)\n",nb,
-                  125);
+    fprintf(__fc_stderr,
+            "ERROR Too many input registers requested (%d > %d)\n",nb,125); /* fprintf_va_33 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4477,9 +4471,9 @@ int modbus_write_bits(modbus_t *ctx, int addr, int nb, uint8_t const *src)
     goto return_label;
   }
   if (nb > 1968) {
-    if (ctx->debug) fprintf_va_34(__fc_stderr,
-                                  "ERROR Writing too many bits (%d > %d)\n",
-                                  nb,1968);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Writing too many bits (%d > %d)\n",nb,
+                            1968); /* fprintf_va_34 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4564,9 +4558,9 @@ int modbus_write_registers(modbus_t *ctx, int addr, int nb,
     goto return_label;
   }
   if (nb > 123) {
-    if (ctx->debug) fprintf_va_35(__fc_stderr,
-                                  "ERROR Trying to write to too many registers (%d > %d)\n",
-                                  nb,123);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Trying to write to too many registers (%d > %d)\n",
+                            nb,123); /* fprintf_va_35 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -4695,17 +4689,17 @@ int modbus_write_and_read_registers(modbus_t *ctx, int write_addr,
     goto return_label;
   }
   if (write_nb > 121) {
-    if (ctx->debug) fprintf_va_36(__fc_stderr,
-                                  "ERROR Too many registers to write (%d > %d)\n",
-                                  write_nb,121);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many registers to write (%d > %d)\n",
+                            write_nb,121); /* fprintf_va_36 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
   }
   if (read_nb > 125) {
-    if (ctx->debug) fprintf_va_37(__fc_stderr,
-                                  "ERROR Too many registers requested (%d > %d)\n",
-                                  read_nb,125);
+    if (ctx->debug) fprintf(__fc_stderr,
+                            "ERROR Too many registers requested (%d > %d)\n",
+                            read_nb,125); /* fprintf_va_37 */
     __fc_errno = (112345678 + MODBUS_EXCEPTION_GATEWAY_TARGET) + 5;
     __retres = -1;
     goto return_label;
@@ -5309,8 +5303,8 @@ int main(int argc, char **argv)
         tmp = strcmp((char const *)*(argv + 1),"rtu");
         if (tmp == 0) use_backend = RTU;
         else {
-          printf_va_15("Usage:\n  %s [tcp|tcppi|rtu] - Modbus server for unit testing\n\n",
-                       *(argv + 0));
+          printf("Usage:\n  %s [tcp|tcppi|rtu] - Modbus server for unit testing\n\n",
+                 *(argv + 0)); /* printf_va_15 */
           __retres = -1;
           goto return_label;
         }
@@ -5346,8 +5340,7 @@ int main(int argc, char **argv)
     char const *tmp_2;
     tmp_2 = modbus_strerror(__fc_errno);
     ;
-    fprintf_va_38(__fc_stderr,"Failed to allocate the mapping: %s\n",
-                  (char *)tmp_2);
+    fprintf(__fc_stderr,"Failed to allocate the mapping: %s\n",(char *)tmp_2); /* fprintf_va_38 */
     modbus_free(ctx);
     __retres = -1;
     goto return_label;
@@ -5375,7 +5368,7 @@ int main(int argc, char **argv)
         char const *tmp_3;
         tmp_3 = modbus_strerror(__fc_errno);
         ;
-        fprintf_va_39(__fc_stderr,"Unable to connect %s\n",(char *)tmp_3);
+        fprintf(__fc_stderr,"Unable to connect %s\n",(char *)tmp_3); /* fprintf_va_39 */
         modbus_free(ctx);
         __retres = -1;
         goto return_label;
@@ -5392,14 +5385,14 @@ int main(int argc, char **argv)
     if ((int)*(query + header_length) == 0x03) 
       if (((int)*(query + (header_length + 3)) << 8) + (int)*(query + (
                                                               (header_length + 3) + 1)) == (int)UT_REGISTERS_NB_SPECIAL) {
-        printf_va_16("Set an incorrect number of values\n");
+        printf("Set an incorrect number of values\n"); /* printf_va_16 */
         *(query + (header_length + 3)) = (unsigned char)(((int)UT_REGISTERS_NB_SPECIAL - 1) >> 8);
         *(query + ((header_length + 3) + 1)) = (unsigned char)(((int)UT_REGISTERS_NB_SPECIAL - 1) & 0xFF);
       }
       else 
         if (((int)*(query + (header_length + 1)) << 8) + (int)*(query + (
                                                                 (header_length + 1) + 1)) == (int)UT_REGISTERS_ADDRESS_SPECIAL) {
-          printf_va_17("Reply to this special register address by an exception\n");
+          printf("Reply to this special register address by an exception\n"); /* printf_va_17 */
           modbus_reply_exception(ctx,(uint8_t const *)query,
                                  (unsigned int)MODBUS_EXCEPTION_SLAVE_OR_SERVER_BUSY);
           goto __Cont;
@@ -5416,7 +5409,7 @@ int main(int argc, char **argv)
                (unsigned char)0x02,
                (unsigned char)0x00,
                (unsigned char)0x00};
-            printf_va_18("Reply with an invalid TID or slave\n");
+            printf("Reply with an invalid TID or slave\n"); /* printf_va_18 */
             modbus_send_raw_request(ctx,raw_req,
                                     (int)((unsigned long)RAW_REQ_LENGTH * sizeof(uint8_t)));
             goto __Cont;
@@ -5425,7 +5418,7 @@ int main(int argc, char **argv)
             if (((int)*(query + (header_length + 1)) << 8) + (int)*(query + (
                                                                     (
                                                                     header_length + 1) + 1)) == (int)UT_REGISTERS_ADDRESS_SLEEP_500_MS) {
-              printf_va_19("Sleep 0.5 s before replying\n");
+              printf("Sleep 0.5 s before replying\n"); /* printf_va_19 */
               usleep((unsigned int)500000);
             }
             else 
@@ -5447,8 +5440,8 @@ int main(int argc, char **argv)
                 int req_length = 11;
                 int w_s = modbus_get_socket(ctx);
                 if (w_s == -1) {
-                  fprintf_va_40(__fc_stderr,
-                                "Unable to get a valid socket in special test\n");
+                  fprintf(__fc_stderr,
+                          "Unable to get a valid socket in special test\n"); /* fprintf_va_40 */
                   goto __Cont;
                 }
                 req[1] = *(query + 1);
@@ -5456,7 +5449,7 @@ int main(int argc, char **argv)
                 while (i < req_length) {
                   {
                     ssize_t tmp_6;
-                    printf_va_20("(%.2X)",(unsigned int)((int)req[i]));
+                    printf("(%.2X)",(unsigned int)((int)req[i])); /* printf_va_20 */
                     usleep((unsigned int)5000);
                     tmp_6 = send(w_s,(void const *)(& req[i]),
                                  (unsigned long)1,0x4000);
@@ -5472,7 +5465,7 @@ int main(int argc, char **argv)
     __Cont: ;
   }
   tmp_7 = modbus_strerror(__fc_errno);
-  printf_va_21("Quit the loop: %s\n",(char *)tmp_7);
+  printf("Quit the loop: %s\n",(char *)tmp_7); /* printf_va_21 */
   if (use_backend == TCP) 
     if (s != -1) close(s);
   modbus_mapping_free(mb_mapping);
diff --git a/libspng/.frama-c/libspng-example.parse/framac.ast b/libspng/.frama-c/libspng-example.parse/framac.ast
index 768fa0eca117ee9cd8a7c6af76a105c79102e96b..519a1524ad563d134926f38930185040b9d17e08 100644
--- a/libspng/.frama-c/libspng-example.parse/framac.ast
+++ b/libspng/.frama-c/libspng-example.parse/framac.ast
@@ -632,12 +632,12 @@ int main(int argc, char **argv)
   spng_ctx *ctx = (spng_ctx *)0;
   unsigned char *out = (unsigned char *)0;
   if (argc < 2) {
-    printf_va_1("no input file\n");
+    printf("no input file\n"); /* printf_va_1 */
     goto err;
   }
   png = fopen((char const *)*(argv + 1),"rb");
   if (png == (FILE *)0) {
-    printf_va_2("error opening input file %s\n",*(argv + 1));
+    printf("error opening input file %s\n",*(argv + 1)); /* printf_va_2 */
     goto err;
   }
   fseek(png,(long)0,2);
@@ -646,38 +646,38 @@ int main(int argc, char **argv)
   if (siz_pngbuf < (long)1) goto err;
   pngbuf = (char *)malloc((unsigned int)siz_pngbuf);
   if (pngbuf == (char *)0) {
-    printf_va_3("malloc() failed\n");
+    printf("malloc() failed\n"); /* printf_va_3 */
     goto err;
   }
   tmp_0 = fread((void *)pngbuf,(unsigned int)siz_pngbuf,(unsigned int)1,png);
   if (tmp_0 != (size_t)1) {
-    printf_va_4("fread() failed\n");
+    printf("fread() failed\n"); /* printf_va_4 */
     goto err;
   }
   ctx = spng_ctx_new(0);
   if (ctx == (spng_ctx *)0) {
-    printf_va_5("spng_ctx_new() failed\n");
+    printf("spng_ctx_new() failed\n"); /* printf_va_5 */
     goto err;
   }
   r = spng_set_crc_action(ctx,SPNG_CRC_USE,SPNG_CRC_USE);
   if (r) {
     char const *tmp_1;
     tmp_1 = spng_strerror(r);
-    printf_va_6("spng_set_crc_action() error: %s\n",(char *)tmp_1);
+    printf("spng_set_crc_action() error: %s\n",(char *)tmp_1); /* printf_va_6 */
     goto err;
   }
   r = spng_set_png_buffer(ctx,(void const *)pngbuf,(unsigned int)siz_pngbuf);
   if (r) {
     char const *tmp_2;
     tmp_2 = spng_strerror(r);
-    printf_va_7("spng_set_png_buffer() error: %s\n",(char *)tmp_2);
+    printf("spng_set_png_buffer() error: %s\n",(char *)tmp_2); /* printf_va_7 */
     goto err;
   }
   r = spng_get_ihdr(ctx,& ihdr);
   if (r) {
     char const *tmp_3;
     tmp_3 = spng_strerror(r);
-    printf_va_8("spng_get_ihdr() error: %s\n",(char *)tmp_3);
+    printf("spng_get_ihdr() error: %s\n",(char *)tmp_3); /* printf_va_8 */
     goto err;
   }
   if ((int)ihdr.color_type == SPNG_COLOR_TYPE_GRAYSCALE) clr_type_str = (char *)"grayscale";
@@ -689,12 +689,12 @@ int main(int argc, char **argv)
         if ((int)ihdr.color_type == SPNG_COLOR_TYPE_GRAYSCALE_ALPHA) 
           clr_type_str = (char *)"grayscale with alpha";
         else clr_type_str = (char *)"truecolor with alpha";
-  printf_va_9("width: %u\nheight: %u\nbit depth: %hhu\ncolor type: %hhu - %s\n",
-              ihdr.width,ihdr.height,(int)ihdr.bit_depth,
-              (int)ihdr.color_type,clr_type_str);
-  printf_va_10("compression method: %hhu\nfilter method: %hhu\ninterlace method: %hhu\n",
-               (int)ihdr.compression_method,(int)ihdr.filter_method,
-               (int)ihdr.interlace_method);
+  printf("width: %u\nheight: %u\nbit depth: %hhu\ncolor type: %hhu - %s\n",
+         ihdr.width,ihdr.height,(int)ihdr.bit_depth,(int)ihdr.color_type,
+         clr_type_str); /* printf_va_9 */
+  printf("compression method: %hhu\nfilter method: %hhu\ninterlace method: %hhu\n",
+         (int)ihdr.compression_method,(int)ihdr.filter_method,
+         (int)ihdr.interlace_method); /* printf_va_10 */
   r = spng_decoded_image_size(ctx,SPNG_FMT_RGBA8,& out_size);
   if (r) goto err;
   out = (unsigned char *)malloc(out_size);
@@ -703,7 +703,7 @@ int main(int argc, char **argv)
   if (r) {
     char const *tmp_4;
     tmp_4 = spng_strerror(r);
-    printf_va_11("spng_decode_image() error: %s\n",(char *)tmp_4);
+    printf("spng_decode_image() error: %s\n",(char *)tmp_4); /* printf_va_11 */
     goto err;
   }
   err: spng_ctx_free(ctx);
diff --git a/microstrain/.frama-c/microstrain_gx4_45_test.parse/framac.ast b/microstrain/.frama-c/microstrain_gx4_45_test.parse/framac.ast
index c006f517198689d647a15606ed82a853ba7c2d9a..a8e118b058d08403c60e6379f3acb22633de0b8b 100644
--- a/microstrain/.frama-c/microstrain_gx4_45_test.parse/framac.ast
+++ b/microstrain/.frama-c/microstrain_gx4_45_test.parse/framac.ast
@@ -6201,7 +6201,7 @@ u16 purge(ComPortHandle comPortHandle)
   int tmp;
   tmp = tcflush(comPortHandle,2);
   if (tmp == -1) {
-    printf_va_1("flush failed\n");
+    printf("flush failed\n"); /* printf_va_1 */
     __retres = (unsigned short)1;
     goto return_label;
   }
@@ -6283,11 +6283,10 @@ u16 mip_sdk_port_open(void **port_handle, char const *portstr, int baudrate)
   u16 tmp_0;
   char port_name[100] = {(char)0};
   strcat(port_name,portstr);
-  mip_sdk_port_open_local_port_handle = __va_open_void((char const *)(port_name),
-                                                       2 | 0x100);
+  mip_sdk_port_open_local_port_handle = open((char const *)(port_name),
+                                             2 | 0x100); /* __va_open_void */
   if (mip_sdk_port_open_local_port_handle == -1) {
-    printf_va_2("Unable to open com Port %s\n Errno = %i\n",port_name,
-                __fc_errno);
+    printf("Unable to open com Port %s\n Errno = %i\n",port_name,__fc_errno); /* printf_va_2 */
     __retres = (unsigned short)1;
     goto return_label;
   }
@@ -6350,7 +6349,7 @@ u16 mip_sdk_port_open(void **port_handle, char const *portstr, int baudrate)
     break;
     case 4000000: hardware_bit_baud = 0010017;
     break;
-    default: printf_va_3("Unsupported baud specified\n");
+    default: printf("Unsupported baud specified\n"); /* printf_va_3 */
     __retres = (unsigned short)1;
     goto return_label;
   }
@@ -6369,19 +6368,19 @@ u16 mip_sdk_port_open(void **port_handle, char const *portstr, int baudrate)
   options.c_cflag |= (unsigned int)(0004000 | 0000200);
   tmp = purge(mip_sdk_port_open_local_port_handle);
   if ((int)tmp != 0) {
-    printf_va_4("Flushing old serial buffer data failed\n");
+    printf("Flushing old serial buffer data failed\n"); /* printf_va_4 */
     __retres = (unsigned short)1;
     goto return_label;
   }
   status = tcsetattr(mip_sdk_port_open_local_port_handle,0,& options);
   if (status != 0) {
-    printf_va_5("Configuring comport failed\n");
+    printf("Configuring comport failed\n"); /* printf_va_5 */
     __retres = (unsigned short)1;
     goto return_label;
   }
   tmp_0 = purge(mip_sdk_port_open_local_port_handle);
   if ((int)tmp_0 != 0) {
-    printf_va_6("Post configuration serial buffer flush failed\n");
+    printf("Post configuration serial buffer flush failed\n"); /* printf_va_6 */
     __retres = (unsigned short)1;
     goto return_label;
   }
@@ -6449,7 +6448,7 @@ u32 mip_sdk_port_read_count(void *port_handle)
   u32 __retres;
   int bytes_available;
   int local_port_handle = *((int *)port_handle);
-  __va_ioctl_ptr(local_port_handle,0x541B,(void *)(& bytes_available));
+  ioctl(local_port_handle,0x541B,(void *)(& bytes_available)); /* __va_ioctl_ptr */
   __retres = (unsigned int)bytes_available;
   return __retres;
 }
@@ -13210,9 +13209,9 @@ int main(int argc, char **argv)
     goto return_label;
   }
   com_mode = (unsigned char)0x02;
-  printf_va_7("----------------------------------------------------------------------\n");
-  printf_va_8("Attempting to set communications mode to IMU Direct mode\n");
-  printf_va_9("----------------------------------------------------------------------\n\n");
+  printf("----------------------------------------------------------------------\n"); /* printf_va_7 */
+  printf("Attempting to set communications mode to IMU Direct mode\n"); /* printf_va_8 */
+  printf("----------------------------------------------------------------------\n\n"); /* printf_va_9 */
   while (1) {
     u16 tmp_1;
     tmp_1 = mip_system_com_mode(& device_interface,(unsigned char)0x01,
@@ -13236,63 +13235,63 @@ int main(int argc, char **argv)
     char const *tmp_22;
     int tmp_32;
     int tmp_38;
-    printf_va_10("Communications mode IMU Direct.\n");
-    printf_va_11("\n\n");
+    printf("Communications mode IMU Direct.\n"); /* printf_va_10 */
+    printf("\n\n"); /* printf_va_11 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_12("----------------------------------------------------------------------\n");
-    printf_va_13("Idling Device\n");
-    printf_va_14("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_12 */
+    printf("Idling Device\n"); /* printf_va_13 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_14 */
     while (1) {
       u16 tmp_3;
       tmp_3 = mip_base_cmd_idle(& device_interface);
       if (! ((int)tmp_3 != 0)) break;
     }
-    printf_va_15("\n\n");
+    printf("\n\n"); /* printf_va_15 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_16("----------------------------------------------------------------------\n");
-    printf_va_17("Pinging Device\n");
-    printf_va_18("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_16 */
+    printf("Pinging Device\n"); /* printf_va_17 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_18 */
     while (1) {
       u16 tmp_4;
       tmp_4 = mip_base_cmd_ping(& device_interface);
       if (! ((int)tmp_4 != 0)) break;
     }
-    printf_va_19("\n\n");
+    printf("\n\n"); /* printf_va_19 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_20("----------------------------------------------------------------------\n");
-    printf_va_21("Getting Device Information\n");
-    printf_va_22("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_20 */
+    printf("Getting Device Information\n"); /* printf_va_21 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_22 */
     while (1) {
       u16 tmp_5;
       tmp_5 = mip_base_cmd_get_device_info(& device_interface,& device_info);
       if (! ((int)tmp_5 != 0)) break;
     }
-    printf_va_23("\n\nDevice Info:\n");
-    printf_va_24("---------------------------------------------\n");
+    printf("\n\nDevice Info:\n"); /* printf_va_23 */
+    printf("---------------------------------------------\n"); /* printf_va_24 */
     memcpy((void *)(temp_string),(void const *)(device_info.model_name),
            (unsigned int)(8 * 2));
-    printf_va_25("Model Name       => %s\n",(char *)(temp_string));
+    printf("Model Name       => %s\n",(char *)(temp_string)); /* printf_va_25 */
     memcpy((void *)(temp_string),(void const *)(device_info.model_number),
            (unsigned int)(8 * 2));
-    printf_va_26("Model Number     => %s\n",(char *)(temp_string));
+    printf("Model Number     => %s\n",(char *)(temp_string)); /* printf_va_26 */
     memcpy((void *)(temp_string),(void const *)(device_info.serial_number),
            (unsigned int)(8 * 2));
-    printf_va_27("Serial Number    => %s\n",(char *)(temp_string));
+    printf("Serial Number    => %s\n",(char *)(temp_string)); /* printf_va_27 */
     memcpy((void *)(temp_string),(void const *)(device_info.lotnumber),
            (unsigned int)(8 * 2));
-    printf_va_28("Lot Number       => %s\n",(char *)(temp_string));
+    printf("Lot Number       => %s\n",(char *)(temp_string)); /* printf_va_28 */
     memcpy((void *)(temp_string),(void const *)(device_info.device_options),
            (unsigned int)(8 * 2));
-    printf_va_29("Options          => %s\n",(char *)(temp_string));
-    printf_va_30("Firmware Version => %d.%d.%.2d\n\n",
-                 (int)device_info.firmware_version / 1000,
-                 ((int)device_info.firmware_version % 1000) / 100,
-                 (int)device_info.firmware_version % 100);
-    printf_va_31("\n\n");
+    printf("Options          => %s\n",(char *)(temp_string)); /* printf_va_29 */
+    printf("Firmware Version => %d.%d.%.2d\n\n",
+           (int)device_info.firmware_version / 1000,
+           ((int)device_info.firmware_version % 1000) / 100,
+           (int)device_info.firmware_version % 100); /* printf_va_30 */
+    printf("\n\n"); /* printf_va_31 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_32("----------------------------------------------------------------------\n");
-    printf_va_33("Getting Supported descriptors\n");
-    printf_va_34("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_32 */
+    printf("Getting Supported descriptors\n"); /* printf_va_33 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_34 */
     while (1) {
       u16 tmp_6;
       tmp_6 = mip_base_cmd_get_device_supported_descriptors(& device_interface,
@@ -13300,43 +13299,42 @@ int main(int argc, char **argv)
                                                             & device_descriptors_size);
       if (! ((int)tmp_6 != 0)) break;
     }
-    printf_va_35("\n\nSupported descriptors:\n\n");
+    printf("\n\nSupported descriptors:\n\n"); /* printf_va_35 */
     i = (short)0;
     while ((int)i < (int)device_descriptors_size / 2) {
-      printf_va_36("Descriptor Set: %02x, Descriptor: %02x\n",
-                   (unsigned int)((int)device_descriptors[i] >> 8),
-                   (unsigned int)((int)device_descriptors[i] & 0xFF));
+      printf("Descriptor Set: %02x, Descriptor: %02x\n",
+             (unsigned int)((int)device_descriptors[i] >> 8),
+             (unsigned int)((int)device_descriptors[i] & 0xFF)); /* printf_va_36 */
       usleep((unsigned int)((double)100 * 1000.0));
       i = (s16)((int)i + 1);
     }
-    printf_va_37("\n\n");
+    printf("\n\n"); /* printf_va_37 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_38("----------------------------------------------------------------------\n");
-    printf_va_39("Running Built In Test\n");
-    printf_va_40("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_38 */
+    printf("Running Built In Test\n"); /* printf_va_39 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_40 */
     while (1) {
       u16 tmp_7;
       tmp_7 = mip_base_cmd_built_in_test(& device_interface,& bit_result);
       if (! ((int)tmp_7 != 0)) break;
     }
-    printf_va_41("\nBIT Result (should be 0x00000000) => 0x%08x\n\n",
-                 bit_result);
-    printf_va_42("\n\n");
+    printf("\nBIT Result (should be 0x00000000) => 0x%08x\n\n",bit_result); /* printf_va_41 */
+    printf("\n\n"); /* printf_va_42 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_43("----------------------------------------------------------------------\n");
-    printf_va_44("Getting the AHRS datastream base rate\n");
-    printf_va_45("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_43 */
+    printf("Getting the AHRS datastream base rate\n"); /* printf_va_44 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_45 */
     while (1) {
       u16 tmp_8;
       tmp_8 = mip_3dm_cmd_get_ahrs_base_rate(& device_interface,& base_rate);
       if (! ((int)tmp_8 != 0)) break;
     }
-    printf_va_46("\nAHRS Base Rate => %d Hz\n\n",(int)base_rate);
-    printf_va_47("\n\n");
+    printf("\nAHRS Base Rate => %d Hz\n\n",(int)base_rate); /* printf_va_46 */
+    printf("\n\n"); /* printf_va_47 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_48("----------------------------------------------------------------------\n");
-    printf_va_49("Requesting BASIC Status Report:\n");
-    printf_va_50("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_48 */
+    printf("Requesting BASIC Status Report:\n"); /* printf_va_49 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_50 */
     while (1) {
       u16 tmp_9;
       tmp_9 = mip_3dm_cmd_hw_specific_imu_device_status(& device_interface,
@@ -13345,16 +13343,15 @@ int main(int argc, char **argv)
                                                         (u8 *)(& imu_basic_field));
       if (! ((int)tmp_9 != 0)) break;
     }
-    printf_va_51("Model Number: \t\t\t\t\t%04u\n",
-                 (unsigned int)((int)imu_basic_field.device_model));
+    printf("Model Number: \t\t\t\t\t%04u\n",
+           (unsigned int)((int)imu_basic_field.device_model)); /* printf_va_51 */
     if ((int)imu_basic_field.status_selector == 1) tmp_10 = "Basic Status Report";
     else tmp_10 = "Diagnostic Status Report";
-    printf_va_52("Status Selector: \t\t\t\t%s\n",(char *)tmp_10);
-    printf_va_53("Status Flags: \t\t\t\t\t0x%08x\n",
-                 imu_basic_field.status_flags);
-    printf_va_54("System Millisecond Timer Count: \t\t%llu ms\n\n",
-                 (unsigned long long)imu_basic_field.system_timer_ms);
-    printf_va_55("Requesting DIAGNOSTIC Status Report:\n");
+    printf("Status Selector: \t\t\t\t%s\n",(char *)tmp_10); /* printf_va_52 */
+    printf("Status Flags: \t\t\t\t\t0x%08x\n",imu_basic_field.status_flags); /* printf_va_53 */
+    printf("System Millisecond Timer Count: \t\t%llu ms\n\n",
+           (unsigned long long)imu_basic_field.system_timer_ms); /* printf_va_54 */
+    printf("Requesting DIAGNOSTIC Status Report:\n"); /* printf_va_55 */
     while (1) {
       u16 tmp_11;
       tmp_11 = mip_3dm_cmd_hw_specific_imu_device_status(& device_interface,
@@ -13363,58 +13360,58 @@ int main(int argc, char **argv)
                                                          (u8 *)(& imu_diagnostic_field));
       if (! ((int)tmp_11 != 0)) break;
     }
-    printf_va_56("Model Number: \t\t\t\t\t%04u\n",
-                 (unsigned int)((int)imu_diagnostic_field.device_model));
+    printf("Model Number: \t\t\t\t\t%04u\n",
+           (unsigned int)((int)imu_diagnostic_field.device_model)); /* printf_va_56 */
     if ((int)imu_diagnostic_field.status_selector == 1) tmp_12 = "Basic Status Report";
     else tmp_12 = "Diagnostic Status Report";
-    printf_va_57("Status Selector: \t\t\t\t%s\n",(char *)tmp_12);
-    printf_va_58("Status Flags: \t\t\t\t\t0x%08x\n",
-                 imu_diagnostic_field.status_flags);
-    printf_va_59("System Millisecond Timer Count: \t\t%llu ms\n",
-                 (unsigned long long)imu_diagnostic_field.system_timer_ms);
+    printf("Status Selector: \t\t\t\t%s\n",(char *)tmp_12); /* printf_va_57 */
+    printf("Status Flags: \t\t\t\t\t0x%08x\n",
+           imu_diagnostic_field.status_flags); /* printf_va_58 */
+    printf("System Millisecond Timer Count: \t\t%llu ms\n",
+           (unsigned long long)imu_diagnostic_field.system_timer_ms); /* printf_va_59 */
     if ((int)imu_diagnostic_field.has_mag == 1) tmp_13 = "DETECTED";
     else tmp_13 = "NOT-DETECTED";
-    printf_va_60("Magnetometer: \t\t\t\t\t%s\n",(char *)tmp_13);
+    printf("Magnetometer: \t\t\t\t\t%s\n",(char *)tmp_13); /* printf_va_60 */
     if ((int)imu_diagnostic_field.has_pressure == 1) tmp_14 = "DETECTED";
     else tmp_14 = "NOT-DETECTED";
-    printf_va_61("Pressure Sensor: \t\t\t\t%s\n",(char *)tmp_14);
-    printf_va_62("Gyro Range Reported: \t\t\t\t%u deg/s\n",
-                 (unsigned int)((int)imu_diagnostic_field.gyro_range));
-    printf_va_63("Accel Range Reported: \t\t\t\t%u G\n",
-                 (unsigned int)((int)imu_diagnostic_field.accel_range));
-    printf_va_64("Magnetometer Range Reported: \t\t\t%f Gs\n",
-                 (double)imu_diagnostic_field.mag_range);
-    printf_va_65("Pressure Range Reported: \t\t\t%f hPa\n",
-                 (double)imu_diagnostic_field.pressure_range);
-    printf_va_66("Measured Internal Temperature: \t\t\t%f degrees C\n",
-                 (double)imu_diagnostic_field.temp_degc);
-    printf_va_67("Last Temperature Measured: \t\t\t%u ms\n",
-                 imu_diagnostic_field.last_temp_read_ms);
+    printf("Pressure Sensor: \t\t\t\t%s\n",(char *)tmp_14); /* printf_va_61 */
+    printf("Gyro Range Reported: \t\t\t\t%u deg/s\n",
+           (unsigned int)((int)imu_diagnostic_field.gyro_range)); /* printf_va_62 */
+    printf("Accel Range Reported: \t\t\t\t%u G\n",
+           (unsigned int)((int)imu_diagnostic_field.accel_range)); /* printf_va_63 */
+    printf("Magnetometer Range Reported: \t\t\t%f Gs\n",
+           (double)imu_diagnostic_field.mag_range); /* printf_va_64 */
+    printf("Pressure Range Reported: \t\t\t%f hPa\n",
+           (double)imu_diagnostic_field.pressure_range); /* printf_va_65 */
+    printf("Measured Internal Temperature: \t\t\t%f degrees C\n",
+           (double)imu_diagnostic_field.temp_degc); /* printf_va_66 */
+    printf("Last Temperature Measured: \t\t\t%u ms\n",
+           imu_diagnostic_field.last_temp_read_ms); /* printf_va_67 */
     if ((int)imu_diagnostic_field.temp_sensor_error == 1) tmp_15 = "TRUE";
     else tmp_15 = "FALSE";
-    printf_va_68("Bad Temperature Sensor Detected: \t\t%s\n",(char *)tmp_15);
-    printf_va_69("Number Received GPS Pulse-Per-Second Pulses: \t%u Pulses\n",
-                 imu_diagnostic_field.num_gps_pps_triggers);
-    printf_va_70("Time of Last GPS Pulse-Per-Second Pulse: \t%u ms\n",
-                 imu_diagnostic_field.last_gps_pps_trigger_ms);
+    printf("Bad Temperature Sensor Detected: \t\t%s\n",(char *)tmp_15); /* printf_va_68 */
+    printf("Number Received GPS Pulse-Per-Second Pulses: \t%u Pulses\n",
+           imu_diagnostic_field.num_gps_pps_triggers); /* printf_va_69 */
+    printf("Time of Last GPS Pulse-Per-Second Pulse: \t%u ms\n",
+           imu_diagnostic_field.last_gps_pps_trigger_ms); /* printf_va_70 */
     if ((int)imu_diagnostic_field.stream_enabled == 1) tmp_16 = "TRUE";
     else tmp_16 = "FALSE";
-    printf_va_71("Data Streaming Enabled: \t\t\t%s\n",(char *)tmp_16);
-    printf_va_72("Number of Dropped Communication Packets: \t%u packets\n",
-                 imu_diagnostic_field.dropped_packets);
-    printf_va_73("Communications Port Bytes Written: \t\t%u Bytes\n",
-                 imu_diagnostic_field.com_port_bytes_written);
-    printf_va_74("Communications Port Bytes Read: \t\t%u Bytes\n",
-                 imu_diagnostic_field.com_port_bytes_read);
-    printf_va_75("Communications Port Write Overruns: \t\t%u Bytes\n",
-                 imu_diagnostic_field.com_port_write_overruns);
-    printf_va_76("Communications Port Read Overruns: \t\t%u Bytes\n",
-                 imu_diagnostic_field.com_port_read_overruns);
-    printf_va_77("\n\n");
+    printf("Data Streaming Enabled: \t\t\t%s\n",(char *)tmp_16); /* printf_va_71 */
+    printf("Number of Dropped Communication Packets: \t%u packets\n",
+           imu_diagnostic_field.dropped_packets); /* printf_va_72 */
+    printf("Communications Port Bytes Written: \t\t%u Bytes\n",
+           imu_diagnostic_field.com_port_bytes_written); /* printf_va_73 */
+    printf("Communications Port Bytes Read: \t\t%u Bytes\n",
+           imu_diagnostic_field.com_port_bytes_read); /* printf_va_74 */
+    printf("Communications Port Write Overruns: \t\t%u Bytes\n",
+           imu_diagnostic_field.com_port_write_overruns); /* printf_va_75 */
+    printf("Communications Port Read Overruns: \t\t%u Bytes\n",
+           imu_diagnostic_field.com_port_read_overruns); /* printf_va_76 */
+    printf("\n\n"); /* printf_va_77 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_78("----------------------------------------------------------------------\n");
-    printf_va_79("Disabling Coning and Sculling compensation\n");
-    printf_va_80("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_78 */
+    printf("Disabling Coning and Sculling compensation\n"); /* printf_va_79 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_80 */
     enable = (unsigned char)0x00;
     while (1) {
       u16 tmp_17;
@@ -13423,7 +13420,7 @@ int main(int argc, char **argv)
                                                         & enable);
       if (! ((int)tmp_17 != 0)) break;
     }
-    printf_va_81("Reading Coning and Sculling compensation enabled state:\n");
+    printf("Reading Coning and Sculling compensation enabled state:\n"); /* printf_va_81 */
     while (1) {
       u16 tmp_18;
       tmp_18 = mip_3dm_cmd_coning_sculling_compensation(& device_interface,
@@ -13432,8 +13429,8 @@ int main(int argc, char **argv)
       if (! ((int)tmp_18 != 0)) break;
     }
     if ((int)enable == 0x00) tmp_19 = "DISABLED"; else tmp_19 = "ENABLED";
-    printf_va_82("%s\n\n",(char *)tmp_19);
-    printf_va_83("Enabling Coning and Sculling compensation.\n");
+    printf("%s\n\n",(char *)tmp_19); /* printf_va_82 */
+    printf("Enabling Coning and Sculling compensation.\n"); /* printf_va_83 */
     enable = (unsigned char)0x01;
     while (1) {
       u16 tmp_20;
@@ -13442,7 +13439,7 @@ int main(int argc, char **argv)
                                                         & enable);
       if (! ((int)tmp_20 != 0)) break;
     }
-    printf_va_84("Reading Coning and Sculling compensation enabled state:\n");
+    printf("Reading Coning and Sculling compensation enabled state:\n"); /* printf_va_84 */
     while (1) {
       u16 tmp_21;
       tmp_21 = mip_3dm_cmd_coning_sculling_compensation(& device_interface,
@@ -13451,19 +13448,19 @@ int main(int argc, char **argv)
       if (! ((int)tmp_21 != 0)) break;
     }
     if ((int)enable == 0x00) tmp_22 = "DISABLED"; else tmp_22 = "ENABLED";
-    printf_va_85("%s\n\n",(char *)tmp_22);
-    printf_va_86("\n\n");
+    printf("%s\n\n",(char *)tmp_22); /* printf_va_85 */
+    printf("\n\n"); /* printf_va_86 */
     usleep((unsigned int)((double)1500 * 1000.0));
     bias_vector[0] = 1.0f;
     bias_vector[1] = 2.0f;
     bias_vector[2] = 3.0f;
-    printf_va_87("----------------------------------------------------------------------\n");
-    printf_va_88("Accel Bias Vector\n");
-    printf_va_89("----------------------------------------------------------------------\n\n");
-    printf_va_90("Setting Accel Bias Vector:\n");
-    printf_va_91("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                 (double)bias_vector[0],(double)bias_vector[1],
-                 (double)bias_vector[2]);
+    printf("----------------------------------------------------------------------\n"); /* printf_va_87 */
+    printf("Accel Bias Vector\n"); /* printf_va_88 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_89 */
+    printf("Setting Accel Bias Vector:\n"); /* printf_va_90 */
+    printf("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_91 */
     while (1) {
       u16 tmp_23;
       tmp_23 = mip_3dm_cmd_accel_bias(& device_interface,(unsigned char)0x01,
@@ -13471,35 +13468,35 @@ int main(int argc, char **argv)
       if (! ((int)tmp_23 != 0)) break;
     }
     memset((void *)(bias_vector),0,(unsigned int)3 * sizeof(float));
-    printf_va_92("Reading current Accel Bias Vector:\n");
+    printf("Reading current Accel Bias Vector:\n"); /* printf_va_92 */
     while (1) {
       u16 tmp_24;
       tmp_24 = mip_3dm_cmd_accel_bias(& device_interface,(unsigned char)0x02,
                                       bias_vector);
       if (! ((int)tmp_24 != 0)) break;
     }
-    printf_va_93("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                 (double)bias_vector[0],(double)bias_vector[1],
-                 (double)bias_vector[2]);
-    printf_va_94("Resetting Accel Bias to default state.\n\n");
+    printf("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_93 */
+    printf("Resetting Accel Bias to default state.\n\n"); /* printf_va_94 */
     while (1) {
       u16 tmp_25;
       tmp_25 = mip_3dm_cmd_accel_bias(& device_interface,(unsigned char)0x05,
                                       (float *)0);
       if (! ((int)tmp_25 != 0)) break;
     }
-    printf_va_95("\n\n");
+    printf("\n\n"); /* printf_va_95 */
     usleep((unsigned int)((double)1500 * 1000.0));
     bias_vector[0] = 4.0f;
     bias_vector[1] = 5.0f;
     bias_vector[2] = 6.0f;
-    printf_va_96("----------------------------------------------------------------------\n");
-    printf_va_97("Gyro Bias Vector\n");
-    printf_va_98("----------------------------------------------------------------------\n\n");
-    printf_va_99("Setting Gyro Bias Vector:\n");
-    printf_va_100("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                  (double)bias_vector[0],(double)bias_vector[1],
-                  (double)bias_vector[2]);
+    printf("----------------------------------------------------------------------\n"); /* printf_va_96 */
+    printf("Gyro Bias Vector\n"); /* printf_va_97 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_98 */
+    printf("Setting Gyro Bias Vector:\n"); /* printf_va_99 */
+    printf("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_100 */
     while (1) {
       u16 tmp_26;
       tmp_26 = mip_3dm_cmd_gyro_bias(& device_interface,(unsigned char)0x01,
@@ -13507,28 +13504,28 @@ int main(int argc, char **argv)
       if (! ((int)tmp_26 != 0)) break;
     }
     memset((void *)(bias_vector),0,(unsigned int)3 * sizeof(float));
-    printf_va_101("Reading current Gyro Bias Vector:\n");
+    printf("Reading current Gyro Bias Vector:\n"); /* printf_va_101 */
     while (1) {
       u16 tmp_27;
       tmp_27 = mip_3dm_cmd_gyro_bias(& device_interface,(unsigned char)0x02,
                                      bias_vector);
       if (! ((int)tmp_27 != 0)) break;
     }
-    printf_va_102("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                  (double)bias_vector[0],(double)bias_vector[1],
-                  (double)bias_vector[2]);
-    printf_va_103("Resetting Gyro Bias to default state.\n\n");
+    printf("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_102 */
+    printf("Resetting Gyro Bias to default state.\n\n"); /* printf_va_103 */
     while (1) {
       u16 tmp_28;
       tmp_28 = mip_3dm_cmd_gyro_bias(& device_interface,(unsigned char)0x05,
                                      (float *)0);
       if (! ((int)tmp_28 != 0)) break;
     }
-    printf_va_104("\n\n");
+    printf("\n\n"); /* printf_va_104 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_105("----------------------------------------------------------------------\n");
-    printf_va_106("Performing Gyro Bias capture.\nPlease keep device stationary during the 5 second gyro bias capture interval\n");
-    printf_va_107("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_105 */
+    printf("Performing Gyro Bias capture.\nPlease keep device stationary during the 5 second gyro bias capture interval\n"); /* printf_va_106 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_107 */
     duration = (unsigned short)5000;
     while (1) {
       u16 tmp_29;
@@ -13536,14 +13533,14 @@ int main(int argc, char **argv)
                                              bias_vector);
       if (! ((int)tmp_29 != 0)) break;
     }
-    printf_va_108("Gyro Bias Captured:\nbias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                  (double)bias_vector[0],(double)bias_vector[1],
-                  (double)bias_vector[2]);
-    printf_va_109("\n\n");
+    printf("Gyro Bias Captured:\nbias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_108 */
+    printf("\n\n"); /* printf_va_109 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_110("----------------------------------------------------------------------\n");
-    printf_va_111("Setting the hard iron offset values\n");
-    printf_va_112("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_110 */
+    printf("Setting the hard iron offset values\n"); /* printf_va_111 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_112 */
     hard_iron[0] = (float)1.0;
     hard_iron[1] = (float)2.0;
     hard_iron[2] = (float)3.0;
@@ -13566,7 +13563,7 @@ int main(int argc, char **argv)
       if ((double)tmp_33 < 0.001) {
         int tmp_34;
         tmp_34 = abs((int)(hard_iron_readback[2] - hard_iron[2]));
-        if ((double)tmp_34 < 0.001) printf_va_113("Hard iron offset values successfully set.\n");
+        if ((double)tmp_34 < 0.001) printf("Hard iron offset values successfully set.\n"); /* printf_va_113 */
         else goto _LAND_0;
       }
       else goto _LAND_0;
@@ -13574,28 +13571,26 @@ int main(int argc, char **argv)
     else {
       _LAND_0:
       {
-        printf_va_114("ERROR: Failed to set hard iron offset values!!!\n");
-        printf_va_115("Sent values:     %f X %f Y %f Z\n",
-                      (double)hard_iron[0],(double)hard_iron[1],
-                      (double)hard_iron[2]);
-        printf_va_116("Returned values: %f X %f Y %f Z\n",
-                      (double)hard_iron_readback[0],
-                      (double)hard_iron_readback[1],
-                      (double)hard_iron_readback[2]);
+        printf("ERROR: Failed to set hard iron offset values!!!\n"); /* printf_va_114 */
+        printf("Sent values:     %f X %f Y %f Z\n",(double)hard_iron[0],
+               (double)hard_iron[1],(double)hard_iron[2]); /* printf_va_115 */
+        printf("Returned values: %f X %f Y %f Z\n",
+               (double)hard_iron_readback[0],(double)hard_iron_readback[1],
+               (double)hard_iron_readback[2]); /* printf_va_116 */
       }
     }
-    printf_va_117("\n\nLoading the default hard iron offset values.\n\n");
+    printf("\n\nLoading the default hard iron offset values.\n\n"); /* printf_va_117 */
     while (1) {
       u16 tmp_35;
       tmp_35 = mip_3dm_cmd_hard_iron(& device_interface,(unsigned char)0x05,
                                      (float *)0);
       if (! ((int)tmp_35 != 0)) break;
     }
-    printf_va_118("\n\n");
+    printf("\n\n"); /* printf_va_118 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_119("----------------------------------------------------------------------\n");
-    printf_va_120("Setting the soft iron matrix values\n");
-    printf_va_121("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_119 */
+    printf("Setting the soft iron matrix values\n"); /* printf_va_120 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_121 */
     i = (short)0;
     while ((int)i < 9) {
       soft_iron[i] = (float)i;
@@ -13638,7 +13633,7 @@ int main(int argc, char **argv)
                   if ((double)tmp_45 < 0.001) {
                     int tmp_46;
                     tmp_46 = abs((int)(soft_iron_readback[8] - soft_iron[8]));
-                    if ((double)tmp_46 < 0.001) printf_va_122("Soft iron matrix values successfully set.\n");
+                    if ((double)tmp_46 < 0.001) printf("Soft iron matrix values successfully set.\n"); /* printf_va_122 */
                     else goto _LAND_8;
                   }
                   else goto _LAND_8;
@@ -13658,37 +13653,33 @@ int main(int argc, char **argv)
     else {
       _LAND_8:
       {
-        printf_va_123("ERROR: Failed to set hard iron values!!!\n");
-        printf_va_124("Sent values:     [%f  %f  %f][%f  %f  %f][%f  %f  %f]\n",
-                      (double)soft_iron[0],(double)soft_iron[1],
-                      (double)soft_iron[2],(double)soft_iron[3],
-                      (double)soft_iron[4],(double)soft_iron[5],
-                      (double)soft_iron[6],(double)soft_iron[7],
-                      (double)soft_iron[8]);
-        printf_va_125("Returned values: [%f  %f  %f][%f  %f  %f][%f  %f  %f]\n",
-                      (double)soft_iron_readback[0],
-                      (double)soft_iron_readback[1],
-                      (double)soft_iron_readback[2],
-                      (double)soft_iron_readback[3],
-                      (double)soft_iron_readback[4],
-                      (double)soft_iron_readback[5],
-                      (double)soft_iron_readback[6],
-                      (double)soft_iron_readback[7],
-                      (double)soft_iron_readback[8]);
+        printf("ERROR: Failed to set hard iron values!!!\n"); /* printf_va_123 */
+        printf("Sent values:     [%f  %f  %f][%f  %f  %f][%f  %f  %f]\n",
+               (double)soft_iron[0],(double)soft_iron[1],
+               (double)soft_iron[2],(double)soft_iron[3],
+               (double)soft_iron[4],(double)soft_iron[5],
+               (double)soft_iron[6],(double)soft_iron[7],
+               (double)soft_iron[8]); /* printf_va_124 */
+        printf("Returned values: [%f  %f  %f][%f  %f  %f][%f  %f  %f]\n",
+               (double)soft_iron_readback[0],(double)soft_iron_readback[1],
+               (double)soft_iron_readback[2],(double)soft_iron_readback[3],
+               (double)soft_iron_readback[4],(double)soft_iron_readback[5],
+               (double)soft_iron_readback[6],(double)soft_iron_readback[7],
+               (double)soft_iron_readback[8]); /* printf_va_125 */
       }
     }
-    printf_va_126("\n\nLoading the default soft iron matrix values.\n\n");
+    printf("\n\nLoading the default soft iron matrix values.\n\n"); /* printf_va_126 */
     while (1) {
       u16 tmp_47;
       tmp_47 = mip_3dm_cmd_soft_iron(& device_interface,(unsigned char)0x05,
                                      (float *)0);
       if (! ((int)tmp_47 != 0)) break;
     }
-    printf_va_127("\n\n");
+    printf("\n\n"); /* printf_va_127 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_128("----------------------------------------------------------------------\n");
-    printf_va_129("Setting the AHRS message format\n");
-    printf_va_130("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_128 */
+    printf("Setting the AHRS message format\n"); /* printf_va_129 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_130 */
     data_stream_format_descriptors[0] = (unsigned char)0x04;
     data_stream_format_descriptors[1] = (unsigned char)0x05;
     data_stream_format_decimation[0] = (unsigned short)0x64;
@@ -13703,11 +13694,11 @@ int main(int argc, char **argv)
                                                data_stream_format_decimation);
       if (! ((int)tmp_48 != 0)) break;
     }
-    printf_va_131("\n\n");
+    printf("\n\n"); /* printf_va_131 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_132("----------------------------------------------------------------------\n");
-    printf_va_133("Polling AHRS Data.\n");
-    printf_va_134("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_132 */
+    printf("Polling AHRS Data.\n"); /* printf_va_133 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_134 */
     while (1) {
       u16 tmp_49;
       tmp_49 = mip_3dm_cmd_poll_ahrs(& device_interface,(unsigned char)0x00,
@@ -13716,14 +13707,14 @@ int main(int argc, char **argv)
       if (! ((int)tmp_49 != 0)) break;
     }
   }
-  else printf_va_135("ERROR: IMU_Direct mode not established\n\n");
-  printf_va_136("\n\n");
+  else printf("ERROR: IMU_Direct mode not established\n\n"); /* printf_va_135 */
+  printf("\n\n"); /* printf_va_136 */
   usleep((unsigned int)((double)1500 * 1000.0));
   device_descriptors_size = (unsigned short)(128 * 2);
   com_mode = (unsigned char)0x01;
-  printf_va_137("----------------------------------------------------------------------\n");
-  printf_va_138("Putting Device Into Standard Mode\n");
-  printf_va_139("----------------------------------------------------------------------\n\n");
+  printf("----------------------------------------------------------------------\n"); /* printf_va_137 */
+  printf("Putting Device Into Standard Mode\n"); /* printf_va_138 */
+  printf("----------------------------------------------------------------------\n\n"); /* printf_va_139 */
   while (1) {
     u16 tmp_50;
     tmp_50 = mip_system_com_mode(& device_interface,(unsigned char)0x01,
@@ -13736,7 +13727,7 @@ int main(int argc, char **argv)
                                  & com_mode);
     if (! ((int)tmp_51 != 0)) break;
   }
-  printf_va_140("\n\n");
+  printf("\n\n"); /* printf_va_140 */
   usleep((unsigned int)((double)1500 * 1000.0));
   if ((int)com_mode == 0x01) {
     char const *tmp_62;
@@ -13759,60 +13750,60 @@ int main(int argc, char **argv)
     u16 tmp_224;
     u16 tmp_225;
     u16 tmp_226;
-    printf_va_141("----------------------------------------------------------------------\n");
-    printf_va_142("Idling Device\n");
-    printf_va_143("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_141 */
+    printf("Idling Device\n"); /* printf_va_142 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_143 */
     while (1) {
       u16 tmp_52;
       tmp_52 = mip_base_cmd_idle(& device_interface);
       if (! ((int)tmp_52 != 0)) break;
     }
-    printf_va_144("\n\n");
+    printf("\n\n"); /* printf_va_144 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_145("----------------------------------------------------------------------\n");
-    printf_va_146("Pinging Device\n");
-    printf_va_147("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_145 */
+    printf("Pinging Device\n"); /* printf_va_146 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_147 */
     while (1) {
       u16 tmp_53;
       tmp_53 = mip_base_cmd_ping(& device_interface);
       if (! ((int)tmp_53 != 0)) break;
     }
-    printf_va_148("\n\n");
+    printf("\n\n"); /* printf_va_148 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_149("----------------------------------------------------------------------\n");
-    printf_va_150("Getting Device Information\n");
-    printf_va_151("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_149 */
+    printf("Getting Device Information\n"); /* printf_va_150 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_151 */
     while (1) {
       u16 tmp_54;
       tmp_54 = mip_base_cmd_get_device_info(& device_interface,& device_info);
       if (! ((int)tmp_54 != 0)) break;
     }
-    printf_va_152("Device Info:\n");
-    printf_va_153("---------------------------------------------\n");
+    printf("Device Info:\n"); /* printf_va_152 */
+    printf("---------------------------------------------\n"); /* printf_va_153 */
     memcpy((void *)(temp_string),(void const *)(device_info.model_name),
            (unsigned int)(8 * 2));
-    printf_va_154("Model Name       => %s\n",(char *)(temp_string));
+    printf("Model Name       => %s\n",(char *)(temp_string)); /* printf_va_154 */
     memcpy((void *)(temp_string),(void const *)(device_info.model_number),
            (unsigned int)(8 * 2));
-    printf_va_155("Model Number     => %s\n",(char *)(temp_string));
+    printf("Model Number     => %s\n",(char *)(temp_string)); /* printf_va_155 */
     memcpy((void *)(temp_string),(void const *)(device_info.serial_number),
            (unsigned int)(8 * 2));
-    printf_va_156("Serial Number    => %s\n",(char *)(temp_string));
+    printf("Serial Number    => %s\n",(char *)(temp_string)); /* printf_va_156 */
     memcpy((void *)(temp_string),(void const *)(device_info.lotnumber),
            (unsigned int)(8 * 2));
-    printf_va_157("Lot Number       => %s\n",(char *)(temp_string));
+    printf("Lot Number       => %s\n",(char *)(temp_string)); /* printf_va_157 */
     memcpy((void *)(temp_string),(void const *)(device_info.device_options),
            (unsigned int)(8 * 2));
-    printf_va_158("Options          => %s\n",(char *)(temp_string));
-    printf_va_159("Firmware Version => %d.%d.%.2d\n\n",
-                  (int)device_info.firmware_version / 1000,
-                  ((int)device_info.firmware_version % 1000) / 100,
-                  (int)device_info.firmware_version % 100);
-    printf_va_160("\n\n");
+    printf("Options          => %s\n",(char *)(temp_string)); /* printf_va_158 */
+    printf("Firmware Version => %d.%d.%.2d\n\n",
+           (int)device_info.firmware_version / 1000,
+           ((int)device_info.firmware_version % 1000) / 100,
+           (int)device_info.firmware_version % 100); /* printf_va_159 */
+    printf("\n\n"); /* printf_va_160 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_161("----------------------------------------------------------------------\n");
-    printf_va_162("Getting Supported descriptors\n");
-    printf_va_163("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_161 */
+    printf("Getting Supported descriptors\n"); /* printf_va_162 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_163 */
     while (1) {
       u16 tmp_55;
       tmp_55 = mip_base_cmd_get_device_supported_descriptors(& device_interface,
@@ -13820,66 +13811,65 @@ int main(int argc, char **argv)
                                                              & device_descriptors_size);
       if (! ((int)tmp_55 != 0)) break;
     }
-    printf_va_164("\n\nSupported descriptors:\n\n");
+    printf("\n\nSupported descriptors:\n\n"); /* printf_va_164 */
     i = (short)0;
     while ((int)i < (int)device_descriptors_size / 2) {
-      printf_va_165("Descriptor Set: %02x, Descriptor: %02x\n",
-                    (unsigned int)((int)device_descriptors[i] >> 8),
-                    (unsigned int)((int)device_descriptors[i] & 0xFF));
+      printf("Descriptor Set: %02x, Descriptor: %02x\n",
+             (unsigned int)((int)device_descriptors[i] >> 8),
+             (unsigned int)((int)device_descriptors[i] & 0xFF)); /* printf_va_165 */
       usleep((unsigned int)((double)100 * 1000.0));
       i = (s16)((int)i + 1);
     }
-    printf_va_166("\n\n");
+    printf("\n\n"); /* printf_va_166 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_167("----------------------------------------------------------------------\n");
-    printf_va_168("Running Built In Test\n");
-    printf_va_169("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_167 */
+    printf("Running Built In Test\n"); /* printf_va_168 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_169 */
     while (1) {
       u16 tmp_56;
       tmp_56 = mip_base_cmd_built_in_test(& device_interface,& bit_result);
       if (! ((int)tmp_56 != 0)) break;
     }
-    printf_va_170("\nBIT Result (should be 0x00000000) => 0x%08x\n\n",
-                  bit_result);
-    printf_va_171("\n\n");
+    printf("\nBIT Result (should be 0x00000000) => 0x%08x\n\n",bit_result); /* printf_va_170 */
+    printf("\n\n"); /* printf_va_171 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_172("----------------------------------------------------------------------\n");
-    printf_va_173("Getting the AHRS datastream base rate\n");
-    printf_va_174("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_172 */
+    printf("Getting the AHRS datastream base rate\n"); /* printf_va_173 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_174 */
     while (1) {
       u16 tmp_57;
       tmp_57 = mip_3dm_cmd_get_ahrs_base_rate(& device_interface,& base_rate);
       if (! ((int)tmp_57 != 0)) break;
     }
-    printf_va_175("\nAHRS Base Rate => %d Hz\n",(int)base_rate);
-    printf_va_176("\n\n");
+    printf("\nAHRS Base Rate => %d Hz\n",(int)base_rate); /* printf_va_175 */
+    printf("\n\n"); /* printf_va_176 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_177("----------------------------------------------------------------------\n");
-    printf_va_178("Getting the GPS datastream base rate\n");
-    printf_va_179("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_177 */
+    printf("Getting the GPS datastream base rate\n"); /* printf_va_178 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_179 */
     while (1) {
       u16 tmp_58;
       tmp_58 = mip_3dm_cmd_get_gps_base_rate(& device_interface,& base_rate);
       if (! ((int)tmp_58 != 0)) break;
     }
-    printf_va_180("\nGPS Base Rate => %d Hz\n",(int)base_rate);
-    printf_va_181("\n\n");
+    printf("\nGPS Base Rate => %d Hz\n",(int)base_rate); /* printf_va_180 */
+    printf("\n\n"); /* printf_va_181 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_182("----------------------------------------------------------------------\n");
-    printf_va_183("Getting the Estimation Filter datastream base rate\n");
-    printf_va_184("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_182 */
+    printf("Getting the Estimation Filter datastream base rate\n"); /* printf_va_183 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_184 */
     while (1) {
       u16 tmp_59;
       tmp_59 = mip_3dm_cmd_get_filter_base_rate(& device_interface,
                                                 & base_rate);
       if (! ((int)tmp_59 != 0)) break;
     }
-    printf_va_185("\nFILTER Base Rate => %d Hz\n",(int)base_rate);
-    printf_va_186("\n\n");
+    printf("\nFILTER Base Rate => %d Hz\n",(int)base_rate); /* printf_va_185 */
+    printf("\n\n"); /* printf_va_186 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_187("----------------------------------------------------------------------\n");
-    printf_va_188("Toggling Coning and Sculling compensation\n");
-    printf_va_189("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_187 */
+    printf("Toggling Coning and Sculling compensation\n"); /* printf_va_188 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_189 */
     enable = (unsigned char)0x00;
     while (1) {
       u16 tmp_60;
@@ -13888,7 +13878,7 @@ int main(int argc, char **argv)
                                                         & enable);
       if (! ((int)tmp_60 != 0)) break;
     }
-    printf_va_190("Reading Coning and Sculling compensation enabled state:\n");
+    printf("Reading Coning and Sculling compensation enabled state:\n"); /* printf_va_190 */
     while (1) {
       u16 tmp_61;
       tmp_61 = mip_3dm_cmd_coning_sculling_compensation(& device_interface,
@@ -13897,8 +13887,8 @@ int main(int argc, char **argv)
       if (! ((int)tmp_61 != 0)) break;
     }
     if ((int)enable == 0x00) tmp_62 = "DISABLED"; else tmp_62 = "ENABLED";
-    printf_va_191("%s\n\n",(char *)tmp_62);
-    printf_va_192("Enabling Coning and Sculling compensation.\n");
+    printf("%s\n\n",(char *)tmp_62); /* printf_va_191 */
+    printf("Enabling Coning and Sculling compensation.\n"); /* printf_va_192 */
     enable = (unsigned char)0x01;
     while (1) {
       u16 tmp_63;
@@ -13907,7 +13897,7 @@ int main(int argc, char **argv)
                                                         & enable);
       if (! ((int)tmp_63 != 0)) break;
     }
-    printf_va_193("Reading Coning and Sculling compensation enabled state:\n");
+    printf("Reading Coning and Sculling compensation enabled state:\n"); /* printf_va_193 */
     while (1) {
       u16 tmp_64;
       tmp_64 = mip_3dm_cmd_coning_sculling_compensation(& device_interface,
@@ -13916,19 +13906,19 @@ int main(int argc, char **argv)
       if (! ((int)tmp_64 != 0)) break;
     }
     if ((int)enable == 0x00) tmp_65 = "DISABLED"; else tmp_65 = "ENABLED";
-    printf_va_194("%s\n\n",(char *)tmp_65);
-    printf_va_195("\n\n");
+    printf("%s\n\n",(char *)tmp_65); /* printf_va_194 */
+    printf("\n\n"); /* printf_va_195 */
     usleep((unsigned int)((double)1500 * 1000.0));
     bias_vector[0] = 1.0f;
     bias_vector[1] = 2.0f;
     bias_vector[2] = 3.0f;
-    printf_va_196("----------------------------------------------------------------------\n");
-    printf_va_197("Accel Bias Vector\n");
-    printf_va_198("----------------------------------------------------------------------\n\n");
-    printf_va_199("Setting Accel Bias Vector:\n");
-    printf_va_200("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                  (double)bias_vector[0],(double)bias_vector[1],
-                  (double)bias_vector[2]);
+    printf("----------------------------------------------------------------------\n"); /* printf_va_196 */
+    printf("Accel Bias Vector\n"); /* printf_va_197 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_198 */
+    printf("Setting Accel Bias Vector:\n"); /* printf_va_199 */
+    printf("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_200 */
     while (1) {
       u16 tmp_66;
       tmp_66 = mip_3dm_cmd_accel_bias(& device_interface,(unsigned char)0x01,
@@ -13936,35 +13926,35 @@ int main(int argc, char **argv)
       if (! ((int)tmp_66 != 0)) break;
     }
     memset((void *)(bias_vector),0,(unsigned int)3 * sizeof(float));
-    printf_va_201("Reading current Accel Bias Vector:\n");
+    printf("Reading current Accel Bias Vector:\n"); /* printf_va_201 */
     while (1) {
       u16 tmp_67;
       tmp_67 = mip_3dm_cmd_accel_bias(& device_interface,(unsigned char)0x02,
                                       bias_vector);
       if (! ((int)tmp_67 != 0)) break;
     }
-    printf_va_202("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                  (double)bias_vector[0],(double)bias_vector[1],
-                  (double)bias_vector[2]);
-    printf_va_203("Resetting Accel Bias to default state.\n\n");
+    printf("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_202 */
+    printf("Resetting Accel Bias to default state.\n\n"); /* printf_va_203 */
     while (1) {
       u16 tmp_68;
       tmp_68 = mip_3dm_cmd_accel_bias(& device_interface,(unsigned char)0x05,
                                       (float *)0);
       if (! ((int)tmp_68 != 0)) break;
     }
-    printf_va_204("\n\n");
+    printf("\n\n"); /* printf_va_204 */
     usleep((unsigned int)((double)1500 * 1000.0));
     bias_vector[0] = 4.0f;
     bias_vector[1] = 5.0f;
     bias_vector[2] = 6.0f;
-    printf_va_205("----------------------------------------------------------------------\n");
-    printf_va_206("Gyro Bias Vector\n");
-    printf_va_207("----------------------------------------------------------------------\n\n");
-    printf_va_208("Setting Gyro Bias Vector:\n");
-    printf_va_209("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                  (double)bias_vector[0],(double)bias_vector[1],
-                  (double)bias_vector[2]);
+    printf("----------------------------------------------------------------------\n"); /* printf_va_205 */
+    printf("Gyro Bias Vector\n"); /* printf_va_206 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_207 */
+    printf("Setting Gyro Bias Vector:\n"); /* printf_va_208 */
+    printf("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_209 */
     while (1) {
       u16 tmp_69;
       tmp_69 = mip_3dm_cmd_gyro_bias(& device_interface,(unsigned char)0x01,
@@ -13972,28 +13962,28 @@ int main(int argc, char **argv)
       if (! ((int)tmp_69 != 0)) break;
     }
     memset((void *)(bias_vector),0,(unsigned int)3 * sizeof(float));
-    printf_va_210("Reading current Gyro Bias Vector:\n");
+    printf("Reading current Gyro Bias Vector:\n"); /* printf_va_210 */
     while (1) {
       u16 tmp_70;
       tmp_70 = mip_3dm_cmd_gyro_bias(& device_interface,(unsigned char)0x02,
                                      bias_vector);
       if (! ((int)tmp_70 != 0)) break;
     }
-    printf_va_211("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                  (double)bias_vector[0],(double)bias_vector[1],
-                  (double)bias_vector[2]);
-    printf_va_212("Resetting Gyro Bias to default state.\n\n");
+    printf("bias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_211 */
+    printf("Resetting Gyro Bias to default state.\n\n"); /* printf_va_212 */
     while (1) {
       u16 tmp_71;
       tmp_71 = mip_3dm_cmd_gyro_bias(& device_interface,(unsigned char)0x05,
                                      (float *)0);
       if (! ((int)tmp_71 != 0)) break;
     }
-    printf_va_213("\n\n");
+    printf("\n\n"); /* printf_va_213 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_214("----------------------------------------------------------------------\n");
-    printf_va_215("Performing Gyro Bias capture.\nPlease keep device stationary during the 5 second gyro bias capture interval\n");
-    printf_va_216("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_214 */
+    printf("Performing Gyro Bias capture.\nPlease keep device stationary during the 5 second gyro bias capture interval\n"); /* printf_va_215 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_216 */
     duration = (unsigned short)5000;
     while (1) {
       u16 tmp_72;
@@ -14001,14 +13991,14 @@ int main(int argc, char **argv)
                                              bias_vector);
       if (! ((int)tmp_72 != 0)) break;
     }
-    printf_va_217("Gyro Bias Captured:\nbias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
-                  (double)bias_vector[0],(double)bias_vector[1],
-                  (double)bias_vector[2]);
-    printf_va_218("\n\n");
+    printf("Gyro Bias Captured:\nbias_vector[0] = %f\nbias_vector[1] = %f\nbias_vector[2] = %f\n\n",
+           (double)bias_vector[0],(double)bias_vector[1],
+           (double)bias_vector[2]); /* printf_va_217 */
+    printf("\n\n"); /* printf_va_218 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_219("----------------------------------------------------------------------\n");
-    printf_va_220("Setting the hard iron offset values\n");
-    printf_va_221("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_219 */
+    printf("Setting the hard iron offset values\n"); /* printf_va_220 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_221 */
     hard_iron[0] = (float)1.0;
     hard_iron[1] = (float)2.0;
     hard_iron[2] = (float)3.0;
@@ -14031,7 +14021,7 @@ int main(int argc, char **argv)
       if ((double)tmp_76 < 0.001) {
         int tmp_77;
         tmp_77 = abs((int)(hard_iron_readback[2] - hard_iron[2]));
-        if ((double)tmp_77 < 0.001) printf_va_222("Hard iron offset values successfully set.\n");
+        if ((double)tmp_77 < 0.001) printf("Hard iron offset values successfully set.\n"); /* printf_va_222 */
         else goto _LAND_10;
       }
       else goto _LAND_10;
@@ -14039,28 +14029,26 @@ int main(int argc, char **argv)
     else {
       _LAND_10:
       {
-        printf_va_223("ERROR: Failed to set hard iron offset values!!!\n");
-        printf_va_224("Sent values:     %f X %f Y %f Z\n",
-                      (double)hard_iron[0],(double)hard_iron[1],
-                      (double)hard_iron[2]);
-        printf_va_225("Returned values: %f X %f Y %f Z\n",
-                      (double)hard_iron_readback[0],
-                      (double)hard_iron_readback[1],
-                      (double)hard_iron_readback[2]);
+        printf("ERROR: Failed to set hard iron offset values!!!\n"); /* printf_va_223 */
+        printf("Sent values:     %f X %f Y %f Z\n",(double)hard_iron[0],
+               (double)hard_iron[1],(double)hard_iron[2]); /* printf_va_224 */
+        printf("Returned values: %f X %f Y %f Z\n",
+               (double)hard_iron_readback[0],(double)hard_iron_readback[1],
+               (double)hard_iron_readback[2]); /* printf_va_225 */
       }
     }
-    printf_va_226("\n\nLoading the default hard iron offset values.\n\n");
+    printf("\n\nLoading the default hard iron offset values.\n\n"); /* printf_va_226 */
     while (1) {
       u16 tmp_78;
       tmp_78 = mip_3dm_cmd_hard_iron(& device_interface,(unsigned char)0x05,
                                      (float *)0);
       if (! ((int)tmp_78 != 0)) break;
     }
-    printf_va_227("\n\n");
+    printf("\n\n"); /* printf_va_227 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_228("----------------------------------------------------------------------\n");
-    printf_va_229("Setting the soft iron matrix values\n");
-    printf_va_230("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_228 */
+    printf("Setting the soft iron matrix values\n"); /* printf_va_229 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_230 */
     i = (short)0;
     while ((int)i < 9) {
       soft_iron[i] = (float)i;
@@ -14103,7 +14091,7 @@ int main(int argc, char **argv)
                   if ((double)tmp_88 < 0.001) {
                     int tmp_89;
                     tmp_89 = abs((int)(soft_iron_readback[8] - soft_iron[8]));
-                    if ((double)tmp_89 < 0.001) printf_va_231("Soft iron matrix values successfully set.\n");
+                    if ((double)tmp_89 < 0.001) printf("Soft iron matrix values successfully set.\n"); /* printf_va_231 */
                     else goto _LAND_18;
                   }
                   else goto _LAND_18;
@@ -14123,37 +14111,33 @@ int main(int argc, char **argv)
     else {
       _LAND_18:
       {
-        printf_va_232("ERROR: Failed to set hard iron values!!!\n");
-        printf_va_233("Sent values:     [%f  %f  %f][%f  %f  %f][%f  %f  %f]\n",
-                      (double)soft_iron[0],(double)soft_iron[1],
-                      (double)soft_iron[2],(double)soft_iron[3],
-                      (double)soft_iron[4],(double)soft_iron[5],
-                      (double)soft_iron[6],(double)soft_iron[7],
-                      (double)soft_iron[8]);
-        printf_va_234("Returned values: [%f  %f  %f][%f  %f  %f][%f  %f  %f]\n",
-                      (double)soft_iron_readback[0],
-                      (double)soft_iron_readback[1],
-                      (double)soft_iron_readback[2],
-                      (double)soft_iron_readback[3],
-                      (double)soft_iron_readback[4],
-                      (double)soft_iron_readback[5],
-                      (double)soft_iron_readback[6],
-                      (double)soft_iron_readback[7],
-                      (double)soft_iron_readback[8]);
+        printf("ERROR: Failed to set hard iron values!!!\n"); /* printf_va_232 */
+        printf("Sent values:     [%f  %f  %f][%f  %f  %f][%f  %f  %f]\n",
+               (double)soft_iron[0],(double)soft_iron[1],
+               (double)soft_iron[2],(double)soft_iron[3],
+               (double)soft_iron[4],(double)soft_iron[5],
+               (double)soft_iron[6],(double)soft_iron[7],
+               (double)soft_iron[8]); /* printf_va_233 */
+        printf("Returned values: [%f  %f  %f][%f  %f  %f][%f  %f  %f]\n",
+               (double)soft_iron_readback[0],(double)soft_iron_readback[1],
+               (double)soft_iron_readback[2],(double)soft_iron_readback[3],
+               (double)soft_iron_readback[4],(double)soft_iron_readback[5],
+               (double)soft_iron_readback[6],(double)soft_iron_readback[7],
+               (double)soft_iron_readback[8]); /* printf_va_234 */
       }
     }
-    printf_va_235("\n\nLoading the default soft iron matrix values.\n\n");
+    printf("\n\nLoading the default soft iron matrix values.\n\n"); /* printf_va_235 */
     while (1) {
       u16 tmp_90;
       tmp_90 = mip_3dm_cmd_soft_iron(& device_interface,(unsigned char)0x05,
                                      (float *)0);
       if (! ((int)tmp_90 != 0)) break;
     }
-    printf_va_236("\n\n");
+    printf("\n\n"); /* printf_va_236 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_237("----------------------------------------------------------------------\n");
-    printf_va_238("Setting the complementary filter values\n");
-    printf_va_239("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_237 */
+    printf("Setting the complementary filter values\n"); /* printf_va_238 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_239 */
     comp_filter_command.north_compensation_enable = (unsigned char)0;
     comp_filter_command.up_compensation_enable = (unsigned char)0;
     comp_filter_command.north_compensation_time_constant = (float)30;
@@ -14179,7 +14163,7 @@ int main(int argc, char **argv)
         if ((double)tmp_93 < 0.001) {
           int tmp_94;
           tmp_94 = abs((int)(comp_filter_command.up_compensation_time_constant - comp_filter_readback.up_compensation_time_constant));
-          if ((double)tmp_94 < 0.001) printf_va_240("Complementary filter values successfully set.\n");
+          if ((double)tmp_94 < 0.001) printf("Complementary filter values successfully set.\n"); /* printf_va_240 */
           else goto _LAND_21;
         }
         else goto _LAND_21;
@@ -14189,20 +14173,20 @@ int main(int argc, char **argv)
     else {
       _LAND_21:
       {
-        printf_va_241("ERROR: Failed to set complementary filter values!!!\n");
-        printf_va_242("Sent values:     Up Enable: %d North Enable: %d Up Time Constant: %f North Time Constant: %f \n",
-                      (int)comp_filter_command.up_compensation_enable,
-                      (int)comp_filter_command.north_compensation_enable,
-                      (double)comp_filter_command.up_compensation_time_constant,
-                      (double)comp_filter_command.north_compensation_time_constant);
-        printf_va_243("Returned values: Up Enable: %d North Enable: %d Up Time Constant: %f North Time Constant: %f \n",
-                      (int)comp_filter_readback.up_compensation_enable,
-                      (int)comp_filter_readback.north_compensation_enable,
-                      (double)comp_filter_readback.up_compensation_time_constant,
-                      (double)comp_filter_readback.north_compensation_time_constant);
+        printf("ERROR: Failed to set complementary filter values!!!\n"); /* printf_va_241 */
+        printf("Sent values:     Up Enable: %d North Enable: %d Up Time Constant: %f North Time Constant: %f \n",
+               (int)comp_filter_command.up_compensation_enable,
+               (int)comp_filter_command.north_compensation_enable,
+               (double)comp_filter_command.up_compensation_time_constant,
+               (double)comp_filter_command.north_compensation_time_constant); /* printf_va_242 */
+        printf("Returned values: Up Enable: %d North Enable: %d Up Time Constant: %f North Time Constant: %f \n",
+               (int)comp_filter_readback.up_compensation_enable,
+               (int)comp_filter_readback.north_compensation_enable,
+               (double)comp_filter_readback.up_compensation_time_constant,
+               (double)comp_filter_readback.north_compensation_time_constant); /* printf_va_243 */
       }
     }
-    printf_va_244("\n\nLoading the default complementary filter values.\n\n");
+    printf("\n\nLoading the default complementary filter values.\n\n"); /* printf_va_244 */
     while (1) {
       u16 tmp_95;
       tmp_95 = mip_3dm_cmd_complementary_filter_settings(& device_interface,
@@ -14210,11 +14194,11 @@ int main(int argc, char **argv)
                                                          (mip_complementary_filter_settings *)0);
       if (! ((int)tmp_95 != 0)) break;
     }
-    printf_va_245("\n\n");
+    printf("\n\n"); /* printf_va_245 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_246("----------------------------------------------------------------------\n");
-    printf_va_247("Requesting BASIC Status Report\n");
-    printf_va_248("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_246 */
+    printf("Requesting BASIC Status Report\n"); /* printf_va_247 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_248 */
     while (1) {
       u16 tmp_96;
       tmp_96 = mip_3dm_cmd_hw_specific_device_status(& device_interface,
@@ -14223,13 +14207,12 @@ int main(int argc, char **argv)
                                                      (u8 *)(& basic_field));
       if (! ((int)tmp_96 != 0)) break;
     }
-    printf_va_249("Model Number: \t\t\t\t\t%04u\n",
-                  (unsigned int)((int)basic_field.device_model));
+    printf("Model Number: \t\t\t\t\t%04u\n",
+           (unsigned int)((int)basic_field.device_model)); /* printf_va_249 */
     if ((int)basic_field.status_selector == 1) tmp_97 = "Basic Status Report";
     else tmp_97 = "Diagnostic Status Report";
-    printf_va_250("Status Selector: \t\t\t\t%s\n",(char *)tmp_97);
-    printf_va_251("Status Flags: \t\t\t\t\t0x%08x\n",
-                  basic_field.status_flags);
+    printf("Status Selector: \t\t\t\t%s\n",(char *)tmp_97); /* printf_va_250 */
+    printf("Status Flags: \t\t\t\t\t0x%08x\n",basic_field.status_flags); /* printf_va_251 */
     if ((int)basic_field.system_state == 0x01) strcpy((char *)(temp_string),
                                                       "System Initialization");
     else 
@@ -14238,10 +14221,10 @@ int main(int argc, char **argv)
       else 
         if ((int)basic_field.system_state == 0x03) strcpy((char *)(temp_string),
                                                           "System Running");
-    printf_va_252("System State: \t\t\t\t\t%s\n",(char *)(temp_string));
-    printf_va_253("System Microsecond Timer Count: \t\t%llu ms\n\n",
-                  (unsigned long long)basic_field.system_timer_ms);
-    printf_va_254("Requesting DIAGNOSTIC Status Report:\n");
+    printf("System State: \t\t\t\t\t%s\n",(char *)(temp_string)); /* printf_va_252 */
+    printf("System Microsecond Timer Count: \t\t%llu ms\n\n",
+           (unsigned long long)basic_field.system_timer_ms); /* printf_va_253 */
+    printf("Requesting DIAGNOSTIC Status Report:\n"); /* printf_va_254 */
     while (1) {
       u16 tmp_98;
       tmp_98 = mip_3dm_cmd_hw_specific_device_status(& device_interface,
@@ -14250,69 +14233,68 @@ int main(int argc, char **argv)
                                                      (u8 *)(& diagnostic_field));
       if (! ((int)tmp_98 != 0)) break;
     }
-    printf_va_255("Model Number: \t\t\t\t\t%04u\n",
-                  (unsigned int)((int)diagnostic_field.device_model));
+    printf("Model Number: \t\t\t\t\t%04u\n",
+           (unsigned int)((int)diagnostic_field.device_model)); /* printf_va_255 */
     if ((int)diagnostic_field.status_selector == 1) tmp_99 = "Basic Status Report";
     else tmp_99 = "Diagnostic Status Report";
-    printf_va_256("Status Selector: \t\t\t\t%s\n",(char *)tmp_99);
-    printf_va_257("Status Flags: \t\t\t\t\t0x%08x\n",
-                  diagnostic_field.status_flags);
-    printf_va_258("System Millisecond Timer Count: \t\t%llu ms\n",
-                  (unsigned long long)diagnostic_field.system_timer_ms);
-    printf_va_259("Number Received GPS Pulse-Per-Second Pulses: \t%u Pulses\n",
-                  diagnostic_field.num_gps_pps_triggers);
-    printf_va_260("Time of Last GPS Pulse-Per-Second Pulse: \t%u ms\n",
-                  diagnostic_field.last_gps_pps_trigger_ms);
+    printf("Status Selector: \t\t\t\t%s\n",(char *)tmp_99); /* printf_va_256 */
+    printf("Status Flags: \t\t\t\t\t0x%08x\n",diagnostic_field.status_flags); /* printf_va_257 */
+    printf("System Millisecond Timer Count: \t\t%llu ms\n",
+           (unsigned long long)diagnostic_field.system_timer_ms); /* printf_va_258 */
+    printf("Number Received GPS Pulse-Per-Second Pulses: \t%u Pulses\n",
+           diagnostic_field.num_gps_pps_triggers); /* printf_va_259 */
+    printf("Time of Last GPS Pulse-Per-Second Pulse: \t%u ms\n",
+           diagnostic_field.last_gps_pps_trigger_ms); /* printf_va_260 */
     if ((int)diagnostic_field.imu_stream_enabled == 1) tmp_100 = "TRUE";
     else tmp_100 = "FALSE";
-    printf_va_261("IMU Streaming Enabled: \t\t\t\t%s\n",(char *)tmp_100);
+    printf("IMU Streaming Enabled: \t\t\t\t%s\n",(char *)tmp_100); /* printf_va_261 */
     if ((int)diagnostic_field.gps_stream_enabled == 1) tmp_101 = "TRUE";
     else tmp_101 = "FALSE";
-    printf_va_262("GPS Streaming Enabled: \t\t\t\t%s\n",(char *)tmp_101);
+    printf("GPS Streaming Enabled: \t\t\t\t%s\n",(char *)tmp_101); /* printf_va_262 */
     if ((int)diagnostic_field.filter_stream_enabled == 1) tmp_102 = "TRUE";
     else tmp_102 = "FALSE";
-    printf_va_263("FILTER Streaming Enabled: \t\t\t\t%s\n",(char *)tmp_102);
-    printf_va_264("Number of Dropped IMU Packets: \t\t\t%u packets\n",
-                  diagnostic_field.imu_dropped_packets);
-    printf_va_265("Number of Dropped GPS Packets: \t\t\t%u packets\n",
-                  diagnostic_field.gps_dropped_packets);
-    printf_va_266("Number of Dropped FILTER Packets: \t\t\t%u packets\n",
-                  diagnostic_field.filter_dropped_packets);
-    printf_va_267("Communications Port Bytes Written: \t\t%u Bytes\n",
-                  diagnostic_field.com1_port_bytes_written);
-    printf_va_268("Communications Port Bytes Read: \t\t%u Bytes\n",
-                  diagnostic_field.com1_port_bytes_read);
-    printf_va_269("Communications Port Write Overruns: \t\t%u Bytes\n",
-                  diagnostic_field.com1_port_write_overruns);
-    printf_va_270("Communications Port Read Overruns: \t\t%u Bytes\n",
-                  diagnostic_field.com1_port_read_overruns);
-    printf_va_271("IMU Parser Errors: \t\t\t\t%u Errors\n",
-                  diagnostic_field.imu_parser_errors);
-    printf_va_272("IMU Message Count: \t\t\t\t%u Messages\n",
-                  diagnostic_field.imu_message_count);
-    printf_va_273("IMU Last Message Received: \t\t\t%u ms\n",
-                  diagnostic_field.imu_last_message_ms);
-    printf_va_274("GPS Parser Errors: \t\t\t\t%u Errors\n",
-                  diagnostic_field.gps_parser_errors);
-    printf_va_275("GPS Message Count: \t\t\t\t%u Messages\n",
-                  diagnostic_field.gps_message_count);
-    printf_va_276("GPS Last Message Received: \t\t\t%u ms\n",
-                  diagnostic_field.gps_last_message_ms);
-    printf_va_277("\n\n");
+    printf("FILTER Streaming Enabled: \t\t\t\t%s\n",(char *)tmp_102); /* printf_va_263 */
+    printf("Number of Dropped IMU Packets: \t\t\t%u packets\n",
+           diagnostic_field.imu_dropped_packets); /* printf_va_264 */
+    printf("Number of Dropped GPS Packets: \t\t\t%u packets\n",
+           diagnostic_field.gps_dropped_packets); /* printf_va_265 */
+    printf("Number of Dropped FILTER Packets: \t\t\t%u packets\n",
+           diagnostic_field.filter_dropped_packets); /* printf_va_266 */
+    printf("Communications Port Bytes Written: \t\t%u Bytes\n",
+           diagnostic_field.com1_port_bytes_written); /* printf_va_267 */
+    printf("Communications Port Bytes Read: \t\t%u Bytes\n",
+           diagnostic_field.com1_port_bytes_read); /* printf_va_268 */
+    printf("Communications Port Write Overruns: \t\t%u Bytes\n",
+           diagnostic_field.com1_port_write_overruns); /* printf_va_269 */
+    printf("Communications Port Read Overruns: \t\t%u Bytes\n",
+           diagnostic_field.com1_port_read_overruns); /* printf_va_270 */
+    printf("IMU Parser Errors: \t\t\t\t%u Errors\n",
+           diagnostic_field.imu_parser_errors); /* printf_va_271 */
+    printf("IMU Message Count: \t\t\t\t%u Messages\n",
+           diagnostic_field.imu_message_count); /* printf_va_272 */
+    printf("IMU Last Message Received: \t\t\t%u ms\n",
+           diagnostic_field.imu_last_message_ms); /* printf_va_273 */
+    printf("GPS Parser Errors: \t\t\t\t%u Errors\n",
+           diagnostic_field.gps_parser_errors); /* printf_va_274 */
+    printf("GPS Message Count: \t\t\t\t%u Messages\n",
+           diagnostic_field.gps_message_count); /* printf_va_275 */
+    printf("GPS Last Message Received: \t\t\t%u ms\n",
+           diagnostic_field.gps_last_message_ms); /* printf_va_276 */
+    printf("\n\n"); /* printf_va_277 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_278("----------------------------------------------------------------------\n");
-    printf_va_279("Resetting the Filter\n");
-    printf_va_280("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_278 */
+    printf("Resetting the Filter\n"); /* printf_va_279 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_280 */
     while (1) {
       u16 tmp_103;
       tmp_103 = mip_filter_reset_filter(& device_interface);
       if (! ((int)tmp_103 != 0)) break;
     }
-    printf_va_281("\n\n");
+    printf("\n\n"); /* printf_va_281 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_282("----------------------------------------------------------------------\n");
-    printf_va_283("Initializing the Filter with Euler angles\n");
-    printf_va_284("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_282 */
+    printf("Initializing the Filter with Euler angles\n"); /* printf_va_283 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_284 */
     angles[2] = (float)0;
     angles[1] = angles[2];
     angles[0] = angles[1];
@@ -14321,41 +14303,41 @@ int main(int argc, char **argv)
       tmp_104 = mip_filter_set_init_attitude(& device_interface,angles);
       if (! ((int)tmp_104 != 0)) break;
     }
-    printf_va_285("\n\n");
+    printf("\n\n"); /* printf_va_285 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_286("----------------------------------------------------------------------\n");
-    printf_va_287("Resetting the Filter\n");
-    printf_va_288("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_286 */
+    printf("Resetting the Filter\n"); /* printf_va_287 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_288 */
     while (1) {
       u16 tmp_105;
       tmp_105 = mip_filter_reset_filter(& device_interface);
       if (! ((int)tmp_105 != 0)) break;
     }
-    printf_va_289("\n\n");
+    printf("\n\n"); /* printf_va_289 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_290("----------------------------------------------------------------------\n");
-    printf_va_291("Initializing the Filter with a heading angle\n");
-    printf_va_292("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_290 */
+    printf("Initializing the Filter with a heading angle\n"); /* printf_va_291 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_292 */
     while (1) {
       u16 tmp_106;
       tmp_106 = mip_filter_set_init_heading(& device_interface,angles[0]);
       if (! ((int)tmp_106 != 0)) break;
     }
-    printf_va_293("\n\n");
+    printf("\n\n"); /* printf_va_293 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_294("----------------------------------------------------------------------\n");
-    printf_va_295("Resetting the Filter\n");
-    printf_va_296("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_294 */
+    printf("Resetting the Filter\n"); /* printf_va_295 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_296 */
     while (1) {
       u16 tmp_107;
       tmp_107 = mip_filter_reset_filter(& device_interface);
       if (! ((int)tmp_107 != 0)) break;
     }
-    printf_va_297("\n\n");
+    printf("\n\n"); /* printf_va_297 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_298("----------------------------------------------------------------------\n");
-    printf_va_299("Cycle through available Vehicle Dynamics Modes\n");
-    printf_va_300("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_298 */
+    printf("Cycle through available Vehicle Dynamics Modes\n"); /* printf_va_299 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_300 */
     i = (short)3;
     while ((int)i >= 1) {
       dynamics_mode = (unsigned char)i;
@@ -14374,25 +14356,24 @@ int main(int argc, char **argv)
                                                    & readback_dynamics_mode);
         if (! ((int)tmp_109 != 0)) break;
       }
-      if ((int)dynamics_mode == (int)readback_dynamics_mode) printf_va_301
-                                                             ("Vehicle dynamics mode successfully set to %d\n",
-                                                              (int)dynamics_mode);
-      else printf_va_302("ERROR: Failed to set vehicle dynamics mode to %d!!!\n",
-                         (int)dynamics_mode);
+      if ((int)dynamics_mode == (int)readback_dynamics_mode) printf("Vehicle dynamics mode successfully set to %d\n",
+                                                                    (int)dynamics_mode); /* printf_va_301 */
+      else printf("ERROR: Failed to set vehicle dynamics mode to %d!!!\n",
+                  (int)dynamics_mode); /* printf_va_302 */
       i = (s16)((int)i - 1);
     }
-    printf_va_303("\nLoading the default vehicle dynamics mode\n\n");
+    printf("\nLoading the default vehicle dynamics mode\n\n"); /* printf_va_303 */
     while (1) {
       u16 tmp_110;
       tmp_110 = mip_filter_vehicle_dynamics_mode(& device_interface,
                                                  (unsigned char)0x05,(u8 *)0);
       if (! ((int)tmp_110 != 0)) break;
     }
-    printf_va_304("\n\n");
+    printf("\n\n"); /* printf_va_304 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_305("----------------------------------------------------------------------\n");
-    printf_va_306("Setting the sensor to vehicle frame transformation\n");
-    printf_va_307("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_305 */
+    printf("Setting the sensor to vehicle frame transformation\n"); /* printf_va_306 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_307 */
     angles[0] = (float)(3.14 / 4.0);
     angles[1] = (float)(3.14 / 8.0);
     angles[2] = (float)(3.14 / 12.0);
@@ -14417,7 +14398,7 @@ int main(int argc, char **argv)
       if ((double)tmp_114 < 0.001) {
         int tmp_115;
         tmp_115 = abs((int)(readback_angles[2] - angles[2]));
-        if ((double)tmp_115 < 0.001) printf_va_308("Transformation successfully set.\n");
+        if ((double)tmp_115 < 0.001) printf("Transformation successfully set.\n"); /* printf_va_308 */
         else goto _LAND_23;
       }
       else goto _LAND_23;
@@ -14425,15 +14406,15 @@ int main(int argc, char **argv)
     else {
       _LAND_23:
       {
-        printf_va_309("ERROR: Failed to set transformation!!!\n");
-        printf_va_310("Sent angles:     %f roll %f pitch %f yaw\n",
-                      (double)angles[0],(double)angles[1],(double)angles[2]);
-        printf_va_311("Returned angles: %f roll %f pitch %f yaw\n",
-                      (double)readback_angles[0],(double)readback_angles[1],
-                      (double)readback_angles[2]);
+        printf("ERROR: Failed to set transformation!!!\n"); /* printf_va_309 */
+        printf("Sent angles:     %f roll %f pitch %f yaw\n",
+               (double)angles[0],(double)angles[1],(double)angles[2]); /* printf_va_310 */
+        printf("Returned angles: %f roll %f pitch %f yaw\n",
+               (double)readback_angles[0],(double)readback_angles[1],
+               (double)readback_angles[2]); /* printf_va_311 */
       }
     }
-    printf_va_312("\n\nLoading the default sensor to vehicle transformation.\n\n");
+    printf("\n\nLoading the default sensor to vehicle transformation.\n\n"); /* printf_va_312 */
     while (1) {
       u16 tmp_116;
       tmp_116 = mip_filter_sensor2vehicle_tranformation(& device_interface,
@@ -14441,11 +14422,11 @@ int main(int argc, char **argv)
                                                         (float *)0);
       if (! ((int)tmp_116 != 0)) break;
     }
-    printf_va_313("\n\n");
+    printf("\n\n"); /* printf_va_313 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_314("----------------------------------------------------------------------\n");
-    printf_va_315("Setting the sensor to vehicle frame offset\n");
-    printf_va_316("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_314 */
+    printf("Setting the sensor to vehicle frame offset\n"); /* printf_va_315 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_316 */
     offset[0] = (float)1.0;
     offset[1] = (float)2.0;
     offset[2] = (float)3.0;
@@ -14469,7 +14450,7 @@ int main(int argc, char **argv)
       if ((double)tmp_120 < 0.001) {
         int tmp_121;
         tmp_121 = abs((int)(readback_offset[2] - offset[2]));
-        if ((double)tmp_121 < 0.001) printf_va_317("Offset successfully set.\n");
+        if ((double)tmp_121 < 0.001) printf("Offset successfully set.\n"); /* printf_va_317 */
         else goto _LAND_25;
       }
       else goto _LAND_25;
@@ -14477,15 +14458,15 @@ int main(int argc, char **argv)
     else {
       _LAND_25:
       {
-        printf_va_318("ERROR: Failed to set offset!!!\n");
-        printf_va_319("Sent offset:     %f X %f Y %f Z\n",(double)offset[0],
-                      (double)offset[1],(double)offset[2]);
-        printf_va_320("Returned offset: %f X %f Y %f Z\n",
-                      (double)readback_offset[0],(double)readback_offset[1],
-                      (double)readback_offset[2]);
+        printf("ERROR: Failed to set offset!!!\n"); /* printf_va_318 */
+        printf("Sent offset:     %f X %f Y %f Z\n",(double)offset[0],
+               (double)offset[1],(double)offset[2]); /* printf_va_319 */
+        printf("Returned offset: %f X %f Y %f Z\n",
+               (double)readback_offset[0],(double)readback_offset[1],
+               (double)readback_offset[2]); /* printf_va_320 */
       }
     }
-    printf_va_321("\n\nLoading the default sensor to vehicle offset.\n\n");
+    printf("\n\nLoading the default sensor to vehicle offset.\n\n"); /* printf_va_321 */
     while (1) {
       u16 tmp_122;
       tmp_122 = mip_filter_sensor2vehicle_offset(& device_interface,
@@ -14493,11 +14474,11 @@ int main(int argc, char **argv)
                                                  (float *)0);
       if (! ((int)tmp_122 != 0)) break;
     }
-    printf_va_322("\n\n");
+    printf("\n\n"); /* printf_va_322 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_323("----------------------------------------------------------------------\n");
-    printf_va_324("Setting the GPS antenna offset\n");
-    printf_va_325("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_323 */
+    printf("Setting the GPS antenna offset\n"); /* printf_va_324 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_325 */
     offset[0] = (float)1.0;
     offset[1] = (float)2.0;
     offset[2] = (float)3.0;
@@ -14521,7 +14502,7 @@ int main(int argc, char **argv)
       if ((double)tmp_126 < 0.001) {
         int tmp_127;
         tmp_127 = abs((int)(readback_offset[2] - offset[2]));
-        if ((double)tmp_127 < 0.001) printf_va_326("Offset successfully set.\n");
+        if ((double)tmp_127 < 0.001) printf("Offset successfully set.\n"); /* printf_va_326 */
         else goto _LAND_27;
       }
       else goto _LAND_27;
@@ -14529,26 +14510,26 @@ int main(int argc, char **argv)
     else {
       _LAND_27:
       {
-        printf_va_327("ERROR: Failed to set offset!!!\n");
-        printf_va_328("Sent offset:     %f X %f Y %f Z\n",(double)offset[0],
-                      (double)offset[1],(double)offset[2]);
-        printf_va_329("Returned offset: %f X %f Y %f Z\n",
-                      (double)readback_offset[0],(double)readback_offset[1],
-                      (double)readback_offset[2]);
+        printf("ERROR: Failed to set offset!!!\n"); /* printf_va_327 */
+        printf("Sent offset:     %f X %f Y %f Z\n",(double)offset[0],
+               (double)offset[1],(double)offset[2]); /* printf_va_328 */
+        printf("Returned offset: %f X %f Y %f Z\n",
+               (double)readback_offset[0],(double)readback_offset[1],
+               (double)readback_offset[2]); /* printf_va_329 */
       }
     }
-    printf_va_330("\n\nLoading the default antenna offset.\n\n");
+    printf("\n\nLoading the default antenna offset.\n\n"); /* printf_va_330 */
     while (1) {
       u16 tmp_128;
       tmp_128 = mip_filter_antenna_offset(& device_interface,
                                           (unsigned char)0x05,(float *)0);
       if (! ((int)tmp_128 != 0)) break;
     }
-    printf_va_331("\n\n");
+    printf("\n\n"); /* printf_va_331 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_332("----------------------------------------------------------------------\n");
-    printf_va_333("Cycling through Estimation Control Flags\n");
-    printf_va_334("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_332 */
+    printf("Cycling through Estimation Control Flags\n"); /* printf_va_333 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_334 */
     j = (unsigned short)0;
     while ((int)j < 0x0020) {
       estimation_control = (unsigned short)(0xFFFF & ~ ((int)j));
@@ -14567,21 +14548,21 @@ int main(int argc, char **argv)
         if (! ((int)tmp_130 != 0)) break;
       }
       if ((int)estimation_control != (int)estimation_control_readback) {
-        printf_va_335("ERROR:\n");
+        printf("ERROR:\n"); /* printf_va_335 */
         if (((int)estimation_control_readback & 0x0001) != 0) 
-          if (((int)estimation_control & 0x0001) == 0) printf_va_336("Gyroscope Bias Estimation NOT DISABLED\n");
+          if (((int)estimation_control & 0x0001) == 0) printf("Gyroscope Bias Estimation NOT DISABLED\n"); /* printf_va_336 */
         if (((int)estimation_control_readback & 0x0002) != 0) 
-          if (((int)estimation_control & 0x0002) == 0) printf_va_337("Accelerometer Bias Estimation NOT DISABLED\n");
+          if (((int)estimation_control & 0x0002) == 0) printf("Accelerometer Bias Estimation NOT DISABLED\n"); /* printf_va_337 */
         if (((int)estimation_control_readback & 0x0004) != 0) 
-          if (((int)estimation_control & 0x0004) == 0) printf_va_338("Gyroscope Scale Factor Estimation NOT DISABLED\n");
+          if (((int)estimation_control & 0x0004) == 0) printf("Gyroscope Scale Factor Estimation NOT DISABLED\n"); /* printf_va_338 */
         if (((int)estimation_control_readback & 0x0008) != 0) 
-          if (((int)estimation_control & 0x0008) == 0) printf_va_339("Accelerometer Scale Factor Estimation NOT DISABLED\n");
+          if (((int)estimation_control & 0x0008) == 0) printf("Accelerometer Scale Factor Estimation NOT DISABLED\n"); /* printf_va_339 */
         if (((int)estimation_control_readback & 0x0010) != 0) 
-          if (((int)estimation_control & 0x0010) == 0) printf_va_340("GPS Antenna Offset Estimation NOT DISABLED\n");
+          if (((int)estimation_control & 0x0010) == 0) printf("GPS Antenna Offset Estimation NOT DISABLED\n"); /* printf_va_340 */
       }
       j = (u16)((int)j + 1);
     }
-    printf_va_341("\n\nResetting Estimation Control Flags to default state.\n\n");
+    printf("\n\nResetting Estimation Control Flags to default state.\n\n"); /* printf_va_341 */
     while (1) {
       u16 tmp_131;
       tmp_131 = mip_filter_estimation_control(& device_interface,
@@ -14589,11 +14570,11 @@ int main(int argc, char **argv)
                                               & estimation_control);
       if (! ((int)tmp_131 != 0)) break;
     }
-    printf_va_342("\n\n");
+    printf("\n\n"); /* printf_va_342 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_343("----------------------------------------------------------------------\n");
-    printf_va_344("Cycle through available GPS sources\n");
-    printf_va_345("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_343 */
+    printf("Cycle through available GPS sources\n"); /* printf_va_344 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_345 */
     i = (short)2;
     while ((int)i >= 1) {
       gps_source = (unsigned char)i;
@@ -14609,23 +14590,23 @@ int main(int argc, char **argv)
                                         (unsigned char)0x02,& gps_source);
         if (! ((int)tmp_133 != 0)) break;
       }
-      if ((int)gps_source == (int)i) printf_va_346("GPS source successfully set to %d\n",
-                                                   (int)i);
-      else printf_va_347("ERROR: Failed to set GPS source to %d!!!\n",(int)i);
+      if ((int)gps_source == (int)i) printf("GPS source successfully set to %d\n",
+                                            (int)i); /* printf_va_346 */
+      else printf("ERROR: Failed to set GPS source to %d!!!\n",(int)i); /* printf_va_347 */
       i = (s16)((int)i - 1);
     }
-    printf_va_348("\n\nLoading the default gps source.\n\n");
+    printf("\n\nLoading the default gps source.\n\n"); /* printf_va_348 */
     while (1) {
       u16 tmp_134;
       tmp_134 = mip_filter_gps_source(& device_interface,(unsigned char)0x05,
                                       (u8 *)0);
       if (! ((int)tmp_134 != 0)) break;
     }
-    printf_va_349("\n\n");
+    printf("\n\n"); /* printf_va_349 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_350("----------------------------------------------------------------------\n");
-    printf_va_351("Performing External GPS Update with externally supplied GPS information\n");
-    printf_va_352("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_350 */
+    printf("Performing External GPS Update with externally supplied GPS information\n"); /* printf_va_351 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_352 */
     gps_source = (unsigned char)0x2;
     while (1) {
       u16 tmp_135;
@@ -14660,11 +14641,11 @@ int main(int argc, char **argv)
                                       & gps_source);
       if (! ((int)tmp_137 != 0)) break;
     }
-    printf_va_353("\n\n");
+    printf("\n\n"); /* printf_va_353 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_354("----------------------------------------------------------------------\n");
-    printf_va_355("Performing External Heading Update with externally supplied heading information\n");
-    printf_va_356("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_354 */
+    printf("Performing External Heading Update with externally supplied heading information\n"); /* printf_va_355 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_356 */
     heading_source = (unsigned char)0x3;
     while (1) {
       u16 tmp_138;
@@ -14689,11 +14670,11 @@ int main(int argc, char **argv)
                                           & heading_source);
       if (! ((int)tmp_140 != 0)) break;
     }
-    printf_va_357("\n\n");
+    printf("\n\n"); /* printf_va_357 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_358("----------------------------------------------------------------------\n");
-    printf_va_359("Cycle through available Heading sources\n");
-    printf_va_360("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_358 */
+    printf("Cycle through available Heading sources\n"); /* printf_va_359 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_360 */
     i = (short)3;
     while ((int)i >= 0) {
       heading_source = (unsigned char)i;
@@ -14706,24 +14687,23 @@ int main(int argc, char **argv)
                                             & heading_source);
         if (! ((int)tmp_141 != 0)) break;
       }
-      if ((int)heading_source == (int)i) printf_va_361("Heading source successfully set to %d\n",
-                                                       (int)i);
-      else printf_va_362("ERROR: Failed to set heading source to %d!!!\n",
-                         (int)i);
+      if ((int)heading_source == (int)i) printf("Heading source successfully set to %d\n",
+                                                (int)i); /* printf_va_361 */
+      else printf("ERROR: Failed to set heading source to %d!!!\n",(int)i); /* printf_va_362 */
       i = (s16)((int)i - 1);
     }
-    printf_va_363("\n\nLoading the default heading source.\n\n");
+    printf("\n\nLoading the default heading source.\n\n"); /* printf_va_363 */
     while (1) {
       u16 tmp_142;
       tmp_142 = mip_filter_heading_source(& device_interface,
                                           (unsigned char)0x05,(u8 *)0);
       if (! ((int)tmp_142 != 0)) break;
     }
-    printf_va_364("\n\n");
+    printf("\n\n"); /* printf_va_364 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_365("----------------------------------------------------------------------\n");
-    printf_va_366("Cycle through available auto-init values\n");
-    printf_va_367("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_365 */
+    printf("Cycle through available auto-init values\n"); /* printf_va_366 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_367 */
     i = (short)1;
     while ((int)i >= 0) {
       auto_init = (unsigned char)i;
@@ -14741,23 +14721,23 @@ int main(int argc, char **argv)
                                                  & auto_init);
         if (! ((int)tmp_144 != 0)) break;
       }
-      if ((int)auto_init == (int)i) printf_va_368("Auto-init successfully set to %d\n",
-                                                  (int)i);
-      else printf_va_369("ERROR: Failed to set auto-init to %d!!!\n",(int)i);
+      if ((int)auto_init == (int)i) printf("Auto-init successfully set to %d\n",
+                                           (int)i); /* printf_va_368 */
+      else printf("ERROR: Failed to set auto-init to %d!!!\n",(int)i); /* printf_va_369 */
       i = (s16)((int)i - 1);
     }
-    printf_va_370("\n\nLoading the default auto-init value.\n\n");
+    printf("\n\nLoading the default auto-init value.\n\n"); /* printf_va_370 */
     while (1) {
       u16 tmp_145;
       tmp_145 = mip_filter_auto_initialization(& device_interface,
                                                (unsigned char)0x05,(u8 *)0);
       if (! ((int)tmp_145 != 0)) break;
     }
-    printf_va_371("\n\n");
+    printf("\n\n"); /* printf_va_371 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_372("----------------------------------------------------------------------\n");
-    printf_va_373("Setting the accel noise values\n");
-    printf_va_374("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_372 */
+    printf("Setting the accel noise values\n"); /* printf_va_373 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_374 */
     noise[0] = (float)0.1;
     noise[1] = (float)0.2;
     noise[2] = (float)0.3;
@@ -14780,7 +14760,7 @@ int main(int argc, char **argv)
       if ((double)tmp_149 < 0.001) {
         int tmp_150;
         tmp_150 = abs((int)(readback_noise[2] - noise[2]));
-        if ((double)tmp_150 < 0.001) printf_va_375("Accel noise values successfully set.\n");
+        if ((double)tmp_150 < 0.001) printf("Accel noise values successfully set.\n"); /* printf_va_375 */
         else goto _LAND_29;
       }
       else goto _LAND_29;
@@ -14788,26 +14768,25 @@ int main(int argc, char **argv)
     else {
       _LAND_29:
       {
-        printf_va_376("ERROR: Failed to set accel noise values!!!\n");
-        printf_va_377("Sent values:     %f X %f Y %f Z\n",(double)noise[0],
-                      (double)noise[1],(double)noise[2]);
-        printf_va_378("Returned values: %f X %f Y %f Z\n",
-                      (double)readback_noise[0],(double)readback_noise[1],
-                      (double)readback_noise[2]);
+        printf("ERROR: Failed to set accel noise values!!!\n"); /* printf_va_376 */
+        printf("Sent values:     %f X %f Y %f Z\n",(double)noise[0],
+               (double)noise[1],(double)noise[2]); /* printf_va_377 */
+        printf("Returned values: %f X %f Y %f Z\n",(double)readback_noise[0],
+               (double)readback_noise[1],(double)readback_noise[2]); /* printf_va_378 */
       }
     }
-    printf_va_379("\n\nLoading the default accel noise values.\n\n");
+    printf("\n\nLoading the default accel noise values.\n\n"); /* printf_va_379 */
     while (1) {
       u16 tmp_151;
       tmp_151 = mip_filter_accel_noise(& device_interface,
                                        (unsigned char)0x05,(float *)0);
       if (! ((int)tmp_151 != 0)) break;
     }
-    printf_va_380("\n\n");
+    printf("\n\n"); /* printf_va_380 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_381("----------------------------------------------------------------------\n");
-    printf_va_382("Setting the gyro noise values\n");
-    printf_va_383("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_381 */
+    printf("Setting the gyro noise values\n"); /* printf_va_382 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_383 */
     noise[0] = (float)0.1;
     noise[1] = (float)0.2;
     noise[2] = (float)0.3;
@@ -14830,7 +14809,7 @@ int main(int argc, char **argv)
       if ((double)tmp_155 < 0.001) {
         int tmp_156;
         tmp_156 = abs((int)(readback_noise[2] - noise[2]));
-        if ((double)tmp_156 < 0.001) printf_va_384("Gyro noise values successfully set.\n");
+        if ((double)tmp_156 < 0.001) printf("Gyro noise values successfully set.\n"); /* printf_va_384 */
         else goto _LAND_31;
       }
       else goto _LAND_31;
@@ -14838,26 +14817,25 @@ int main(int argc, char **argv)
     else {
       _LAND_31:
       {
-        printf_va_385("ERROR: Failed to set gyro noise values!!!\n");
-        printf_va_386("Sent values:     %f X %f Y %f Z\n",(double)noise[0],
-                      (double)noise[1],(double)noise[2]);
-        printf_va_387("Returned values: %f X %f Y %f Z\n",
-                      (double)readback_noise[0],(double)readback_noise[1],
-                      (double)readback_noise[2]);
+        printf("ERROR: Failed to set gyro noise values!!!\n"); /* printf_va_385 */
+        printf("Sent values:     %f X %f Y %f Z\n",(double)noise[0],
+               (double)noise[1],(double)noise[2]); /* printf_va_386 */
+        printf("Returned values: %f X %f Y %f Z\n",(double)readback_noise[0],
+               (double)readback_noise[1],(double)readback_noise[2]); /* printf_va_387 */
       }
     }
-    printf_va_388("\n\nLoading the default gyro noise values.\n\n");
+    printf("\n\nLoading the default gyro noise values.\n\n"); /* printf_va_388 */
     while (1) {
       u16 tmp_157;
       tmp_157 = mip_filter_gyro_noise(& device_interface,(unsigned char)0x05,
                                       (float *)0);
       if (! ((int)tmp_157 != 0)) break;
     }
-    printf_va_389("\n\n");
+    printf("\n\n"); /* printf_va_389 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_390("----------------------------------------------------------------------\n");
-    printf_va_391("Setting the mag noise values\n");
-    printf_va_392("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_390 */
+    printf("Setting the mag noise values\n"); /* printf_va_391 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_392 */
     noise[0] = (float)0.1;
     noise[1] = (float)0.2;
     noise[2] = (float)0.3;
@@ -14880,7 +14858,7 @@ int main(int argc, char **argv)
       if ((double)tmp_161 < 0.001) {
         int tmp_162;
         tmp_162 = abs((int)(readback_noise[2] - noise[2]));
-        if ((double)tmp_162 < 0.001) printf_va_393("Mag noise values successfully set.\n");
+        if ((double)tmp_162 < 0.001) printf("Mag noise values successfully set.\n"); /* printf_va_393 */
         else goto _LAND_33;
       }
       else goto _LAND_33;
@@ -14888,26 +14866,25 @@ int main(int argc, char **argv)
     else {
       _LAND_33:
       {
-        printf_va_394("ERROR: Failed to set mag noise values!!!\n");
-        printf_va_395("Sent values:     %f X %f Y %f Z\n",(double)noise[0],
-                      (double)noise[1],(double)noise[2]);
-        printf_va_396("Returned values: %f X %f Y %f Z\n",
-                      (double)readback_noise[0],(double)readback_noise[1],
-                      (double)readback_noise[2]);
+        printf("ERROR: Failed to set mag noise values!!!\n"); /* printf_va_394 */
+        printf("Sent values:     %f X %f Y %f Z\n",(double)noise[0],
+               (double)noise[1],(double)noise[2]); /* printf_va_395 */
+        printf("Returned values: %f X %f Y %f Z\n",(double)readback_noise[0],
+               (double)readback_noise[1],(double)readback_noise[2]); /* printf_va_396 */
       }
     }
-    printf_va_397("\n\nLoading the default mag noise values.\n\n");
+    printf("\n\nLoading the default mag noise values.\n\n"); /* printf_va_397 */
     while (1) {
       u16 tmp_163;
       tmp_163 = mip_filter_mag_noise(& device_interface,(unsigned char)0x05,
                                      (float *)0);
       if (! ((int)tmp_163 != 0)) break;
     }
-    printf_va_398("\n\n");
+    printf("\n\n"); /* printf_va_398 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_399("----------------------------------------------------------------------\n");
-    printf_va_400("Setting the accel bias model values\n");
-    printf_va_401("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_399 */
+    printf("Setting the accel bias model values\n"); /* printf_va_400 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_401 */
     noise[0] = (float)0.1;
     noise[1] = (float)0.2;
     noise[2] = (float)0.3;
@@ -14943,7 +14920,7 @@ int main(int argc, char **argv)
             if ((double)tmp_170 < 0.001) {
               int tmp_171;
               tmp_171 = abs((int)(readback_beta[2] - beta[2]));
-              if ((double)tmp_171 < 0.001) printf_va_402("Accel bias model values successfully set.\n");
+              if ((double)tmp_171 < 0.001) printf("Accel bias model values successfully set.\n"); /* printf_va_402 */
               else goto _LAND_38;
             }
             else goto _LAND_38;
@@ -14957,17 +14934,17 @@ int main(int argc, char **argv)
     else {
       _LAND_38:
       {
-        printf_va_403("ERROR: Failed to set accel bias model values!!!\n");
-        printf_va_404("Sent values:     Beta: %f X %f Y %f Z, White Noise: %f X %f Y %f Z\n",
-                      (double)beta[0],(double)beta[1],(double)beta[2],
-                      (double)noise[0],(double)noise[1],(double)noise[2]);
-        printf_va_405("Returned values:  Beta: %f X %f Y %f Z, White Noise: %f X %f Y %f Z\n",
-                      (double)readback_beta[0],(double)readback_beta[1],
-                      (double)readback_beta[2],(double)readback_noise[0],
-                      (double)readback_noise[1],(double)readback_noise[2]);
+        printf("ERROR: Failed to set accel bias model values!!!\n"); /* printf_va_403 */
+        printf("Sent values:     Beta: %f X %f Y %f Z, White Noise: %f X %f Y %f Z\n",
+               (double)beta[0],(double)beta[1],(double)beta[2],
+               (double)noise[0],(double)noise[1],(double)noise[2]); /* printf_va_404 */
+        printf("Returned values:  Beta: %f X %f Y %f Z, White Noise: %f X %f Y %f Z\n",
+               (double)readback_beta[0],(double)readback_beta[1],
+               (double)readback_beta[2],(double)readback_noise[0],
+               (double)readback_noise[1],(double)readback_noise[2]); /* printf_va_405 */
       }
     }
-    printf_va_406("\n\nLoading the default accel bias model values.\n\n");
+    printf("\n\nLoading the default accel bias model values.\n\n"); /* printf_va_406 */
     while (1) {
       u16 tmp_172;
       tmp_172 = mip_filter_accel_bias_model(& device_interface,
@@ -14975,11 +14952,11 @@ int main(int argc, char **argv)
                                             (float *)0);
       if (! ((int)tmp_172 != 0)) break;
     }
-    printf_va_407("\n\n");
+    printf("\n\n"); /* printf_va_407 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_408("----------------------------------------------------------------------\n");
-    printf_va_409("Setting the gyro bias model values\n");
-    printf_va_410("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_408 */
+    printf("Setting the gyro bias model values\n"); /* printf_va_409 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_410 */
     noise[0] = (float)0.1;
     noise[1] = (float)0.2;
     noise[2] = (float)0.3;
@@ -15015,7 +14992,7 @@ int main(int argc, char **argv)
             if ((double)tmp_179 < 0.001) {
               int tmp_180;
               tmp_180 = abs((int)(readback_beta[2] - beta[2]));
-              if ((double)tmp_180 < 0.001) printf_va_411("Gyro bias model values successfully set.\n");
+              if ((double)tmp_180 < 0.001) printf("Gyro bias model values successfully set.\n"); /* printf_va_411 */
               else goto _LAND_43;
             }
             else goto _LAND_43;
@@ -15029,17 +15006,17 @@ int main(int argc, char **argv)
     else {
       _LAND_43:
       {
-        printf_va_412("ERROR: Failed to set gyro bias model values!!!\n");
-        printf_va_413("Sent values:     Beta: %f X %f Y %f Z, White Noise: %f X %f Y %f Z\n",
-                      (double)beta[0],(double)beta[1],(double)beta[2],
-                      (double)noise[0],(double)noise[1],(double)noise[2]);
-        printf_va_414("Returned values:  Beta: %f X %f Y %f Z, White Noise: %f X %f Y %f Z\n",
-                      (double)readback_beta[0],(double)readback_beta[1],
-                      (double)readback_beta[2],(double)readback_noise[0],
-                      (double)readback_noise[1],(double)readback_noise[2]);
+        printf("ERROR: Failed to set gyro bias model values!!!\n"); /* printf_va_412 */
+        printf("Sent values:     Beta: %f X %f Y %f Z, White Noise: %f X %f Y %f Z\n",
+               (double)beta[0],(double)beta[1],(double)beta[2],
+               (double)noise[0],(double)noise[1],(double)noise[2]); /* printf_va_413 */
+        printf("Returned values:  Beta: %f X %f Y %f Z, White Noise: %f X %f Y %f Z\n",
+               (double)readback_beta[0],(double)readback_beta[1],
+               (double)readback_beta[2],(double)readback_noise[0],
+               (double)readback_noise[1],(double)readback_noise[2]); /* printf_va_414 */
       }
     }
-    printf_va_415("\n\nLoading the default gyro bias model values.\n\n");
+    printf("\n\nLoading the default gyro bias model values.\n\n"); /* printf_va_415 */
     while (1) {
       u16 tmp_181;
       tmp_181 = mip_filter_gyro_bias_model(& device_interface,
@@ -15047,11 +15024,11 @@ int main(int argc, char **argv)
                                            (float *)0);
       if (! ((int)tmp_181 != 0)) break;
     }
-    printf_va_416("\n\n");
+    printf("\n\n"); /* printf_va_416 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_417("----------------------------------------------------------------------\n");
-    printf_va_418("Setting Zero Velocity-Update threshold\n");
-    printf_va_419("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_417 */
+    printf("Setting Zero Velocity-Update threshold\n"); /* printf_va_418 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_419 */
     zero_update_control.threshold = (float)0.1;
     zero_update_control.enable = (unsigned char)1;
     while (1) {
@@ -15069,11 +15046,11 @@ int main(int argc, char **argv)
       if (! ((int)tmp_183 != 0)) break;
     }
     if ((int)zero_update_control.enable != (int)zero_update_readback.enable) 
-      printf_va_420("ERROR configuring Zero Velocity Update.\n");
+      printf("ERROR configuring Zero Velocity Update.\n"); /* printf_va_420 */
     else 
       if (zero_update_control.threshold != zero_update_readback.threshold) 
-        printf_va_421("ERROR configuring Zero Velocity Update.\n");
-    printf_va_422("\n\nResetting Zero Velocity Update Control to default parameters.\n\n");
+        printf("ERROR configuring Zero Velocity Update.\n"); /* printf_va_421 */
+    printf("\n\nResetting Zero Velocity Update Control to default parameters.\n\n"); /* printf_va_422 */
     while (1) {
       u16 tmp_184;
       tmp_184 = mip_filter_zero_velocity_update_control(& device_interface,
@@ -15081,11 +15058,11 @@ int main(int argc, char **argv)
                                                         (mip_filter_zero_update_command *)0);
       if (! ((int)tmp_184 != 0)) break;
     }
-    printf_va_423("\n\n");
+    printf("\n\n"); /* printf_va_423 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_424("----------------------------------------------------------------------\n");
-    printf_va_425("Applying External Heading Update with Timestamp\n");
-    printf_va_426("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_424 */
+    printf("Applying External Heading Update with Timestamp\n"); /* printf_va_425 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_426 */
     heading_source = (unsigned char)0x3;
     while (1) {
       u16 tmp_185;
@@ -15105,18 +15082,18 @@ int main(int argc, char **argv)
                                                              & external_heading_with_time);
       if (! ((int)tmp_186 != 0)) break;
     }
-    printf_va_427("\n\nResetting default heading update.\n\n");
+    printf("\n\nResetting default heading update.\n\n"); /* printf_va_427 */
     while (1) {
       u16 tmp_187;
       tmp_187 = mip_filter_heading_source(& device_interface,
                                           (unsigned char)0x05,(u8 *)0);
       if (! ((int)tmp_187 != 0)) break;
     }
-    printf_va_428("\n\n");
+    printf("\n\n"); /* printf_va_428 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_429("----------------------------------------------------------------------\n");
-    printf_va_430("Setting Zero Angular-Rate-Update threshold\n");
-    printf_va_431("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_429 */
+    printf("Setting Zero Angular-Rate-Update threshold\n"); /* printf_va_430 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_431 */
     zero_update_control.threshold = (float)0.05;
     zero_update_control.enable = (unsigned char)1;
     while (1) {
@@ -15134,11 +15111,11 @@ int main(int argc, char **argv)
       if (! ((int)tmp_189 != 0)) break;
     }
     if ((int)zero_update_control.enable != (int)zero_update_readback.enable) 
-      printf_va_432("ERROR configuring Zero Angular Rate Update.\n");
+      printf("ERROR configuring Zero Angular Rate Update.\n"); /* printf_va_432 */
     else 
       if (zero_update_control.threshold != zero_update_readback.threshold) 
-        printf_va_433("ERROR configuring Zero Angular Rate Update.\n");
-    printf_va_434("\n\nResetting Zero Angular Rate Update Control to default parameters.\n\n");
+        printf("ERROR configuring Zero Angular Rate Update.\n"); /* printf_va_433 */
+    printf("\n\nResetting Zero Angular Rate Update Control to default parameters.\n\n"); /* printf_va_434 */
     while (1) {
       u16 tmp_190;
       tmp_190 = mip_filter_zero_angular_rate_update_control(& device_interface,
@@ -15146,13 +15123,13 @@ int main(int argc, char **argv)
                                                             (mip_filter_zero_update_command *)0);
       if (! ((int)tmp_190 != 0)) break;
     }
-    printf_va_435("\n\n");
+    printf("\n\n"); /* printf_va_435 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_436("----------------------------------------------------------------------\n");
-    printf_va_437("Performing Tare Orientation Command\n");
-    printf_va_438("(This will only pass if the internal GPS solution is valid)\n");
-    printf_va_439("----------------------------------------------------------------------\n\n");
-    printf_va_440("Re-initializing filter (required for tare)\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_436 */
+    printf("Performing Tare Orientation Command\n"); /* printf_va_437 */
+    printf("(This will only pass if the internal GPS solution is valid)\n"); /* printf_va_438 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_439 */
+    printf("Re-initializing filter (required for tare)\n\n"); /* printf_va_440 */
     angles[2] = (float)0;
     angles[1] = angles[2];
     angles[0] = angles[1];
@@ -15170,24 +15147,24 @@ int main(int argc, char **argv)
                                               (unsigned char)0x01,
                                               (unsigned char)i);
         if ((int)tmp_192 != 0) {
-          printf_va_441("ERROR: Failed Axis - ");
-          if ((int)i & 0x01) printf_va_442(" Roll Axis ");
-          if ((int)i & 0x02) printf_va_443(" Pitch Axis ");
-          if ((int)i & 0x04) printf_va_444(" Yaw Axis ");
+          printf("ERROR: Failed Axis - "); /* printf_va_441 */
+          if ((int)i & 0x01) printf(" Roll Axis "); /* printf_va_442 */
+          if ((int)i & 0x02) printf(" Pitch Axis "); /* printf_va_443 */
+          if ((int)i & 0x04) printf(" Yaw Axis "); /* printf_va_444 */
         }
         else {
-          printf_va_445("Tare Configuration = %d\n",(int)i);
-          printf_va_446("Tared -");
-          if ((int)i & 0x01) printf_va_447(" Roll Axis ");
-          if ((int)i & 0x02) printf_va_448(" Pitch Axis ");
-          if ((int)i & 0x04) printf_va_449(" Yaw Axis ");
-          printf_va_450("\n\n");
+          printf("Tare Configuration = %d\n",(int)i); /* printf_va_445 */
+          printf("Tared -"); /* printf_va_446 */
+          if ((int)i & 0x01) printf(" Roll Axis "); /* printf_va_447 */
+          if ((int)i & 0x02) printf(" Pitch Axis "); /* printf_va_448 */
+          if ((int)i & 0x04) printf(" Yaw Axis "); /* printf_va_449 */
+          printf("\n\n"); /* printf_va_450 */
         }
         usleep((unsigned int)((double)1000 * 1000.0));
       }
       i = (s16)((int)i + 1);
     }
-    printf_va_451("\n\nRestoring Orientation to default value.\n\n");
+    printf("\n\nRestoring Orientation to default value.\n\n"); /* printf_va_451 */
     while (1) {
       u16 tmp_193;
       tmp_193 = mip_filter_tare_orientation(& device_interface,
@@ -15195,31 +15172,31 @@ int main(int argc, char **argv)
                                             (unsigned char)0);
       if (! ((int)tmp_193 != 0)) break;
     }
-    printf_va_452("\n\n");
+    printf("\n\n"); /* printf_va_452 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_453("----------------------------------------------------------------------\n");
-    printf_va_454("Performing Commanded Zero-Velocity Update\n");
-    printf_va_455("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_453 */
+    printf("Performing Commanded Zero-Velocity Update\n"); /* printf_va_454 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_455 */
     while (1) {
       u16 tmp_194;
       tmp_194 = mip_filter_commanded_zero_velocity_update(& device_interface);
       if (! ((int)tmp_194 != 0)) break;
     }
-    printf_va_456("\n\n");
+    printf("\n\n"); /* printf_va_456 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_457("----------------------------------------------------------------------\n");
-    printf_va_458("Performing Commanded Zero-Angular-Rate Update\n");
-    printf_va_459("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_457 */
+    printf("Performing Commanded Zero-Angular-Rate Update\n"); /* printf_va_458 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_459 */
     while (1) {
       u16 tmp_195;
       tmp_195 = mip_filter_commanded_zero_angular_rate_update(& device_interface);
       if (! ((int)tmp_195 != 0)) break;
     }
-    printf_va_460("\n\n");
+    printf("\n\n"); /* printf_va_460 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_461("----------------------------------------------------------------------\n");
-    printf_va_462("Cycle through available declination sources\n");
-    printf_va_463("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_461 */
+    printf("Cycle through available declination sources\n"); /* printf_va_462 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_463 */
     i = (short)3;
     while ((int)i >= 1) {
       declination_source_command = (unsigned char)i;
@@ -15238,23 +15215,23 @@ int main(int argc, char **argv)
         if (! ((int)tmp_197 != 0)) break;
       }
       if ((int)declination_source_command == (int)declination_source_readback) 
-        printf_va_464("Declination source successfully set to %d\n",(int)i);
-      else printf_va_465("ERROR: Failed to set the declination source to %d!!!\n",
-                         (int)i);
+        printf("Declination source successfully set to %d\n",(int)i); /* printf_va_464 */
+      else printf("ERROR: Failed to set the declination source to %d!!!\n",
+                  (int)i); /* printf_va_465 */
       i = (s16)((int)i - 1);
     }
-    printf_va_466("\n\nLoading the default declination source.\n\n");
+    printf("\n\nLoading the default declination source.\n\n"); /* printf_va_466 */
     while (1) {
       u16 tmp_198;
       tmp_198 = mip_filter_declination_source(& device_interface,
                                               (unsigned char)0x05,(u8 *)0);
       if (! ((int)tmp_198 != 0)) break;
     }
-    printf_va_467("\n\n");
+    printf("\n\n"); /* printf_va_467 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_468("----------------------------------------------------------------------\n");
-    printf_va_469("Setting the accel magnitude error adaptive measurement values\n");
-    printf_va_470("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_468 */
+    printf("Setting the accel magnitude error adaptive measurement values\n"); /* printf_va_469 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_470 */
     accel_magnitude_error_command.enable = (unsigned char)0;
     accel_magnitude_error_command.low_pass_cutoff = (float)10;
     accel_magnitude_error_command.min_1sigma = (float)2.0;
@@ -15294,7 +15271,7 @@ int main(int argc, char **argv)
               if ((double)tmp_205 < 0.001) {
                 int tmp_206;
                 tmp_206 = abs((int)(accel_magnitude_error_command.high_limit_1sigma - accel_magnitude_error_readback.high_limit_1sigma));
-                if ((double)tmp_206 < 0.001) printf_va_471("accel magnitude error adaptive measurement values successfully set.\n");
+                if ((double)tmp_206 < 0.001) printf("accel magnitude error adaptive measurement values successfully set.\n"); /* printf_va_471 */
                 else goto _LAND_49;
               }
               else goto _LAND_49;
@@ -15310,26 +15287,26 @@ int main(int argc, char **argv)
     else {
       _LAND_49:
       {
-        printf_va_472("ERROR: Failed to set accel magnitude error adaptive measurement values!!!\n");
-        printf_va_473("Sent values:     Enable: %i, Parameters: %f %f %f %f %f %f\n",
-                      (int)accel_magnitude_error_command.enable,
-                      (double)accel_magnitude_error_command.low_pass_cutoff,
-                      (double)accel_magnitude_error_command.min_1sigma,
-                      (double)accel_magnitude_error_command.low_limit,
-                      (double)accel_magnitude_error_command.high_limit,
-                      (double)accel_magnitude_error_command.low_limit_1sigma,
-                      (double)accel_magnitude_error_command.high_limit_1sigma);
-        printf_va_474("Returned values: Enable: %i, Parameters: %f %f %f %f %f %f\n",
-                      (int)accel_magnitude_error_readback.enable,
-                      (double)accel_magnitude_error_readback.low_pass_cutoff,
-                      (double)accel_magnitude_error_readback.min_1sigma,
-                      (double)accel_magnitude_error_readback.low_limit,
-                      (double)accel_magnitude_error_readback.high_limit,
-                      (double)accel_magnitude_error_readback.low_limit_1sigma,
-                      (double)accel_magnitude_error_readback.high_limit_1sigma);
+        printf("ERROR: Failed to set accel magnitude error adaptive measurement values!!!\n"); /* printf_va_472 */
+        printf("Sent values:     Enable: %i, Parameters: %f %f %f %f %f %f\n",
+               (int)accel_magnitude_error_command.enable,
+               (double)accel_magnitude_error_command.low_pass_cutoff,
+               (double)accel_magnitude_error_command.min_1sigma,
+               (double)accel_magnitude_error_command.low_limit,
+               (double)accel_magnitude_error_command.high_limit,
+               (double)accel_magnitude_error_command.low_limit_1sigma,
+               (double)accel_magnitude_error_command.high_limit_1sigma); /* printf_va_473 */
+        printf("Returned values: Enable: %i, Parameters: %f %f %f %f %f %f\n",
+               (int)accel_magnitude_error_readback.enable,
+               (double)accel_magnitude_error_readback.low_pass_cutoff,
+               (double)accel_magnitude_error_readback.min_1sigma,
+               (double)accel_magnitude_error_readback.low_limit,
+               (double)accel_magnitude_error_readback.high_limit,
+               (double)accel_magnitude_error_readback.low_limit_1sigma,
+               (double)accel_magnitude_error_readback.high_limit_1sigma); /* printf_va_474 */
       }
     }
-    printf_va_475("\n\nLoading the default accel magnitude error adaptive measurement values.\n\n");
+    printf("\n\nLoading the default accel magnitude error adaptive measurement values.\n\n"); /* printf_va_475 */
     while (1) {
       u16 tmp_207;
       tmp_207 = mip_filter_accel_magnitude_error_adaptive_measurement
@@ -15337,11 +15314,11 @@ int main(int argc, char **argv)
        (mip_filter_accel_magnitude_error_adaptive_measurement_command *)0);
       if (! ((int)tmp_207 != 0)) break;
     }
-    printf_va_476("\n\n");
+    printf("\n\n"); /* printf_va_476 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_477("----------------------------------------------------------------------\n");
-    printf_va_478("Setting the mag magnitude error adaptive measurement values\n");
-    printf_va_479("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_477 */
+    printf("Setting the mag magnitude error adaptive measurement values\n"); /* printf_va_478 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_479 */
     mag_magnitude_error_command.enable = (unsigned char)0;
     mag_magnitude_error_command.low_pass_cutoff = (float)10;
     mag_magnitude_error_command.min_1sigma = (float)0.1;
@@ -15381,7 +15358,7 @@ int main(int argc, char **argv)
               if ((double)tmp_214 < 0.001) {
                 int tmp_215;
                 tmp_215 = abs((int)(mag_magnitude_error_command.high_limit_1sigma - mag_magnitude_error_readback.high_limit_1sigma));
-                if ((double)tmp_215 < 0.001) printf_va_480("mag magnitude error adaptive measurement values successfully set.\n");
+                if ((double)tmp_215 < 0.001) printf("mag magnitude error adaptive measurement values successfully set.\n"); /* printf_va_480 */
                 else goto _LAND_55;
               }
               else goto _LAND_55;
@@ -15397,26 +15374,26 @@ int main(int argc, char **argv)
     else {
       _LAND_55:
       {
-        printf_va_481("ERROR: Failed to set mag magnitude error adaptive measurement values!!!\n");
-        printf_va_482("Sent values:     Enable: %i, Parameters: %f %f %f %f %f %f\n",
-                      (int)mag_magnitude_error_command.enable,
-                      (double)mag_magnitude_error_command.low_pass_cutoff,
-                      (double)mag_magnitude_error_command.min_1sigma,
-                      (double)mag_magnitude_error_command.low_limit,
-                      (double)mag_magnitude_error_command.high_limit,
-                      (double)mag_magnitude_error_command.low_limit_1sigma,
-                      (double)mag_magnitude_error_command.high_limit_1sigma);
-        printf_va_483("Returned values: Enable: %i, Parameters: %f %f %f %f %f %f\n",
-                      (int)mag_magnitude_error_readback.enable,
-                      (double)mag_magnitude_error_readback.low_pass_cutoff,
-                      (double)mag_magnitude_error_readback.min_1sigma,
-                      (double)mag_magnitude_error_readback.low_limit,
-                      (double)mag_magnitude_error_readback.high_limit,
-                      (double)mag_magnitude_error_readback.low_limit_1sigma,
-                      (double)mag_magnitude_error_readback.high_limit_1sigma);
+        printf("ERROR: Failed to set mag magnitude error adaptive measurement values!!!\n"); /* printf_va_481 */
+        printf("Sent values:     Enable: %i, Parameters: %f %f %f %f %f %f\n",
+               (int)mag_magnitude_error_command.enable,
+               (double)mag_magnitude_error_command.low_pass_cutoff,
+               (double)mag_magnitude_error_command.min_1sigma,
+               (double)mag_magnitude_error_command.low_limit,
+               (double)mag_magnitude_error_command.high_limit,
+               (double)mag_magnitude_error_command.low_limit_1sigma,
+               (double)mag_magnitude_error_command.high_limit_1sigma); /* printf_va_482 */
+        printf("Returned values: Enable: %i, Parameters: %f %f %f %f %f %f\n",
+               (int)mag_magnitude_error_readback.enable,
+               (double)mag_magnitude_error_readback.low_pass_cutoff,
+               (double)mag_magnitude_error_readback.min_1sigma,
+               (double)mag_magnitude_error_readback.low_limit,
+               (double)mag_magnitude_error_readback.high_limit,
+               (double)mag_magnitude_error_readback.low_limit_1sigma,
+               (double)mag_magnitude_error_readback.high_limit_1sigma); /* printf_va_483 */
       }
     }
-    printf_va_484("\n\nLoading the default mag magnitude error adaptive measurement values.\n\n");
+    printf("\n\nLoading the default mag magnitude error adaptive measurement values.\n\n"); /* printf_va_484 */
     while (1) {
       u16 tmp_216;
       tmp_216 = mip_filter_mag_magnitude_error_adaptive_measurement(& device_interface,
@@ -15424,11 +15401,11 @@ int main(int argc, char **argv)
                                                                     (mip_filter_magnetometer_magnitude_error_adaptive_measurement_command *)0);
       if (! ((int)tmp_216 != 0)) break;
     }
-    printf_va_485("\n\n");
+    printf("\n\n"); /* printf_va_485 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_486("----------------------------------------------------------------------\n");
-    printf_va_487("Setting the mag dip angle error adaptive measurement values\n");
-    printf_va_488("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_486 */
+    printf("Setting the mag dip angle error adaptive measurement values\n"); /* printf_va_487 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_488 */
     mag_dip_angle_error_command.enable = (unsigned char)0;
     mag_dip_angle_error_command.low_pass_cutoff = (float)10;
     mag_dip_angle_error_command.min_1sigma = (float)0.1;
@@ -15460,7 +15437,7 @@ int main(int argc, char **argv)
           if ((double)tmp_221 < 0.001) {
             int tmp_222;
             tmp_222 = abs((int)(mag_dip_angle_error_command.high_limit_1sigma - mag_dip_angle_error_readback.high_limit_1sigma));
-            if ((double)tmp_222 < 0.001) printf_va_489("mag dip angle error adaptive measurement values successfully set.\n");
+            if ((double)tmp_222 < 0.001) printf("mag dip angle error adaptive measurement values successfully set.\n"); /* printf_va_489 */
             else goto _LAND_59;
           }
           else goto _LAND_59;
@@ -15472,22 +15449,22 @@ int main(int argc, char **argv)
     else {
       _LAND_59:
       {
-        printf_va_490("ERROR: Failed to set mag dip angle error adaptive measurement values!!!\n");
-        printf_va_491("Sent values:     Enable: %i, Parameters: %f %f %f %f\n",
-                      (int)mag_dip_angle_error_command.enable,
-                      (double)mag_dip_angle_error_command.low_pass_cutoff,
-                      (double)mag_dip_angle_error_command.min_1sigma,
-                      (double)mag_dip_angle_error_command.high_limit,
-                      (double)mag_dip_angle_error_command.high_limit_1sigma);
-        printf_va_492("Returned values: Enable: %i, Parameters: %f %f %f %f\n",
-                      (int)mag_dip_angle_error_readback.enable,
-                      (double)mag_dip_angle_error_readback.low_pass_cutoff,
-                      (double)mag_dip_angle_error_readback.min_1sigma,
-                      (double)mag_dip_angle_error_readback.high_limit,
-                      (double)mag_dip_angle_error_readback.high_limit_1sigma);
+        printf("ERROR: Failed to set mag dip angle error adaptive measurement values!!!\n"); /* printf_va_490 */
+        printf("Sent values:     Enable: %i, Parameters: %f %f %f %f\n",
+               (int)mag_dip_angle_error_command.enable,
+               (double)mag_dip_angle_error_command.low_pass_cutoff,
+               (double)mag_dip_angle_error_command.min_1sigma,
+               (double)mag_dip_angle_error_command.high_limit,
+               (double)mag_dip_angle_error_command.high_limit_1sigma); /* printf_va_491 */
+        printf("Returned values: Enable: %i, Parameters: %f %f %f %f\n",
+               (int)mag_dip_angle_error_readback.enable,
+               (double)mag_dip_angle_error_readback.low_pass_cutoff,
+               (double)mag_dip_angle_error_readback.min_1sigma,
+               (double)mag_dip_angle_error_readback.high_limit,
+               (double)mag_dip_angle_error_readback.high_limit_1sigma); /* printf_va_492 */
       }
     }
-    printf_va_493("\n\nLoading the default mag magnitude error adaptive measurement values.\n\n");
+    printf("\n\nLoading the default mag magnitude error adaptive measurement values.\n\n"); /* printf_va_493 */
     while (1) {
       u16 tmp_223;
       tmp_223 = mip_filter_mag_dip_angle_error_adaptive_measurement(& device_interface,
@@ -15495,7 +15472,7 @@ int main(int argc, char **argv)
                                                                     (mip_filter_magnetometer_dip_angle_error_adaptive_measurement_command *)0);
       if (! ((int)tmp_223 != 0)) break;
     }
-    printf_va_494("\n\n");
+    printf("\n\n"); /* printf_va_494 */
     usleep((unsigned int)((double)1500 * 1000.0));
     tmp_224 = mip_interface_add_descriptor_set_callback(& device_interface,
                                                         (unsigned char)0x82,
@@ -15522,9 +15499,9 @@ int main(int argc, char **argv)
       goto return_label;
     }
     enable_data_stats_output = (unsigned char)1;
-    printf_va_495("----------------------------------------------------------------------\n");
-    printf_va_496("Setting the AHRS message format\n");
-    printf_va_497("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_495 */
+    printf("Setting the AHRS message format\n"); /* printf_va_496 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_497 */
     data_stream_format_descriptors[0] = (unsigned char)0x04;
     data_stream_format_descriptors[1] = (unsigned char)0x05;
     data_stream_format_decimation[0] = (unsigned short)0x32;
@@ -15539,11 +15516,11 @@ int main(int argc, char **argv)
                                                 data_stream_format_decimation);
       if (! ((int)tmp_227 != 0)) break;
     }
-    printf_va_498("\n\n");
+    printf("\n\n"); /* printf_va_498 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_499("----------------------------------------------------------------------\n");
-    printf_va_500("Polling AHRS Data.\n");
-    printf_va_501("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_499 */
+    printf("Polling AHRS Data.\n"); /* printf_va_500 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_501 */
     while (1) {
       u16 tmp_228;
       tmp_228 = mip_3dm_cmd_poll_ahrs(& device_interface,(unsigned char)0x00,
@@ -15551,11 +15528,11 @@ int main(int argc, char **argv)
                                       data_stream_format_descriptors);
       if (! ((int)tmp_228 != 0)) break;
     }
-    printf_va_502("\n\n");
+    printf("\n\n"); /* printf_va_502 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_503("----------------------------------------------------------------------\n");
-    printf_va_504("Setting the GPS datastream format\n");
-    printf_va_505("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_503 */
+    printf("Setting the GPS datastream format\n"); /* printf_va_504 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_505 */
     data_stream_format_descriptors[0] = (unsigned char)0x03;
     data_stream_format_descriptors[1] = (unsigned char)0x05;
     data_stream_format_descriptors[2] = (unsigned char)0x09;
@@ -15572,11 +15549,11 @@ int main(int argc, char **argv)
                                                data_stream_format_decimation);
       if (! ((int)tmp_229 != 0)) break;
     }
-    printf_va_506("\n\n");
+    printf("\n\n"); /* printf_va_506 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_507("----------------------------------------------------------------------\n");
-    printf_va_508("Polling GPS Data.\n");
-    printf_va_509("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_507 */
+    printf("Polling GPS Data.\n"); /* printf_va_508 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_509 */
     while (1) {
       u16 tmp_230;
       tmp_230 = mip_3dm_cmd_poll_gps(& device_interface,(unsigned char)0x00,
@@ -15584,11 +15561,11 @@ int main(int argc, char **argv)
                                      data_stream_format_descriptors);
       if (! ((int)tmp_230 != 0)) break;
     }
-    printf_va_510("\n\n");
+    printf("\n\n"); /* printf_va_510 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_511("----------------------------------------------------------------------\n");
-    printf_va_512("Setting the Estimation Filter datastream format\n");
-    printf_va_513("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_511 */
+    printf("Setting the Estimation Filter datastream format\n"); /* printf_va_512 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_513 */
     data_stream_format_descriptors[0] = (unsigned char)0x01;
     data_stream_format_descriptors[1] = (unsigned char)0x02;
     data_stream_format_descriptors[2] = (unsigned char)0x05;
@@ -15605,11 +15582,11 @@ int main(int argc, char **argv)
                                                   data_stream_format_decimation);
       if (! ((int)tmp_231 != 0)) break;
     }
-    printf_va_514("\n\n");
+    printf("\n\n"); /* printf_va_514 */
     usleep((unsigned int)((double)1500 * 1000.0));
-    printf_va_515("----------------------------------------------------------------------\n");
-    printf_va_516("Polling Estimation Filter Data.\n");
-    printf_va_517("----------------------------------------------------------------------\n\n");
+    printf("----------------------------------------------------------------------\n"); /* printf_va_515 */
+    printf("Polling Estimation Filter Data.\n"); /* printf_va_516 */
+    printf("----------------------------------------------------------------------\n\n"); /* printf_va_517 */
     while (1) {
       u16 tmp_232;
       tmp_232 = mip_3dm_cmd_poll_filter(& device_interface,
@@ -15618,14 +15595,14 @@ int main(int argc, char **argv)
                                         data_stream_format_descriptors);
       if (! ((int)tmp_232 != 0)) break;
     }
-    printf_va_518("\n\n");
+    printf("\n\n"); /* printf_va_518 */
     usleep((unsigned int)((double)1500 * 1000.0));
   }
-  else printf_va_519("ERROR: Standard mode not established\n\n");
+  else printf("ERROR: Standard mode not established\n\n"); /* printf_va_519 */
   enable_data_stats_output = (unsigned char)0;
-  printf_va_520("\n----------------------------------------------------------------------\n");
-  printf_va_521("Enable the AHRS datastream\n");
-  printf_va_522("----------------------------------------------------------------------\n\n");
+  printf("\n----------------------------------------------------------------------\n"); /* printf_va_520 */
+  printf("Enable the AHRS datastream\n"); /* printf_va_521 */
+  printf("----------------------------------------------------------------------\n\n"); /* printf_va_522 */
   enable = (unsigned char)0x01;
   while (1) {
     u16 tmp_233;
@@ -15635,11 +15612,11 @@ int main(int argc, char **argv)
                                                  & enable);
     if (! ((int)tmp_233 != 0)) break;
   }
-  printf_va_523("\n\n");
+  printf("\n\n"); /* printf_va_523 */
   usleep((unsigned int)((double)1500 * 1000.0));
-  printf_va_524("----------------------------------------------------------------------\n");
-  printf_va_525("Enable the FILTER datastream\n");
-  printf_va_526("----------------------------------------------------------------------\n\n");
+  printf("----------------------------------------------------------------------\n"); /* printf_va_524 */
+  printf("Enable the FILTER datastream\n"); /* printf_va_525 */
+  printf("----------------------------------------------------------------------\n\n"); /* printf_va_526 */
   enable = (unsigned char)0x01;
   while (1) {
     u16 tmp_234;
@@ -15649,11 +15626,11 @@ int main(int argc, char **argv)
                                                  & enable);
     if (! ((int)tmp_234 != 0)) break;
   }
-  printf_va_527("\n\n");
+  printf("\n\n"); /* printf_va_527 */
   usleep((unsigned int)((double)1500 * 1000.0));
-  printf_va_528("----------------------------------------------------------------------\n");
-  printf_va_529("Enable the GPS datastream\n");
-  printf_va_530("----------------------------------------------------------------------\n");
+  printf("----------------------------------------------------------------------\n"); /* printf_va_528 */
+  printf("Enable the GPS datastream\n"); /* printf_va_529 */
+  printf("----------------------------------------------------------------------\n"); /* printf_va_530 */
   enable = (unsigned char)0x01;
   while (1) {
     u16 tmp_235;
@@ -15663,11 +15640,11 @@ int main(int argc, char **argv)
                                                  & enable);
     if (! ((int)tmp_235 != 0)) break;
   }
-  printf_va_531("\n\n");
+  printf("\n\n"); /* printf_va_531 */
   usleep((unsigned int)((double)1500 * 1000.0));
-  printf_va_532("----------------------------------------------------------------------\n");
-  printf_va_533("Processing incoming packets\n");
-  printf_va_534("----------------------------------------------------------------------\n\n\n");
+  printf("----------------------------------------------------------------------\n"); /* printf_va_532 */
+  printf("Processing incoming packets\n"); /* printf_va_533 */
+  printf("----------------------------------------------------------------------\n\n\n"); /* printf_va_534 */
   enable_data_stats_output = (unsigned char)1;
   while (1) {
     mip_interface_update(& device_interface);
@@ -15966,17 +15943,17 @@ int printf_va_545(char const * __restrict format);
 
 void print_command_line_usage(void)
 {
-  printf_va_535("\n\n");
-  printf_va_536("Usage:\n");
-  printf_va_537("-----------------------------------------------------------------------\n\n");
-  printf_va_538("   GX4-45_Test [com_port_num] [baudrate]\n");
-  printf_va_539("\n\n");
-  printf_va_540("   Example: \"GX4-45_Test 1 115200\", Opens a connection to the \n");
-  printf_va_541("             GX4-45 on COM1, with a baudrate of 115200.\n");
-  printf_va_542("\n\n");
-  printf_va_543("   [ ] - required command input.\n");
-  printf_va_544("\n-----------------------------------------------------------------------\n");
-  printf_va_545("\n\n");
+  printf("\n\n"); /* printf_va_535 */
+  printf("Usage:\n"); /* printf_va_536 */
+  printf("-----------------------------------------------------------------------\n\n"); /* printf_va_537 */
+  printf("   GX4-45_Test [com_port_num] [baudrate]\n"); /* printf_va_538 */
+  printf("\n\n"); /* printf_va_539 */
+  printf("   Example: \"GX4-45_Test 1 115200\", Opens a connection to the \n"); /* printf_va_540 */
+  printf("             GX4-45 on COM1, with a baudrate of 115200.\n"); /* printf_va_541 */
+  printf("\n\n"); /* printf_va_542 */
+  printf("   [ ] - required command input.\n"); /* printf_va_543 */
+  printf("\n-----------------------------------------------------------------------\n"); /* printf_va_544 */
+  printf("\n\n"); /* printf_va_545 */
   return;
 }
 
@@ -16018,9 +15995,9 @@ int printf_va_548(char const * __restrict format);
 
 void print_header(void)
 {
-  printf_va_546("\n");
-  printf_va_547("GX4-45 Test Program\n");
-  printf_va_548("Copyright 2013. LORD Microstrain\n\n");
+  printf("\n"); /* printf_va_546 */
+  printf("GX4-45 Test Program\n"); /* printf_va_547 */
+  printf("Copyright 2013. LORD Microstrain\n\n"); /* printf_va_548 */
   return;
 }
 
@@ -16044,13 +16021,13 @@ int printf_va_549(char const * __restrict format, unsigned int param0,
 
 void print_packet_stats(void)
 {
-  if (enable_data_stats_output) printf_va_549("\r%u FILTER (%u errors)    %u AHRS (%u errors)    %u GPS (%u errors) Packets",
-                                              filter_valid_packet_count,
-                                              filter_timeout_packet_count + filter_checksum_error_packet_count,
-                                              ahrs_valid_packet_count,
-                                              ahrs_timeout_packet_count + ahrs_checksum_error_packet_count,
-                                              gps_valid_packet_count,
-                                              gps_timeout_packet_count + gps_checksum_error_packet_count);
+  if (enable_data_stats_output) printf("\r%u FILTER (%u errors)    %u AHRS (%u errors)    %u GPS (%u errors) Packets",
+                                       filter_valid_packet_count,
+                                       filter_timeout_packet_count + filter_checksum_error_packet_count,
+                                       ahrs_valid_packet_count,
+                                       ahrs_timeout_packet_count + ahrs_checksum_error_packet_count,
+                                       gps_valid_packet_count,
+                                       gps_timeout_packet_count + gps_checksum_error_packet_count); /* printf_va_549 */
   return;
 }
 
diff --git a/mini-gmp/.frama-c/mini-gmp.parse/framac.ast b/mini-gmp/.frama-c/mini-gmp.parse/framac.ast
index e2fa7185547337d0375ef72c22b184ea7457558a..f2a5eb21bfde18da3bfdf0773e96045c75b01f1a 100644
--- a/mini-gmp/.frama-c/mini-gmp.parse/framac.ast
+++ b/mini-gmp/.frama-c/mini-gmp.parse/framac.ast
@@ -545,7 +545,7 @@ void testmain(int argc, char **argv)
       mpz_add(res,(__mpz_struct const *)(a),(__mpz_struct const *)(b));
       tmp = mpz_cmp((__mpz_struct const *)(res),(__mpz_struct const *)(ref));
       if (tmp) {
-        fprintf_va_1(__fc_stderr,"mpz_add failed:\n");
+        fprintf(__fc_stderr,"mpz_add failed:\n"); /* fprintf_va_1 */
         dump("a",(__mpz_struct const *)(a));
         dump("b",(__mpz_struct const *)(b));
         dump("r",(__mpz_struct const *)(res));
@@ -579,7 +579,7 @@ int fprintf_va_2(FILE * __restrict stream, char const * __restrict format,
 
 static void gmp_die(char const *msg)
 {
-  fprintf_va_2(__fc_stderr,"%s\n",(char *)msg);
+  fprintf(__fc_stderr,"%s\n",(char *)msg); /* fprintf_va_2 */
   abort();
   return;
 }
@@ -5708,15 +5708,15 @@ void hex_random_init(void)
   if (env_seed) 
     if (*(env_seed + 0)) {
       seed = strtoul((char const *)env_seed,(char **)0,0);
-      if (seed) printf_va_1("Re-seeding with GMP_CHECK_RANDOMIZE=%lu\n",seed);
+      if (seed) printf("Re-seeding with GMP_CHECK_RANDOMIZE=%lu\n",seed); /* printf_va_1 */
       else {
         time_t tmp;
         pid_t tmp_0;
         tmp = time((time_t *)0);
         tmp_0 = getpid();
         seed = (unsigned long)(tmp + (time_t)tmp_0);
-        printf_va_2("Seed GMP_CHECK_RANDOMIZE=%lu (include this in bug reports)\n",
-                    seed);
+        printf("Seed GMP_CHECK_RANDOMIZE=%lu (include this in bug reports)\n",
+               seed); /* printf_va_2 */
       }
     }
     else seed = (unsigned long)4711;
@@ -6154,7 +6154,7 @@ static void set_str(__mpz_struct * /*[1]*/ r, char const *s)
   int tmp;
   tmp = mpz_set_str(r,s,16);
   if (tmp != 0) {
-    fprintf_va_3(__fc_stderr,"mpz_set_str failed on input %s\n",(char *)s);
+    fprintf(__fc_stderr,"mpz_set_str failed on input %s\n",(char *)s); /* fprintf_va_3 */
     abort();
   }
   return;
diff --git a/miniz/.frama-c/miniz.parse/framac.ast b/miniz/.frama-c/miniz.parse/framac.ast
index e165fa31f249c31cb274f4371dc90ec073e849fa..55f7f5ba0cc56d63519f5c95b88972fce087f1c7 100644
--- a/miniz/.frama-c/miniz.parse/framac.ast
+++ b/miniz/.frama-c/miniz.parse/framac.ast
@@ -517,7 +517,7 @@ int main(int argc, char **argv)
   uLong cmp_len = mz_compressBound(src_len);
   uLong uncomp_len = src_len;
   uint total_succeeded = (unsigned int)0;
-  printf_va_1("miniz.c version: %s\n",(char *)"10.1.0");
+  printf("miniz.c version: %s\n",(char *)"10.1.0"); /* printf_va_1 */
   while (1) {
     pCmp = (uint8 *)malloc(cmp_len);
     pUncomp = (uint8 *)malloc(src_len);
@@ -526,7 +526,7 @@ int main(int argc, char **argv)
       if (! pUncomp) {
         _LOR:
         {
-          printf_va_2("Out of memory!\n");
+          printf("Out of memory!\n"); /* printf_va_2 */
           __retres = 1;
           goto return_label;
         }
@@ -534,14 +534,14 @@ int main(int argc, char **argv)
     cmp_status = (int)mz_compress(pCmp,& cmp_len,
                                   (unsigned char const *)s_pStr,src_len);
     if (cmp_status != MZ_OK) {
-      printf_va_3("compress() failed!\n");
+      printf("compress() failed!\n"); /* printf_va_3 */
       free((void *)pCmp);
       free((void *)pUncomp);
       __retres = 1;
       goto return_label;
     }
-    printf_va_4("Compressed from %u to %u bytes\n",(unsigned int)src_len,
-                (unsigned int)cmp_len);
+    printf("Compressed from %u to %u bytes\n",(unsigned int)src_len,
+           (unsigned int)cmp_len); /* printf_va_4 */
     if (step) {
       int tmp_3;
       tmp_3 = rand();
@@ -565,18 +565,18 @@ int main(int argc, char **argv)
     cmp_status = (int)mz_uncompress(pUncomp,& uncomp_len,
                                     (unsigned char const *)pCmp,cmp_len);
     total_succeeded += (uint)(cmp_status == MZ_OK);
-    if (step) printf_va_5("Simple fuzzy test: step %u total_succeeded: %u\n",
-                          step,total_succeeded);
+    if (step) printf("Simple fuzzy test: step %u total_succeeded: %u\n",step,
+                     total_succeeded); /* printf_va_5 */
     else {
       if (cmp_status != MZ_OK) {
-        printf_va_6("uncompress failed!\n");
+        printf("uncompress failed!\n"); /* printf_va_6 */
         free((void *)pCmp);
         free((void *)pUncomp);
         __retres = 1;
         goto return_label;
       }
-      printf_va_7("Decompressed from %u to %u bytes\n",(unsigned int)cmp_len,
-                  (unsigned int)uncomp_len);
+      printf("Decompressed from %u to %u bytes\n",(unsigned int)cmp_len,
+             (unsigned int)uncomp_len); /* printf_va_7 */
       if (uncomp_len != src_len) goto _LOR_0;
       else {
         int tmp_7;
@@ -584,7 +584,7 @@ int main(int argc, char **argv)
         if (tmp_7) {
           _LOR_0:
           {
-            printf_va_8("Decompression failed!\n");
+            printf("Decompression failed!\n"); /* printf_va_8 */
             free((void *)pCmp);
             free((void *)pUncomp);
             __retres = 1;
@@ -598,7 +598,7 @@ int main(int argc, char **argv)
     step ++;
     if (! (argc >= 2)) break;
   }
-  printf_va_9("Success.\n");
+  printf("Success.\n"); /* printf_va_9 */
   __retres = 0;
   return_label: return __retres;
 }
diff --git a/monocypher/.frama-c/monocypher.parse/framac.ast b/monocypher/.frama-c/monocypher.parse/framac.ast
index b36c54a78aba9fa328de0fd031125d2af276b818..786fab53f09632722171c69fdaf10ae2631b5dfb 100644
--- a/monocypher/.frama-c/monocypher.parse/framac.ast
+++ b/monocypher/.frama-c/monocypher.parse/framac.ast
@@ -5619,11 +5619,11 @@ void print_vector(u8 *buf, size_t size)
   {
     size_t i = (unsigned long)0;
     while (i < size) {
-      printf_va_1("%hhx%hhx",(int)*(buf + i) >> 4,(int)*(buf + i) & 0x0f);
+      printf("%hhx%hhx",(int)*(buf + i) >> 4,(int)*(buf + i) & 0x0f); /* printf_va_1 */
       i += (size_t)1;
     }
   }
-  printf_va_2(":\n");
+  printf(":\n"); /* printf_va_2 */
   return;
 }
 
@@ -436073,7 +436073,7 @@ static void *alloc(size_t size)
   }
   void *buf = malloc(size);
   if (buf == (void *)0) {
-    fprintf_va_1(__fc_stderr,"Allocation failed: 0x%zx bytes\n",size);
+    fprintf(__fc_stderr,"Allocation failed: 0x%zx bytes\n",size); /* fprintf_va_1 */
     exit(1);
   }
   __retres = buf;
@@ -436158,7 +436158,7 @@ static int test(void (*f)(vector const *, vector *), char const *name,
   ;
   ;
   if (status != 0) tmp_2 = "FAILED"; else tmp_2 = "OK";
-  printf_va_3("%s %4d tests: %s\n",(char *)tmp_2,nb_tests,(char *)name);
+  printf("%s %4d tests: %s\n",(char *)tmp_2,nb_tests,(char *)name); /* printf_va_3 */
   return status;
 }
 
@@ -436290,9 +436290,9 @@ static void x25519(vector const *in, vector *out)
                   (uint8_t const *)point->buf);
   int not_zero = zerocmp((u8 const *)out->buf,out->size);
   if (not_zero) 
-    if (report) printf_va_4("FAILURE: x25519 false all_zero report\n");
+    if (report) printf("FAILURE: x25519 false all_zero report\n"); /* printf_va_4 */
   if (! not_zero) 
-    if (! report) printf_va_5("FAILURE: x25519 failed to report zero\n");
+    if (! report) printf("FAILURE: x25519 failed to report zero\n"); /* printf_va_5 */
   return;
 }
 
@@ -436336,7 +436336,7 @@ static void edDSA(vector const *in, vector *out)
   crypto_sign(out2,(uint8_t const *)secret_k->buf,(uint8_t const *)0,
               (uint8_t const *)msg->buf,msg->size);
   tmp = memcmp((void const *)out->buf,(void const *)(out2),out->size);
-  if (tmp) printf_va_6("FAILURE: reconstructing public key yields different signature\n");
+  if (tmp) printf("FAILURE: reconstructing public key yields different signature\n"); /* printf_va_6 */
   return;
 }
 
@@ -436427,7 +436427,7 @@ static int test_x25519(void)
   int status =
     memcmp((void const *)(k),(void const *)(_1),(unsigned long)32);
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_7("%s: x25519 1\n",(char *)tmp_0);
+  printf("%s: x25519 1\n",(char *)tmp_0); /* printf_va_7 */
   u8 _1k[32] =
     {(unsigned char)0x68,
      (unsigned char)0x4c,
@@ -436471,7 +436471,7 @@ static int test_x25519(void)
   tmp_1 = memcmp((void const *)(k),(void const *)(_1k),(unsigned long)32);
   status |= tmp_1;
   if (status != 0) tmp_2 = "FAILED"; else tmp_2 = "OK";
-  printf_va_8("%s: x25519 1K\n",(char *)tmp_2);
+  printf("%s: x25519 1K\n",(char *)tmp_2); /* printf_va_8 */
   return status;
 }
 
@@ -436555,7 +436555,7 @@ static int p_verify(size_t size, int (*compare)(u8 const *, u8 const *))
   }
   ;
   if (status != 0) tmp_3 = "FAILED"; else tmp_3 = "OK";
-  printf_va_9("%s: crypto_verify%zu\n",(char *)tmp_3,size);
+  printf("%s: crypto_verify%zu\n",(char *)tmp_3,size); /* printf_va_9 */
   return status;
 }
 
@@ -436645,7 +436645,7 @@ static int p_chacha20(void)
     }
   }
   if (status != 0) tmp_1 = "FAILED"; else tmp_1 = "OK";
-  printf_va_10("%s: Chacha20 (incremental)\n",(char *)tmp_1);
+  printf("%s: Chacha20 (incremental)\n",(char *)tmp_1); /* printf_va_10 */
   return status;
 }
 
@@ -436686,7 +436686,7 @@ static int p_chacha20_same_ptr(void)
                (unsigned long)64);
   status |= tmp;
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_11("%s: Chacha20 (output == input)\n",(char *)tmp_0);
+  printf("%s: Chacha20 (output == input)\n",(char *)tmp_0); /* printf_va_11 */
   return status;
 }
 
@@ -436745,7 +436745,7 @@ static int p_chacha20_set_ctr(void)
     }
   }
   if (status != 0) tmp_1 = "FAILED"; else tmp_1 = "OK";
-  printf_va_12("%s: Chacha20 (set counter)\n",(char *)tmp_1);
+  printf("%s: Chacha20 (set counter)\n",(char *)tmp_1); /* printf_va_12 */
   return status;
 }
 
@@ -436794,7 +436794,7 @@ static int p_poly1305(void)
     }
   }
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_13("%s: Poly1305 (incremental)\n",(char *)tmp_0);
+  printf("%s: Poly1305 (incremental)\n",(char *)tmp_0); /* printf_va_13 */
   return status;
 }
 
@@ -436838,7 +436838,7 @@ static int p_poly1305_overlap(void)
     }
   }
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_14("%s: Poly1305 (overlaping i/o)\n",(char *)tmp_0);
+  printf("%s: Poly1305 (overlaping i/o)\n",(char *)tmp_0); /* printf_va_14 */
   return status;
 }
 
@@ -436885,7 +436885,7 @@ static int p_blake2b(void)
     }
   }
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_15("%s: Blake2b (incremental)\n",(char *)tmp_0);
+  printf("%s: Blake2b (incremental)\n",(char *)tmp_0); /* printf_va_15 */
   return status;
 }
 
@@ -436927,7 +436927,7 @@ static int p_blake2b_overlap(void)
     }
   }
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_16("%s: Blake2b (overlaping i/o)\n",(char *)tmp_0);
+  printf("%s: Blake2b (overlaping i/o)\n",(char *)tmp_0); /* printf_va_16 */
   return status;
 }
 
@@ -436974,7 +436974,7 @@ static int p_sha512(void)
     }
   }
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_17("%s: Sha512 (incremental)\n",(char *)tmp_0);
+  printf("%s: Sha512 (incremental)\n",(char *)tmp_0); /* printf_va_17 */
   return status;
 }
 
@@ -437015,7 +437015,7 @@ static int p_sha512_overlap(void)
     }
   }
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_18("%s: Sha512 (overlaping i/o)\n",(char *)tmp_0);
+  printf("%s: Sha512 (overlaping i/o)\n",(char *)tmp_0); /* printf_va_18 */
   return status;
 }
 
@@ -437059,7 +437059,7 @@ static int p_argon2i_easy(void)
   status |= tmp_0;
   free(work_area);
   if (status != 0) tmp_1 = "FAILED"; else tmp_1 = "OK";
-  printf_va_19("%s: Argon2i (easy interface)\n",(char *)tmp_1);
+  printf("%s: Argon2i (easy interface)\n",(char *)tmp_1); /* printf_va_19 */
   return status;
 }
 
@@ -437162,7 +437162,7 @@ static int p_argon2i_overlap(void)
   free((void *)work_area);
   free((void *)clean_work_area);
   if (status != 0) tmp_6 = "FAILED"; else tmp_6 = "OK";
-  printf_va_20("%s: Argon2i (overlaping i/o)\n",(char *)tmp_6);
+  printf("%s: Argon2i (overlaping i/o)\n",(char *)tmp_6); /* printf_va_20 */
   return status;
 }
 
@@ -437229,7 +437229,7 @@ static int p_eddsa_roundtrip(void)
     }
   }
   if (status != 0) tmp_4 = "FAILED"; else tmp_4 = "OK";
-  printf_va_21("%s: EdDSA (roundtrip)\n",(char *)tmp_4);
+  printf("%s: EdDSA (roundtrip)\n",(char *)tmp_4); /* printf_va_21 */
   return status;
 }
 
@@ -437271,7 +437271,7 @@ static int p_eddsa_random(void)
     }
   }
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_22("%s: EdDSA (random)\n",(char *)tmp_0);
+  printf("%s: EdDSA (random)\n",(char *)tmp_0); /* printf_va_22 */
   return status;
 }
 
@@ -437317,7 +437317,7 @@ static int p_eddsa_overlap(void)
     }
   }
   if (status != 0) tmp_0 = "FAILED"; else tmp_0 = "OK";
-  printf_va_23("%s: EdDSA (overlap)\n",(char *)tmp_0);
+  printf("%s: EdDSA (overlap)\n",(char *)tmp_0); /* printf_va_23 */
   return status;
 }
 
@@ -437391,7 +437391,7 @@ static int p_eddsa_incremental(void)
     }
   }
   if (status != 0) tmp_2 = "FAILED"; else tmp_2 = "OK";
-  printf_va_24("%s: EdDSA (incremental)\n",(char *)tmp_2);
+  printf("%s: EdDSA (incremental)\n",(char *)tmp_2); /* printf_va_24 */
   return status;
 }
 
@@ -437491,7 +437491,7 @@ static int p_aead(void)
     }
   }
   if (status != 0) tmp_8 = "FAILED"; else tmp_8 = "OK";
-  printf_va_25("%s: aead (roundtrip)\n",(char *)tmp_8);
+  printf("%s: aead (roundtrip)\n",(char *)tmp_8); /* printf_va_25 */
   return status;
 }
 
@@ -437631,7 +437631,7 @@ static int p_lock_incremental(void)
     }
   }
   if (status != 0) tmp_15 = "FAILED"; else tmp_15 = "OK";
-  printf_va_26("%s: aead (incremental)\n",(char *)tmp_15);
+  printf("%s: aead (incremental)\n",(char *)tmp_15); /* printf_va_26 */
   return status;
 }
 
@@ -437700,7 +437700,7 @@ static int p_auth(void)
     }
   }
   if (status != 0) tmp_2 = "FAILED"; else tmp_2 = "OK";
-  printf_va_27("%s: aead (authentication)\n",(char *)tmp_2);
+  printf("%s: aead (authentication)\n",(char *)tmp_2); /* printf_va_27 */
   return status;
 }
 
@@ -437805,8 +437805,8 @@ int main(void)
   int tmp_33;
   char const *tmp_34;
   int status = 0;
-  printf_va_28("\nTest against vectors");
-  printf_va_29("\n--------------------\n");
+  printf("\nTest against vectors"); /* printf_va_28 */
+  printf("\n--------------------\n"); /* printf_va_29 */
   tmp = test(& chacha20,"chacha20",(unsigned long)4,nb_chacha20_vectors,
              chacha20_vectors,chacha20_sizes);
   status |= tmp;
@@ -437849,8 +437849,8 @@ int main(void)
   status |= tmp_11;
   tmp_12 = test_x25519();
   status |= tmp_12;
-  printf_va_30("\nProperty based tests");
-  printf_va_31("\n--------------------\n");
+  printf("\nProperty based tests"); /* printf_va_30 */
+  printf("\n--------------------\n"); /* printf_va_31 */
   tmp_13 = p_verify16();
   status |= tmp_13;
   tmp_14 = p_verify32();
@@ -437895,7 +437895,7 @@ int main(void)
   status |= tmp_33;
   if (status != 0) tmp_34 = "SOME TESTS FAILED";
   else tmp_34 = "All tests OK!";
-  printf_va_32("\n%s\n\n",(char *)tmp_34);
+  printf("\n%s\n\n",(char *)tmp_34); /* printf_va_32 */
   return status;
 }
 
diff --git a/polarssl/.frama-c/polarssl-server.eva/alarms.csv b/polarssl/.frama-c/polarssl-server.eva/alarms.csv
index 8fe54a75b4cf5d87ef2e9c55b33bc8bfd08def8b..8ef9a654c2c7d3f807f253d9fff792b50b20911b 100644
--- a/polarssl/.frama-c/polarssl-server.eva/alarms.csv
+++ b/polarssl/.frama-c/polarssl-server.eva/alarms.csv
@@ -45,7 +45,7 @@ FRAMAC_SHARE/libc	unistd.h	1005	read	precondition	Unknown	buf_has_room: \valid((
 FRAMAC_SHARE/libc	unistd.h	1132	write	precondition	Unknown	valid_fd: 0 ≤ fd < 1024
 FRAMAC_SHARE/libc	unistd.h	1133	write	precondition	Unknown	buf_has_room: \valid_read((char *)buf + (0 .. count - 1))
 FRAMAC_SHARE/libc/sys	socket.h	301	accept	precondition	Unknown	valid_sockfd: 0 ≤ sockfd < 1024
-FRAMAC_SHARE/libc/sys	socket.h	501	shutdown	precondition	Unknown	valid_sockfd: 0 ≤ sockfd < 1024
+FRAMAC_SHARE/libc/sys	socket.h	536	shutdown	precondition	Unknown	valid_sockfd: 0 ≤ sockfd < 1024
 library	ctr_drbg.c	154	block_cipher_df	mem_access	Unknown	\valid_read(p + i)
 library	des.c	384	des_setkey	postcondition	Unknown	\initialized(\old(SK) + (0 .. 31))
 library	dhm.c	210	dhm_read_public	signed_overflow	Unknown	-2147483648 ≤ (int)(-0x3200) + ret
diff --git a/polarssl/.frama-c/polarssl-server.parse/framac.ast b/polarssl/.frama-c/polarssl-server.parse/framac.ast
index f88bf714a3d2ce35d87886660dd0460902f41da1..125838400302edb9c1e4d70c12af7f6ac4d32e6a 100644
--- a/polarssl/.frama-c/polarssl-server.parse/framac.ast
+++ b/polarssl/.frama-c/polarssl-server.parse/framac.ast
@@ -2994,7 +2994,7 @@ int aes_self_test(int verbose)
       char const *tmp;
       if (v == 0) tmp = "dec"; else tmp = "enc";
       ;
-      printf_va_1("  AES-ECB-%3d (%s): ",128 + u * 64,(char *)tmp);
+      printf("  AES-ECB-%3d (%s): ",128 + u * 64,(char *)tmp); /* printf_va_1 */
     }
     memset((void *)(buf),0,(unsigned int)16);
     if (v == 0) {
@@ -3009,7 +3009,7 @@ int aes_self_test(int verbose)
       tmp_0 = memcmp((void const *)(buf),(void const *)(aes_test_ecb_dec[u]),
                      (unsigned int)16);
       if (tmp_0 != 0) {
-        if (verbose != 0) printf_va_2("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_2 */
         __retres = 1;
         goto return_label;
       }
@@ -3026,15 +3026,15 @@ int aes_self_test(int verbose)
       tmp_1 = memcmp((void const *)(buf),(void const *)(aes_test_ecb_enc[u]),
                      (unsigned int)16);
       if (tmp_1 != 0) {
-        if (verbose != 0) printf_va_3("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_3 */
         __retres = 1;
         goto return_label;
       }
     }
-    if (verbose != 0) printf_va_4("passed\n");
+    if (verbose != 0) printf("passed\n"); /* printf_va_4 */
     i ++;
   }
-  if (verbose != 0) printf_va_5("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_5 */
   i = 0;
   while (i < 6) {
     u = i >> 1;
@@ -3043,7 +3043,7 @@ int aes_self_test(int verbose)
       char const *tmp_2;
       if (v == 0) tmp_2 = "dec"; else tmp_2 = "enc";
       ;
-      printf_va_6("  AES-CBC-%3d (%s): ",128 + u * 64,(char *)tmp_2);
+      printf("  AES-CBC-%3d (%s): ",128 + u * 64,(char *)tmp_2); /* printf_va_6 */
     }
     memset((void *)(iv),0,(unsigned int)16);
     memset((void *)(prv_0),0,(unsigned int)16);
@@ -3061,7 +3061,7 @@ int aes_self_test(int verbose)
       tmp_3 = memcmp((void const *)(buf),(void const *)(aes_test_cbc_dec[u]),
                      (unsigned int)16);
       if (tmp_3 != 0) {
-        if (verbose != 0) printf_va_7("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_7 */
         __retres = 1;
         goto return_label;
       }
@@ -3085,15 +3085,15 @@ int aes_self_test(int verbose)
       tmp_5 = memcmp((void const *)(prv_0),
                      (void const *)(aes_test_cbc_enc[u]),(unsigned int)16);
       if (tmp_5 != 0) {
-        if (verbose != 0) printf_va_8("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_8 */
         __retres = 1;
         goto return_label;
       }
     }
-    if (verbose != 0) printf_va_9("passed\n");
+    if (verbose != 0) printf("passed\n"); /* printf_va_9 */
     i ++;
   }
-  if (verbose != 0) printf_va_10("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_10 */
   i = 0;
   while (i < 6) {
     u = i >> 1;
@@ -3102,7 +3102,7 @@ int aes_self_test(int verbose)
       char const *tmp_6;
       if (v == 0) tmp_6 = "dec"; else tmp_6 = "enc";
       ;
-      printf_va_11("  AES-CFB128-%3d (%s): ",128 + u * 64,(char *)tmp_6);
+      printf("  AES-CFB128-%3d (%s): ",128 + u * 64,(char *)tmp_6); /* printf_va_11 */
     }
     memcpy((void *)(iv),(void const *)(aes_test_cfb128_iv),(unsigned int)16);
     memcpy((void *)(key),(void const *)(aes_test_cfb128_key[u]),
@@ -3119,7 +3119,7 @@ int aes_self_test(int verbose)
       tmp_7 = memcmp((void const *)(buf),(void const *)(aes_test_cfb128_pt),
                      (unsigned int)64);
       if (tmp_7 != 0) {
-        if (verbose != 0) printf_va_12("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_12 */
         __retres = 1;
         goto return_label;
       }
@@ -3133,15 +3133,15 @@ int aes_self_test(int verbose)
       tmp_8 = memcmp((void const *)(buf),
                      (void const *)(aes_test_cfb128_ct[u]),(unsigned int)64);
       if (tmp_8 != 0) {
-        if (verbose != 0) printf_va_13("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_13 */
         __retres = 1;
         goto return_label;
       }
     }
-    if (verbose != 0) printf_va_14("passed\n");
+    if (verbose != 0) printf("passed\n"); /* printf_va_14 */
     i ++;
   }
-  if (verbose != 0) printf_va_15("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_15 */
   i = 0;
   while (i < 6) {
     u = i >> 1;
@@ -3149,7 +3149,7 @@ int aes_self_test(int verbose)
     if (verbose != 0) {
       char const *tmp_9;
       if (v == 0) tmp_9 = "dec"; else tmp_9 = "enc";
-      printf_va_16("  AES-CTR-128 (%s): ",(char *)tmp_9);
+      printf("  AES-CTR-128 (%s): ",(char *)tmp_9); /* printf_va_16 */
     }
     memcpy((void *)(nonce_counter),
            (void const *)(aes_test_ctr_nonce_counter[u]),(unsigned int)16);
@@ -3167,7 +3167,7 @@ int aes_self_test(int verbose)
       tmp_10 = memcmp((void const *)(buf),(void const *)(aes_test_ctr_pt[u]),
                       (unsigned int)len);
       if (tmp_10 != 0) {
-        if (verbose != 0) printf_va_17("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_17 */
         __retres = 1;
         goto return_label;
       }
@@ -3182,15 +3182,15 @@ int aes_self_test(int verbose)
       tmp_11 = memcmp((void const *)(buf),(void const *)(aes_test_ctr_ct[u]),
                       (unsigned int)len);
       if (tmp_11 != 0) {
-        if (verbose != 0) printf_va_18("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_18 */
         __retres = 1;
         goto return_label;
       }
     }
-    if (verbose != 0) printf_va_19("passed\n");
+    if (verbose != 0) printf("passed\n"); /* printf_va_19 */
     i ++;
   }
-  if (verbose != 0) printf_va_20("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_20 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -3402,22 +3402,22 @@ int arc4_self_test(int verbose)
   while (i < 3) {
     {
       int tmp;
-      if (verbose != 0) printf_va_21("  ARC4 test #%d: ",i + 1);
+      if (verbose != 0) printf("  ARC4 test #%d: ",i + 1); /* printf_va_21 */
       memcpy((void *)(ibuf),(void const *)(arc4_test_pt[i]),(unsigned int)8);
       arc4_setup(& ctx,arc4_test_key[i],(unsigned int)8);
       arc4_crypt(& ctx,(unsigned int)8,(unsigned char const *)(ibuf),obuf);
       tmp = memcmp((void const *)(obuf),(void const *)(arc4_test_ct[i]),
                    (unsigned int)8);
       if (tmp != 0) {
-        if (verbose != 0) printf_va_22("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_22 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_23("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_23 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_24("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_24 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -4267,7 +4267,7 @@ int base64_self_test(int verbose)
   unsigned char buffer[128];
   int tmp;
   int tmp_1;
-  if (verbose != 0) printf_va_25("  Base64 encoding test: ");
+  if (verbose != 0) printf("  Base64 encoding test: "); /* printf_va_25 */
   len = sizeof(buffer);
   src = (unsigned char *)(base64_test_dec);
   tmp = base64_encode(buffer,& len,(unsigned char const *)src,
@@ -4280,13 +4280,13 @@ int base64_self_test(int verbose)
     if (tmp_0 != 0) {
       _LOR:
       {
-        if (verbose != 0) printf_va_26("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_26 */
         __retres = 1;
         goto return_label;
       }
     }
   }
-  if (verbose != 0) printf_va_27("passed\n  Base64 decoding test: ");
+  if (verbose != 0) printf("passed\n  Base64 decoding test: "); /* printf_va_27 */
   len = sizeof(buffer);
   src = (unsigned char *)(base64_test_enc);
   tmp_1 = base64_decode(buffer,& len,(unsigned char const *)src,
@@ -4299,13 +4299,13 @@ int base64_self_test(int verbose)
     if (tmp_2 != 0) {
       _LOR_0:
       {
-        if (verbose != 0) printf_va_28("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_28 */
         __retres = 1;
         goto return_label;
       }
     }
   }
-  if (verbose != 0) printf_va_29("passed\n\n");
+  if (verbose != 0) printf("passed\n\n"); /* printf_va_29 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -4713,7 +4713,7 @@ int mpi_write_string(mpi const *X, int radix, char *s, size_t *slen)
           if (c == 0) 
             if (k == (size_t)0) 
               if ((i + j) + (size_t)3 != (size_t)0) goto __Cont;
-          tmp_0 = sprintf_va_1(p,"%02X",(unsigned int)c);
+          tmp_0 = sprintf(p,"%02X",(unsigned int)c); /* sprintf_va_1 */
           p += tmp_0;
           k = (unsigned int)1;
         }
@@ -4837,7 +4837,7 @@ int mpi_write_file(char const *p, mpi const *X, int radix, FILE *fout)
       }
     }
   }
-  else printf_va_30("%s%s",(char *)p,s);
+  else printf("%s%s",(char *)p,s); /* printf_va_30 */
   cleanup: ;
   __retres = ret;
   return_label: return __retres;
@@ -6937,14 +6937,14 @@ int mpi_self_test(int verbose)
   ret = mpi_read_string(& U,16,
                         "602AB7ECA597A3D6B56FF9829A5E8B859E857EA95A03512E2BAE7391688D264AA5663B0341DB9CCFD2C4C5F421FEC8148001B72E848A38CAE1C65F78E56ABDEFE12D3C039B8A02D6BE593F0BBBDA56F1ECF677152EF804370C1A305CAF3B5BF130879B56C61DE584A0F53A2447A51E");
   if (ret != 0) goto cleanup;
-  if (verbose != 0) printf_va_31("  MPI test #1 (mul_mpi): ");
+  if (verbose != 0) printf("  MPI test #1 (mul_mpi): "); /* printf_va_31 */
   tmp = mpi_cmp_mpi((mpi const *)(& X),(mpi const *)(& U));
   if (tmp != 0) {
-    if (verbose != 0) printf_va_32("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_32 */
     __retres = 1;
     goto return_label;
   }
-  if (verbose != 0) printf_va_33("passed\n");
+  if (verbose != 0) printf("passed\n"); /* printf_va_33 */
   ret = mpi_div_mpi(& X,& Y,(mpi const *)(& A),(mpi const *)(& N));
   if (ret != 0) goto cleanup;
   ret = mpi_read_string(& U,16,"256567336059E52CAE22925474705F39A94");
@@ -6952,7 +6952,7 @@ int mpi_self_test(int verbose)
   ret = mpi_read_string(& V,16,
                         "6613F26162223DF488E9CD48CC132C7A0AC93C701B001B092E4E5B9F73BCD27B9EE50D0657C77F374E903CDFA4C642");
   if (ret != 0) goto cleanup;
-  if (verbose != 0) printf_va_34("  MPI test #2 (div_mpi): ");
+  if (verbose != 0) printf("  MPI test #2 (div_mpi): "); /* printf_va_34 */
   tmp_0 = mpi_cmp_mpi((mpi const *)(& X),(mpi const *)(& U));
   if (tmp_0 != 0) goto _LOR;
   else {
@@ -6961,41 +6961,41 @@ int mpi_self_test(int verbose)
     if (tmp_1 != 0) {
       _LOR:
       {
-        if (verbose != 0) printf_va_35("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_35 */
         __retres = 1;
         goto return_label;
       }
     }
   }
-  if (verbose != 0) printf_va_36("passed\n");
+  if (verbose != 0) printf("passed\n"); /* printf_va_36 */
   ret = mpi_exp_mod(& X,(mpi const *)(& A),(mpi const *)(& E),
                     (mpi const *)(& N),(mpi *)0);
   if (ret != 0) goto cleanup;
   ret = mpi_read_string(& U,16,
                         "36E139AEA55215609D2816998ED020BBBD96C37890F65171D948E9BC7CBAA4D9325D24D6A3C12710F10A09FA08AB87");
   if (ret != 0) goto cleanup;
-  if (verbose != 0) printf_va_37("  MPI test #3 (exp_mod): ");
+  if (verbose != 0) printf("  MPI test #3 (exp_mod): "); /* printf_va_37 */
   tmp_2 = mpi_cmp_mpi((mpi const *)(& X),(mpi const *)(& U));
   if (tmp_2 != 0) {
-    if (verbose != 0) printf_va_38("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_38 */
     __retres = 1;
     goto return_label;
   }
-  if (verbose != 0) printf_va_39("passed\n");
+  if (verbose != 0) printf("passed\n"); /* printf_va_39 */
   ret = mpi_inv_mod(& X,(mpi const *)(& A),(mpi const *)(& N));
   if (ret != 0) goto cleanup;
   ret = mpi_read_string(& U,16,
                         "003A0AAEDD7E784FC07D8F9EC6E3BFD5C3DBA76456363A10869622EAC2DD84ECC5B8A74DAC4D09E03B5E0BE779F2DF61");
   if (ret != 0) goto cleanup;
-  if (verbose != 0) printf_va_40("  MPI test #4 (inv_mod): ");
+  if (verbose != 0) printf("  MPI test #4 (inv_mod): "); /* printf_va_40 */
   tmp_3 = mpi_cmp_mpi((mpi const *)(& X),(mpi const *)(& U));
   if (tmp_3 != 0) {
-    if (verbose != 0) printf_va_41("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_41 */
     __retres = 1;
     goto return_label;
   }
-  if (verbose != 0) printf_va_42("passed\n");
-  if (verbose != 0) printf_va_43("  MPI test #5 (simple gcd): ");
+  if (verbose != 0) printf("passed\n"); /* printf_va_42 */
+  if (verbose != 0) printf("  MPI test #5 (simple gcd): "); /* printf_va_43 */
   i = 0;
   while (i < 3) {
     {
@@ -7008,18 +7008,18 @@ int mpi_self_test(int verbose)
       if (ret != 0) goto cleanup;
       tmp_4 = mpi_cmp_int((mpi const *)(& A),(long)gcd_pairs[i][2]);
       if (tmp_4 != 0) {
-        if (verbose != 0) printf_va_44("failed at %d\n",i);
+        if (verbose != 0) printf("failed at %d\n",i); /* printf_va_44 */
         __retres = 1;
         goto return_label;
       }
     }
     i ++;
   }
-  if (verbose != 0) printf_va_45("passed\n");
+  if (verbose != 0) printf("passed\n"); /* printf_va_45 */
   cleanup: ;
   if (ret != 0) 
-    if (verbose != 0) printf_va_46("Unexpected error, return code = %08X\n",
-                                   (unsigned int)ret);
+    if (verbose != 0) printf("Unexpected error, return code = %08X\n",
+                             (unsigned int)ret); /* printf_va_46 */
   mpi_free(& A);
   mpi_free(& E);
   mpi_free(& N);
@@ -7027,7 +7027,7 @@ int mpi_self_test(int verbose)
   mpi_free(& Y);
   mpi_free(& U);
   mpi_free(& V);
-  if (verbose != 0) printf_va_47("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_47 */
   __retres = ret;
   return_label: return __retres;
 }
@@ -9952,7 +9952,7 @@ int camellia_self_test(int verbose)
       char const *tmp;
       if (v == 0) tmp = "dec"; else tmp = "enc";
       ;
-      printf_va_48("  CAMELLIA-ECB-%3d (%s): ",128 + u * 64,(char *)tmp);
+      printf("  CAMELLIA-ECB-%3d (%s): ",128 + u * 64,(char *)tmp); /* printf_va_48 */
     }
     i = 0;
     while (i < 2) {
@@ -9982,17 +9982,17 @@ int camellia_self_test(int verbose)
         tmp_0 = memcmp((void const *)(buf),(void const *)(dst),
                        (unsigned int)16);
         if (tmp_0 != 0) {
-          if (verbose != 0) printf_va_49("failed\n");
+          if (verbose != 0) printf("failed\n"); /* printf_va_49 */
           __retres = 1;
           goto return_label;
         }
       }
       i ++;
     }
-    if (verbose != 0) printf_va_50("passed\n");
+    if (verbose != 0) printf("passed\n"); /* printf_va_50 */
     j ++;
   }
-  if (verbose != 0) printf_va_51("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_51 */
   j = 0;
   while (j < 6) {
     u = j >> 1;
@@ -10001,7 +10001,7 @@ int camellia_self_test(int verbose)
       char const *tmp_1;
       if (v == 0) tmp_1 = "dec"; else tmp_1 = "enc";
       ;
-      printf_va_52("  CAMELLIA-CBC-%3d (%s): ",128 + u * 64,(char *)tmp_1);
+      printf("  CAMELLIA-CBC-%3d (%s): ",128 + u * 64,(char *)tmp_1); /* printf_va_52 */
     }
     memcpy((void *)(src),(void const *)(camellia_test_cbc_iv),
            (unsigned int)16);
@@ -10038,17 +10038,17 @@ int camellia_self_test(int verbose)
         tmp_2 = memcmp((void const *)(buf),(void const *)(dst),
                        (unsigned int)16);
         if (tmp_2 != 0) {
-          if (verbose != 0) printf_va_53("failed\n");
+          if (verbose != 0) printf("failed\n"); /* printf_va_53 */
           __retres = 1;
           goto return_label;
         }
       }
       i ++;
     }
-    if (verbose != 0) printf_va_54("passed\n");
+    if (verbose != 0) printf("passed\n"); /* printf_va_54 */
     j ++;
   }
-  if (verbose != 0) printf_va_55("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_55 */
   i = 0;
   while (i < 6) {
     u = i >> 1;
@@ -10056,7 +10056,7 @@ int camellia_self_test(int verbose)
     if (verbose != 0) {
       char const *tmp_3;
       if (v == 0) tmp_3 = "dec"; else tmp_3 = "enc";
-      printf_va_56("  CAMELLIA-CTR-128 (%s): ",(char *)tmp_3);
+      printf("  CAMELLIA-CTR-128 (%s): ",(char *)tmp_3); /* printf_va_56 */
     }
     memcpy((void *)(nonce_counter),
            (void const *)(camellia_test_ctr_nonce_counter[u]),
@@ -10074,7 +10074,7 @@ int camellia_self_test(int verbose)
       tmp_4 = memcmp((void const *)(buf),
                      (void const *)(camellia_test_ctr_pt[u]),len);
       if (tmp_4 != 0) {
-        if (verbose != 0) printf_va_57("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_57 */
         __retres = 1;
         goto return_label;
       }
@@ -10088,15 +10088,15 @@ int camellia_self_test(int verbose)
       tmp_5 = memcmp((void const *)(buf),
                      (void const *)(camellia_test_ctr_ct[u]),len);
       if (tmp_5 != 0) {
-        if (verbose != 0) printf_va_58("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_58 */
         __retres = 1;
         goto return_label;
       }
     }
-    if (verbose != 0) printf_va_59("passed\n");
+    if (verbose != 0) printf("passed\n"); /* printf_va_59 */
     i ++;
   }
-  if (verbose != 0) printf_va_60("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_60 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -21459,76 +21459,76 @@ int ctr_drbg_self_test(int verbose)
   int tmp_5;
   int tmp_6;
   int tmp_7;
-  if (verbose != 0) printf_va_61("  CTR_DRBG (PR = TRUE) : ");
+  if (verbose != 0) printf("  CTR_DRBG (PR = TRUE) : "); /* printf_va_61 */
   test_offset = 0;
   tmp = ctr_drbg_init_entropy_len(& ctx,& ctr_drbg_self_test_entropy,
                                   (void *)(entropy_source_pr),
                                   (unsigned char const *)(nonce_pers_pr),
                                   (unsigned int)16,(unsigned int)32);
   if (tmp != 0) {
-    if (verbose != 0) printf_va_62("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_62 */
     __retres = 1;
     goto return_label;
   }
   ctr_drbg_set_prediction_resistance(& ctx,1);
   tmp_0 = ctr_drbg_random((void *)(& ctx),buf,(unsigned int)16);
   if (tmp_0 != 0) {
-    if (verbose != 0) printf_va_63("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_63 */
     __retres = 1;
     goto return_label;
   }
   tmp_1 = ctr_drbg_random((void *)(& ctx),buf,(unsigned int)16);
   if (tmp_1 != 0) {
-    if (verbose != 0) printf_va_64("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_64 */
     __retres = 1;
     goto return_label;
   }
   tmp_2 = memcmp((void const *)(buf),(void const *)(result_pr),
                  (unsigned int)16);
   if (tmp_2 != 0) {
-    if (verbose != 0) printf_va_65("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_65 */
     __retres = 1;
     goto return_label;
   }
-  if (verbose != 0) printf_va_66("passed\n");
-  if (verbose != 0) printf_va_67("  CTR_DRBG (PR = FALSE): ");
+  if (verbose != 0) printf("passed\n"); /* printf_va_66 */
+  if (verbose != 0) printf("  CTR_DRBG (PR = FALSE): "); /* printf_va_67 */
   test_offset = 0;
   tmp_3 = ctr_drbg_init_entropy_len(& ctx,& ctr_drbg_self_test_entropy,
                                     (void *)(entropy_source_nopr),
                                     (unsigned char const *)(nonce_pers_nopr),
                                     (unsigned int)16,(unsigned int)32);
   if (tmp_3 != 0) {
-    if (verbose != 0) printf_va_68("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_68 */
     __retres = 1;
     goto return_label;
   }
   tmp_4 = ctr_drbg_random((void *)(& ctx),buf,(unsigned int)16);
   if (tmp_4 != 0) {
-    if (verbose != 0) printf_va_69("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_69 */
     __retres = 1;
     goto return_label;
   }
   tmp_5 = ctr_drbg_reseed(& ctx,(unsigned char const *)0,(unsigned int)0);
   if (tmp_5 != 0) {
-    if (verbose != 0) printf_va_70("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_70 */
     __retres = 1;
     goto return_label;
   }
   tmp_6 = ctr_drbg_random((void *)(& ctx),buf,(unsigned int)16);
   if (tmp_6 != 0) {
-    if (verbose != 0) printf_va_71("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_71 */
     __retres = 1;
     goto return_label;
   }
   tmp_7 = memcmp((void const *)(buf),(void const *)(result_nopr),
                  (unsigned int)16);
   if (tmp_7 != 0) {
-    if (verbose != 0) printf_va_72("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_72 */
     __retres = 1;
     goto return_label;
   }
-  if (verbose != 0) printf_va_73("passed\n");
-  if (verbose != 0) printf_va_74("\n");
+  if (verbose != 0) printf("passed\n"); /* printf_va_73 */
+  if (verbose != 0) printf("\n"); /* printf_va_74 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -21596,8 +21596,8 @@ void debug_print_msg(ssl_context const *ssl, int level, char const *file,
   char str[512];
   int maxlen = (int)(sizeof(str) - (unsigned int)1);
   if (ssl->f_dbg == (void (*)(void *, int , char const *))0) goto return_label;
-  snprintf_va_1(str,(unsigned int)maxlen,"%s(%04d): %s\n",(char *)file,line,
-                (char *)text);
+  snprintf(str,(unsigned int)maxlen,"%s(%04d): %s\n",(char *)file,line,
+           (char *)text); /* snprintf_va_1 */
   str[maxlen] = (char)'\000';
   (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
   return_label: return;
@@ -21629,9 +21629,8 @@ void debug_print_ret(ssl_context const *ssl, int level, char const *file,
   char str[512];
   int maxlen = (int)(sizeof(str) - (unsigned int)1);
   if (ssl->f_dbg == (void (*)(void *, int , char const *))0) goto return_label;
-  snprintf_va_2(str,(unsigned int)maxlen,
-                "%s(%04d): %s() returned %d (0x%x)\n",(char *)file,line,
-                (char *)text,ret,(unsigned int)ret);
+  snprintf(str,(unsigned int)maxlen,"%s(%04d): %s() returned %d (0x%x)\n",
+           (char *)file,line,(char *)text,ret,(unsigned int)ret); /* snprintf_va_2 */
   str[maxlen] = (char)'\000';
   (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
   return_label: return;
@@ -21695,8 +21694,8 @@ void debug_print_buf(ssl_context const *ssl, int level, char const *file,
   size_t i;
   size_t maxlen = sizeof(str) - (unsigned int)1;
   if (ssl->f_dbg == (void (*)(void *, int , char const *))0) goto return_label;
-  snprintf_va_3(str,maxlen,"%s(%04d): dumping \'%s\' (%d bytes)\n",
-                (char *)file,line,(char *)text,(int)len);
+  snprintf(str,maxlen,"%s(%04d): dumping \'%s\' (%d bytes)\n",(char *)file,
+           line,(char *)text,(int)len); /* snprintf_va_3 */
   str[maxlen] = (char)'\000';
   (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
   i = (unsigned int)0;
@@ -21704,11 +21703,11 @@ void debug_print_buf(ssl_context const *ssl, int level, char const *file,
     if (i >= (size_t)4096) break;
     if (i % (unsigned int)16 == (unsigned int)0) {
       if (i > (size_t)0) (*(ssl->f_dbg))(ssl->p_dbg,level,"\n");
-      snprintf_va_4(str,maxlen,"%s(%04d): %04x: ",(char *)file,line,i);
+      snprintf(str,maxlen,"%s(%04d): %04x: ",(char *)file,line,i); /* snprintf_va_4 */
       str[maxlen] = (char)'\000';
       (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
     }
-    snprintf_va_5(str,maxlen," %02x",(unsigned int)*(buf + i));
+    snprintf(str,maxlen," %02x",(unsigned int)*(buf + i)); /* snprintf_va_5 */
     str[maxlen] = (char)'\000';
     (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
     i += (size_t)1;
@@ -21805,10 +21804,10 @@ void debug_print_mpi(ssl_context const *ssl, int level, char const *file,
       break;
     j --;
   }
-  snprintf_va_6(str,(unsigned int)maxlen,
-                "%s(%04d): value of \'%s\' (%lu bits) is:\n",(char *)file,
-                line,(char *)text,
-                (unsigned long)((n * (sizeof(t_uint) << 3) + (size_t)j) + (size_t)1));
+  snprintf(str,(unsigned int)maxlen,
+           "%s(%04d): value of \'%s\' (%lu bits) is:\n",(char *)file,line,
+           (char *)text,
+           (unsigned long)((n * (sizeof(t_uint) << 3) + (size_t)j) + (size_t)1)); /* snprintf_va_6 */
   str[maxlen] = (char)'\000';
   (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
   i = n + (size_t)1;
@@ -21826,13 +21825,12 @@ void debug_print_mpi(ssl_context const *ssl, int level, char const *file,
       else zeros = 0;
       if (j % 16 == 0) {
         if (j > 0) (*(ssl->f_dbg))(ssl->p_dbg,level,"\n");
-        snprintf_va_7(str,(unsigned int)maxlen,"%s(%04d): ",(char *)file,
-                      line);
+        snprintf(str,(unsigned int)maxlen,"%s(%04d): ",(char *)file,line); /* snprintf_va_7 */
         str[maxlen] = (char)'\000';
         (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
       }
-      snprintf_va_8(str,(unsigned int)maxlen," %02x",
-                    (unsigned int)(*(X->p + (i - (size_t)1)) >> (k << 3)) & (unsigned int)0xFF);
+      snprintf(str,(unsigned int)maxlen," %02x",
+               (unsigned int)(*(X->p + (i - (size_t)1)) >> (k << 3)) & (unsigned int)0xFF); /* snprintf_va_8 */
       str[maxlen] = (char)'\000';
       (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
       j ++;
@@ -21841,7 +21839,7 @@ void debug_print_mpi(ssl_context const *ssl, int level, char const *file,
     __Cont: i -= (size_t)1;
   }
   if (zeros == 1) {
-    snprintf_va_9(str,(unsigned int)maxlen,"%s(%04d): ",(char *)file,line);
+    snprintf(str,(unsigned int)maxlen,"%s(%04d): ",(char *)file,line); /* snprintf_va_9 */
     str[maxlen] = (char)'\000';
     (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
     (*(ssl->f_dbg))(ssl->p_dbg,level," 00");
@@ -21898,7 +21896,7 @@ void debug_print_crt(ssl_context const *ssl, int level, char const *file,
   if (ssl->f_dbg == (void (*)(void *, int , char const *))0) goto return_label;
   else 
     if (crt == (x509_cert const *)0) goto return_label;
-  snprintf_va_10(prefix,(unsigned int)maxlen,"%s(%04d): ",(char *)file,line);
+  snprintf(prefix,(unsigned int)maxlen,"%s(%04d): ",(char *)file,line); /* snprintf_va_10 */
   prefix[maxlen] = (char)'\000';
   maxlen = (int)(sizeof(str) - (unsigned int)1);
   while (crt != (x509_cert const *)0) {
@@ -21910,8 +21908,8 @@ void debug_print_crt(ssl_context const *ssl, int level, char const *file,
     ;
     ;
     ;
-    snprintf_va_11(str,(unsigned int)maxlen,"%s(%04d): %s #%d:\n%s",
-                   (char *)file,line,(char *)text,i,buf);
+    snprintf(str,(unsigned int)maxlen,"%s(%04d): %s #%d:\n%s",(char *)file,
+             line,(char *)text,i,buf); /* snprintf_va_11 */
     str[maxlen] = (char)'\000';
     (*(ssl->f_dbg))(ssl->p_dbg,level,(char const *)(str));
     debug_print_mpi(ssl,level,file,line,"crt->rsa.N",& crt->rsa.N);
@@ -23645,7 +23643,7 @@ int des_self_test(int verbose)
       if (v == 0) tmp = "dec"; else tmp = "enc";
       ;
       if (u == 0) tmp_0 = ' '; else tmp_0 = '3';
-      printf_va_75("  DES%c-ECB-%3d (%s): ",tmp_0,56 + u * 56,(char *)tmp);
+      printf("  DES%c-ECB-%3d (%s): ",tmp_0,56 + u * 56,(char *)tmp); /* printf_va_75 */
     }
     memcpy((void *)(buf),(void const *)(des3_test_buf),(unsigned int)8);
     switch (i) {
@@ -23685,17 +23683,17 @@ int des_self_test(int verbose)
         if (tmp_2 != 0) {
           _LOR:
           {
-            if (verbose != 0) printf_va_76("failed\n");
+            if (verbose != 0) printf("failed\n"); /* printf_va_76 */
             __retres = 1;
             goto return_label;
           }
         }
       }
     }
-    if (verbose != 0) printf_va_77("passed\n");
+    if (verbose != 0) printf("passed\n"); /* printf_va_77 */
     i ++;
   }
-  if (verbose != 0) printf_va_78("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_78 */
   i = 0;
   while (i < 6) {
     u = i >> 1;
@@ -23706,7 +23704,7 @@ int des_self_test(int verbose)
       if (v == 0) tmp_3 = "dec"; else tmp_3 = "enc";
       ;
       if (u == 0) tmp_4 = ' '; else tmp_4 = '3';
-      printf_va_79("  DES%c-CBC-%3d (%s): ",tmp_4,56 + u * 56,(char *)tmp_3);
+      printf("  DES%c-CBC-%3d (%s): ",tmp_4,56 + u * 56,(char *)tmp_3); /* printf_va_79 */
     }
     memcpy((void *)(iv),(void const *)(des3_test_iv),(unsigned int)8);
     memcpy((void *)(prv_0),(void const *)(des3_test_iv),(unsigned int)8);
@@ -23769,17 +23767,17 @@ int des_self_test(int verbose)
         if (tmp_7 != 0) {
           _LOR_0:
           {
-            if (verbose != 0) printf_va_80("failed\n");
+            if (verbose != 0) printf("failed\n"); /* printf_va_80 */
             __retres = 1;
             goto return_label;
           }
         }
       }
     }
-    if (verbose != 0) printf_va_81("passed\n");
+    if (verbose != 0) printf("passed\n"); /* printf_va_81 */
     i ++;
   }
-  if (verbose != 0) printf_va_82("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_82 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -26412,26 +26410,26 @@ int md5_self_test(int verbose)
   while (i < 7) {
     {
       int tmp;
-      if (verbose != 0) printf_va_83("  MD5 test #%d: ",i + 1);
+      if (verbose != 0) printf("  MD5 test #%d: ",i + 1); /* printf_va_83 */
       md5((unsigned char const *)(md5_test_buf[i]),
           (unsigned int)md5_test_buflen[i],md5sum);
       tmp = memcmp((void const *)(md5sum),(void const *)(md5_test_sum[i]),
                    (unsigned int)16);
       if (tmp != 0) {
-        if (verbose != 0) printf_va_84("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_84 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_85("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_85 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_86("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_86 */
   i = 0;
   while (i < 7) {
     {
       int tmp_0;
-      if (verbose != 0) printf_va_87("  HMAC-MD5 test #%d: ",i + 1);
+      if (verbose != 0) printf("  HMAC-MD5 test #%d: ",i + 1); /* printf_va_87 */
       if (i == 5) goto _LOR;
       else 
         if (i == 6) {
@@ -26454,15 +26452,15 @@ int md5_self_test(int verbose)
                      (void const *)(md5_hmac_test_sum[i]),
                      (unsigned int)buflen);
       if (tmp_0 != 0) {
-        if (verbose != 0) printf_va_88("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_88 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_89("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_89 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_90("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_90 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -27121,7 +27119,7 @@ int net_bind(int *fd, char const *bind_ip, int port)
                                           ((int)((unsigned short)port) & 0xFF00) >> 8));
   if (bind_ip != (char const *)0) {
     memset((void *)(c),0,sizeof(c));
-    sscanf_va_1(bind_ip,"%d.%d.%d.%d",c,& c[1],& c[2],& c[3]);
+    sscanf(bind_ip,"%d.%d.%d.%d",c,& c[1],& c[2],& c[3]); /* sscanf_va_1 */
     n = 0;
     /*@ loop unroll 4; */
     while (n < 4) {
@@ -27199,9 +27197,9 @@ int net_set_block(int fd)
 {
   int tmp_0;
   int tmp;
-  tmp = __va_fcntl_void(fd,3);
+  tmp = fcntl(fd,3); /* __va_fcntl_void */
   ;
-  tmp_0 = __va_fcntl_int(fd,4,tmp & ~ 0x800);
+  tmp_0 = fcntl(fd,4,tmp & ~ 0x800); /* __va_fcntl_int */
   return tmp_0;
 }
 
@@ -27209,9 +27207,9 @@ int net_set_nonblock(int fd)
 {
   int tmp_0;
   int tmp;
-  tmp = __va_fcntl_void(fd,3);
+  tmp = fcntl(fd,3); /* __va_fcntl_void */
   ;
-  tmp_0 = __va_fcntl_int(fd,4,tmp | 0x800);
+  tmp_0 = fcntl(fd,4,tmp | 0x800); /* __va_fcntl_int */
   return tmp_0;
 }
 
@@ -29337,7 +29335,7 @@ int rsa_self_test(int verbose)
                   "4959CBF6F8FEF750AEE6977C155579C7D8AAEA56749EA28623272E4F7D0592AF7C1F1313CAC9471B5C523BFE592F517B407A1BD76C164B93DA2D32A383E58357");
   mpi_read_string(& rsa.QP,16,
                   "9AE7FBC99546432DF71896FC239EADAEF38D18D2B2F0E2DD275AA977E2BF4411F5A3B2A5D33605AEBBCCBA7FEB9F2D2FA74206CEC169D74BF5A8C50D6F48EA08");
-  if (verbose != 0) printf_va_91("  RSA key validation: ");
+  if (verbose != 0) printf("  RSA key validation: "); /* printf_va_91 */
   tmp = rsa_check_pubkey((rsa_context const *)(& rsa));
   if (tmp != 0) goto _LOR;
   else {
@@ -29346,13 +29344,13 @@ int rsa_self_test(int verbose)
     if (tmp_0 != 0) {
       _LOR:
       {
-        if (verbose != 0) printf_va_92("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_92 */
         __retres = 1;
         goto return_label;
       }
     }
   }
-  if (verbose != 0) printf_va_93("passed\n  PKCS#1 encryption : ");
+  if (verbose != 0) printf("passed\n  PKCS#1 encryption : "); /* printf_va_93 */
   memcpy((void *)(rsa_plaintext),
          (void const *)"\252\273\314\003\002\001\000\377\377\377\377\377\021\"3\n\v\f\314\335\335\335\335\335",
          (unsigned int)24);
@@ -29360,45 +29358,45 @@ int rsa_self_test(int verbose)
                             (unsigned char const *)(rsa_plaintext),
                             rsa_ciphertext);
   if (tmp_1 != 0) {
-    if (verbose != 0) printf_va_94("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_94 */
     __retres = 1;
     goto return_label;
   }
-  if (verbose != 0) printf_va_95("passed\n  PKCS#1 decryption : ");
+  if (verbose != 0) printf("passed\n  PKCS#1 decryption : "); /* printf_va_95 */
   tmp_2 = rsa_pkcs1_decrypt(& rsa,1,& len,
                             (unsigned char const *)(rsa_ciphertext),
                             rsa_decrypted,sizeof(rsa_decrypted));
   if (tmp_2 != 0) {
-    if (verbose != 0) printf_va_96("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_96 */
     __retres = 1;
     goto return_label;
   }
   tmp_3 = memcmp((void const *)(rsa_decrypted),(void const *)(rsa_plaintext),
                  len);
   if (tmp_3 != 0) {
-    if (verbose != 0) printf_va_97("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_97 */
     __retres = 1;
     goto return_label;
   }
-  if (verbose != 0) printf_va_98("passed\n  PKCS#1 data sign  : ");
+  if (verbose != 0) printf("passed\n  PKCS#1 data sign  : "); /* printf_va_98 */
   sha1((unsigned char const *)(rsa_plaintext),(unsigned int)24,sha1sum);
   tmp_4 = rsa_pkcs1_sign(& rsa,(int (*)(void *, unsigned char *, size_t ))0,
                          (void *)0,1,5,(unsigned int)20,
                          (unsigned char const *)(sha1sum),rsa_ciphertext);
   if (tmp_4 != 0) {
-    if (verbose != 0) printf_va_99("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_99 */
     __retres = 1;
     goto return_label;
   }
-  if (verbose != 0) printf_va_100("passed\n  PKCS#1 sig. verify: ");
+  if (verbose != 0) printf("passed\n  PKCS#1 sig. verify: "); /* printf_va_100 */
   tmp_5 = rsa_pkcs1_verify(& rsa,0,5,(unsigned int)20,
                            (unsigned char const *)(sha1sum),rsa_ciphertext);
   if (tmp_5 != 0) {
-    if (verbose != 0) printf_va_101("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_101 */
     __retres = 1;
     goto return_label;
   }
-  if (verbose != 0) printf_va_102("passed\n\n");
+  if (verbose != 0) printf("passed\n\n"); /* printf_va_102 */
   rsa_free(& rsa);
   __retres = 0;
   return_label: return __retres;
@@ -31021,7 +31019,7 @@ int sha1_self_test(int verbose)
   while (i < 3) {
     {
       int tmp;
-      if (verbose != 0) printf_va_103("  SHA-1 test #%d: ",i + 1);
+      if (verbose != 0) printf("  SHA-1 test #%d: ",i + 1); /* printf_va_103 */
       sha1_starts(& ctx);
       if (i == 2) {
         buflen = 1000;
@@ -31039,20 +31037,20 @@ int sha1_self_test(int verbose)
       tmp = memcmp((void const *)(sha1sum),(void const *)(sha1_test_sum[i]),
                    (unsigned int)20);
       if (tmp != 0) {
-        if (verbose != 0) printf_va_104("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_104 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_105("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_105 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_106("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_106 */
   i = 0;
   while (i < 7) {
     {
       int tmp_0;
-      if (verbose != 0) printf_va_107("  HMAC-SHA-1 test #%d: ",i + 1);
+      if (verbose != 0) printf("  HMAC-SHA-1 test #%d: ",i + 1); /* printf_va_107 */
       if (i == 5) goto _LOR;
       else 
         if (i == 6) {
@@ -31075,15 +31073,15 @@ int sha1_self_test(int verbose)
                      (void const *)(sha1_hmac_test_sum[i]),
                      (unsigned int)buflen);
       if (tmp_0 != 0) {
-        if (verbose != 0) printf_va_108("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_108 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_109("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_109 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_110("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_110 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -33816,8 +33814,7 @@ int sha2_self_test(int verbose)
       int tmp;
       j = i % 3;
       k = i < 3;
-      if (verbose != 0) printf_va_111("  SHA-%d test #%d: ",256 - k * 32,
-                                      j + 1);
+      if (verbose != 0) printf("  SHA-%d test #%d: ",256 - k * 32,j + 1); /* printf_va_111 */
       sha2_starts(& ctx,k);
       if (j == 2) {
         buflen = 1000;
@@ -33835,23 +33832,22 @@ int sha2_self_test(int verbose)
       tmp = memcmp((void const *)(sha2sum),(void const *)(sha2_test_sum[i]),
                    (unsigned int)(32 - k * 4));
       if (tmp != 0) {
-        if (verbose != 0) printf_va_112("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_112 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_113("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_113 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_114("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_114 */
   i = 0;
   while (i < 14) {
     {
       int tmp_0;
       j = i % 7;
       k = i < 7;
-      if (verbose != 0) printf_va_115("  HMAC-SHA-%d test #%d: ",
-                                      256 - k * 32,j + 1);
+      if (verbose != 0) printf("  HMAC-SHA-%d test #%d: ",256 - k * 32,j + 1); /* printf_va_115 */
       if (j == 5) goto _LOR;
       else 
         if (j == 6) {
@@ -33874,15 +33870,15 @@ int sha2_self_test(int verbose)
                      (void const *)(sha2_hmac_test_sum[i]),
                      (unsigned int)buflen);
       if (tmp_0 != 0) {
-        if (verbose != 0) printf_va_116("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_116 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_117("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_117 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_118("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_118 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -36259,8 +36255,7 @@ int sha4_self_test(int verbose)
       int tmp;
       j = i % 3;
       k = i < 3;
-      if (verbose != 0) printf_va_119("  SHA-%d test #%d: ",512 - k * 128,
-                                      j + 1);
+      if (verbose != 0) printf("  SHA-%d test #%d: ",512 - k * 128,j + 1); /* printf_va_119 */
       sha4_starts(& ctx,k);
       if (j == 2) {
         buflen = 1000;
@@ -36278,23 +36273,23 @@ int sha4_self_test(int verbose)
       tmp = memcmp((void const *)(sha4sum),(void const *)(sha4_test_sum[i]),
                    (unsigned int)(64 - k * 16));
       if (tmp != 0) {
-        if (verbose != 0) printf_va_120("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_120 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_121("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_121 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_122("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_122 */
   i = 0;
   while (i < 14) {
     {
       int tmp_0;
       j = i % 7;
       k = i < 7;
-      if (verbose != 0) printf_va_123("  HMAC-SHA-%d test #%d: ",
-                                      512 - k * 128,j + 1);
+      if (verbose != 0) printf("  HMAC-SHA-%d test #%d: ",512 - k * 128,
+                               j + 1); /* printf_va_123 */
       if (j == 5) goto _LOR;
       else 
         if (j == 6) {
@@ -36317,15 +36312,15 @@ int sha4_self_test(int verbose)
                      (void const *)(sha4_hmac_test_sum[i]),
                      (unsigned int)buflen);
       if (tmp_0 != 0) {
-        if (verbose != 0) printf_va_124("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_124 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_125("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_125 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_126("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_126 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -39695,9 +39690,9 @@ static int x509_get_time(unsigned char **p, unsigned char const *end,
     else tmp = sizeof(date) - (unsigned int)1;
     ;
     memcpy((void *)(date),(void const *)*p,tmp);
-    tmp_0 = sscanf_va_2((char const *)(date),"%2d%2d%2d%2d%2d%2d",
-                        & time_0->year,& time_0->mon,& time_0->day,
-                        & time_0->hour,& time_0->min,& time_0->sec);
+    tmp_0 = sscanf((char const *)(date),"%2d%2d%2d%2d%2d%2d",& time_0->year,
+                   & time_0->mon,& time_0->day,& time_0->hour,& time_0->min,
+                   & time_0->sec); /* sscanf_va_2 */
     if (tmp_0 < 5) {
       __retres = -0x2400;
       goto return_label;
@@ -39723,9 +39718,9 @@ static int x509_get_time(unsigned char **p, unsigned char const *end,
       else tmp_1 = sizeof(date) - (unsigned int)1;
       ;
       memcpy((void *)(date),(void const *)*p,tmp_1);
-      tmp_2 = sscanf_va_3((char const *)(date),"%4d%2d%2d%2d%2d%2d",
-                          & time_0->year,& time_0->mon,& time_0->day,
-                          & time_0->hour,& time_0->min,& time_0->sec);
+      tmp_2 = sscanf((char const *)(date),"%4d%2d%2d%2d%2d%2d",
+                     & time_0->year,& time_0->mon,& time_0->day,
+                     & time_0->hour,& time_0->min,& time_0->sec); /* sscanf_va_3 */
       if (tmp_2 < 5) {
         __retres = -0x2400;
         goto return_label;
@@ -41542,7 +41537,7 @@ int x509parse_dn_gets(char *buf, size_t size, x509_name const *dn)
   n = size;
   while (name != (x509_name const *)0) {
     if (name != dn) {
-      ret = snprintf_va_12(p,n,", ");
+      ret = snprintf(p,n,", "); /* snprintf_va_12 */
       if (ret == -1) {
         __retres = -1;
         goto return_label;
@@ -41561,21 +41556,21 @@ int x509parse_dn_gets(char *buf, size_t size, x509_name const *dn)
                      (unsigned int)2);
       if (tmp_0 == 0) {
         switch ((int)*(name->oid.p + 2)) {
-          case 3: ret = snprintf_va_13(p,n,"CN=");
+          case 3: ret = snprintf(p,n,"CN="); /* snprintf_va_13 */
           break;
-          case 6: ret = snprintf_va_14(p,n,"C=");
+          case 6: ret = snprintf(p,n,"C="); /* snprintf_va_14 */
           break;
-          case 7: ret = snprintf_va_15(p,n,"L=");
+          case 7: ret = snprintf(p,n,"L="); /* snprintf_va_15 */
           break;
-          case 8: ret = snprintf_va_16(p,n,"ST=");
+          case 8: ret = snprintf(p,n,"ST="); /* snprintf_va_16 */
           break;
-          case 10: ret = snprintf_va_17(p,n,"O=");
+          case 10: ret = snprintf(p,n,"O="); /* snprintf_va_17 */
           break;
-          case 11: ret = snprintf_va_18(p,n,"OU=");
+          case 11: ret = snprintf(p,n,"OU="); /* snprintf_va_18 */
           break;
           default:
-          ret = snprintf_va_19(p,n,"0x%02X=",
-                               (unsigned int)((int)*(name->oid.p + 2)));
+          ret = snprintf(p,n,"0x%02X=",
+                         (unsigned int)((int)*(name->oid.p + 2))); /* snprintf_va_19 */
           break;
         }
         if (ret == -1) {
@@ -41600,11 +41595,11 @@ int x509parse_dn_gets(char *buf, size_t size, x509_name const *dn)
                      (void const *)"*\206H\206\367\r\001\t",(unsigned int)8);
         if (tmp == 0) {
           switch ((int)*(name->oid.p + 8)) {
-            case 1: ret = snprintf_va_20(p,n,"emailAddress=");
+            case 1: ret = snprintf(p,n,"emailAddress="); /* snprintf_va_20 */
             break;
             default:
-            ret = snprintf_va_21(p,n,"0x%02X=",
-                                 (unsigned int)((int)*(name->oid.p + 8)));
+            ret = snprintf(p,n,"0x%02X=",
+                           (unsigned int)((int)*(name->oid.p + 8))); /* snprintf_va_21 */
             break;
           }
           if (ret == -1) {
@@ -41624,7 +41619,7 @@ int x509parse_dn_gets(char *buf, size_t size, x509_name const *dn)
       else {
         _LAND:
         {
-          ret = snprintf_va_22(p,n,"?\?=");
+          ret = snprintf(p,n,"?\?="); /* snprintf_va_22 */
           if (ret == -1) {
             __retres = -1;
             goto return_label;
@@ -41653,7 +41648,7 @@ int x509parse_dn_gets(char *buf, size_t size, x509_name const *dn)
       i += (size_t)1;
     }
     s[i] = (char)'\000';
-    ret = snprintf_va_23(p,n,"%s",s);
+    ret = snprintf(p,n,"%s",s); /* snprintf_va_23 */
     if (ret == -1) {
       __retres = -1;
       goto return_label;
@@ -41723,8 +41718,8 @@ int x509parse_serial_gets(char *buf, size_t size, x509_buf const *serial)
       ;
       ;
       ;
-      ret = snprintf_va_24(p,n,"%02X%s",
-                           (unsigned int)((int)*(serial->p + i)),(char *)tmp);
+      ret = snprintf(p,n,"%02X%s",(unsigned int)((int)*(serial->p + i)),
+                     (char *)tmp); /* snprintf_va_24 */
       if (ret == -1) {
         __retres = -1;
         goto return_label;
@@ -41740,7 +41735,7 @@ int x509parse_serial_gets(char *buf, size_t size, x509_buf const *serial)
     __Cont: i += (size_t)1;
   }
   if (nr != serial->len) {
-    ret = snprintf_va_25(p,n,"....");
+    ret = snprintf(p,n,"...."); /* snprintf_va_25 */
     if (ret == -1) {
       __retres = -1;
       goto return_label;
@@ -42004,8 +41999,7 @@ int x509parse_cert_info(char *buf, size_t size, char const *prefix,
   char *p;
   p = buf;
   n = size;
-  ret = snprintf_va_26(p,n,"%scert. version : %d\n",(char *)prefix,
-                       crt->version);
+  ret = snprintf(p,n,"%scert. version : %d\n",(char *)prefix,crt->version); /* snprintf_va_26 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42017,7 +42011,7 @@ int x509parse_cert_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_27(p,n,"%sserial number : ",(char *)prefix);
+  ret = snprintf(p,n,"%sserial number : ",(char *)prefix); /* snprintf_va_27 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42041,7 +42035,7 @@ int x509parse_cert_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_28(p,n,"\n%sissuer name   : ",(char *)prefix);
+  ret = snprintf(p,n,"\n%sissuer name   : ",(char *)prefix); /* snprintf_va_28 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42065,7 +42059,7 @@ int x509parse_cert_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_29(p,n,"\n%ssubject name  : ",(char *)prefix);
+  ret = snprintf(p,n,"\n%ssubject name  : ",(char *)prefix); /* snprintf_va_29 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42089,12 +42083,10 @@ int x509parse_cert_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_30(p,n,
-                       "\n%sissued  on    : %04d-%02d-%02d %02d:%02d:%02d",
-                       (char *)prefix,crt->valid_from.year,
-                       crt->valid_from.mon,crt->valid_from.day,
-                       crt->valid_from.hour,crt->valid_from.min,
-                       crt->valid_from.sec);
+  ret = snprintf(p,n,"\n%sissued  on    : %04d-%02d-%02d %02d:%02d:%02d",
+                 (char *)prefix,crt->valid_from.year,crt->valid_from.mon,
+                 crt->valid_from.day,crt->valid_from.hour,
+                 crt->valid_from.min,crt->valid_from.sec); /* snprintf_va_30 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42106,11 +42098,10 @@ int x509parse_cert_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_31(p,n,
-                       "\n%sexpires on    : %04d-%02d-%02d %02d:%02d:%02d",
-                       (char *)prefix,crt->valid_to.year,crt->valid_to.mon,
-                       crt->valid_to.day,crt->valid_to.hour,
-                       crt->valid_to.min,crt->valid_to.sec);
+  ret = snprintf(p,n,"\n%sexpires on    : %04d-%02d-%02d %02d:%02d:%02d",
+                 (char *)prefix,crt->valid_to.year,crt->valid_to.mon,
+                 crt->valid_to.day,crt->valid_to.hour,crt->valid_to.min,
+                 crt->valid_to.sec); /* snprintf_va_31 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42122,7 +42113,7 @@ int x509parse_cert_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_32(p,n,"\n%ssigned using  : RSA+",(char *)prefix);
+  ret = snprintf(p,n,"\n%ssigned using  : RSA+",(char *)prefix); /* snprintf_va_32 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42135,23 +42126,23 @@ int x509parse_cert_info(char *buf, size_t size, char const *prefix,
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
   switch (crt->sig_alg) {
-    case 2: ret = snprintf_va_33(p,n,"MD2");
+    case 2: ret = snprintf(p,n,"MD2"); /* snprintf_va_33 */
     break;
-    case 3: ret = snprintf_va_34(p,n,"MD4");
+    case 3: ret = snprintf(p,n,"MD4"); /* snprintf_va_34 */
     break;
-    case 4: ret = snprintf_va_35(p,n,"MD5");
+    case 4: ret = snprintf(p,n,"MD5"); /* snprintf_va_35 */
     break;
-    case 5: ret = snprintf_va_36(p,n,"SHA1");
+    case 5: ret = snprintf(p,n,"SHA1"); /* snprintf_va_36 */
     break;
-    case 14: ret = snprintf_va_37(p,n,"SHA224");
+    case 14: ret = snprintf(p,n,"SHA224"); /* snprintf_va_37 */
     break;
-    case 11: ret = snprintf_va_38(p,n,"SHA256");
+    case 11: ret = snprintf(p,n,"SHA256"); /* snprintf_va_38 */
     break;
-    case 12: ret = snprintf_va_39(p,n,"SHA384");
+    case 12: ret = snprintf(p,n,"SHA384"); /* snprintf_va_39 */
     break;
-    case 13: ret = snprintf_va_40(p,n,"SHA512");
+    case 13: ret = snprintf(p,n,"SHA512"); /* snprintf_va_40 */
     break;
-    default: ret = snprintf_va_41(p,n,"?\?\?");
+    default: ret = snprintf(p,n,"?\?\?"); /* snprintf_va_41 */
     break;
   }
   if (ret == -1) {
@@ -42165,8 +42156,8 @@ int x509parse_cert_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_42(p,n,"\n%sRSA key size  : %d bits\n",(char *)prefix,
-                       ((int)crt->rsa.N.n * (int)sizeof(unsigned long)) * 8);
+  ret = snprintf(p,n,"\n%sRSA key size  : %d bits\n",(char *)prefix,
+                 ((int)crt->rsa.N.n * (int)sizeof(unsigned long)) * 8); /* snprintf_va_42 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42306,8 +42297,8 @@ int x509_oid_get_numeric_string(char *buf, size_t size, x509_buf *oid)
   p = buf;
   n = size;
   if (oid->len > (size_t)0) {
-    ret = snprintf_va_43(p,n,"%d.%d",(int)*(oid->p + 0) / 40,
-                         (int)*(oid->p + 0) % 40);
+    ret = snprintf(p,n,"%d.%d",(int)*(oid->p + 0) / 40,
+                   (int)*(oid->p + 0) % 40); /* snprintf_va_43 */
     if (ret == -1) {
       __retres = -1;
       goto return_label;
@@ -42326,7 +42317,7 @@ int x509_oid_get_numeric_string(char *buf, size_t size, x509_buf *oid)
     value <<= 7;
     value += (unsigned int)((int)*(oid->p + i) & 0x7F);
     if (! ((int)*(oid->p + i) & 0x80)) {
-      ret = snprintf_va_44(p,n,".%d",(int)value);
+      ret = snprintf(p,n,".%d",(int)value); /* snprintf_va_44 */
       if (ret == -1) {
         __retres = -1;
         goto return_label;
@@ -42607,8 +42598,7 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
   x509_crl_entry const *entry;
   p = buf;
   n = size;
-  ret = snprintf_va_45(p,n,"%sCRL version   : %d",(char *)prefix,
-                       crl->version);
+  ret = snprintf(p,n,"%sCRL version   : %d",(char *)prefix,crl->version); /* snprintf_va_45 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42620,7 +42610,7 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_46(p,n,"\n%sissuer name   : ",(char *)prefix);
+  ret = snprintf(p,n,"\n%sissuer name   : ",(char *)prefix); /* snprintf_va_46 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42644,12 +42634,10 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_47(p,n,
-                       "\n%sthis update   : %04d-%02d-%02d %02d:%02d:%02d",
-                       (char *)prefix,crl->this_update.year,
-                       crl->this_update.mon,crl->this_update.day,
-                       crl->this_update.hour,crl->this_update.min,
-                       crl->this_update.sec);
+  ret = snprintf(p,n,"\n%sthis update   : %04d-%02d-%02d %02d:%02d:%02d",
+                 (char *)prefix,crl->this_update.year,crl->this_update.mon,
+                 crl->this_update.day,crl->this_update.hour,
+                 crl->this_update.min,crl->this_update.sec); /* snprintf_va_47 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42661,12 +42649,10 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_48(p,n,
-                       "\n%snext update   : %04d-%02d-%02d %02d:%02d:%02d",
-                       (char *)prefix,crl->next_update.year,
-                       crl->next_update.mon,crl->next_update.day,
-                       crl->next_update.hour,crl->next_update.min,
-                       crl->next_update.sec);
+  ret = snprintf(p,n,"\n%snext update   : %04d-%02d-%02d %02d:%02d:%02d",
+                 (char *)prefix,crl->next_update.year,crl->next_update.mon,
+                 crl->next_update.day,crl->next_update.hour,
+                 crl->next_update.min,crl->next_update.sec); /* snprintf_va_48 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42679,7 +42665,7 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
   entry = & crl->entry;
-  ret = snprintf_va_49(p,n,"\n%sRevoked certificates:",(char *)prefix);
+  ret = snprintf(p,n,"\n%sRevoked certificates:",(char *)prefix); /* snprintf_va_49 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42696,7 +42682,7 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
       if (! (entry->raw.len != (size_t)0)) break;
     }
     else break;
-    ret = snprintf_va_50(p,n,"\n%sserial number: ",(char *)prefix);
+    ret = snprintf(p,n,"\n%sserial number: ",(char *)prefix); /* snprintf_va_50 */
     if (ret == -1) {
       __retres = -1;
       goto return_label;
@@ -42720,14 +42706,10 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
     }
     n -= (unsigned int)ret;
     p += (unsigned int)ret;
-    ret = snprintf_va_51(p,n,
-                         " revocation date: %04d-%02d-%02d %02d:%02d:%02d",
-                         entry->revocation_date.year,
-                         entry->revocation_date.mon,
-                         entry->revocation_date.day,
-                         entry->revocation_date.hour,
-                         entry->revocation_date.min,
-                         entry->revocation_date.sec);
+    ret = snprintf(p,n," revocation date: %04d-%02d-%02d %02d:%02d:%02d",
+                   entry->revocation_date.year,entry->revocation_date.mon,
+                   entry->revocation_date.day,entry->revocation_date.hour,
+                   entry->revocation_date.min,entry->revocation_date.sec); /* snprintf_va_51 */
     if (ret == -1) {
       __retres = -1;
       goto return_label;
@@ -42741,7 +42723,7 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
     p += (unsigned int)ret;
     entry = (x509_crl_entry const *)entry->next;
   }
-  ret = snprintf_va_52(p,n,"\n%ssigned using  : RSA+",(char *)prefix);
+  ret = snprintf(p,n,"\n%ssigned using  : RSA+",(char *)prefix); /* snprintf_va_52 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -42754,23 +42736,23 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
   switch (crl->sig_alg) {
-    case 2: ret = snprintf_va_53(p,n,"MD2");
+    case 2: ret = snprintf(p,n,"MD2"); /* snprintf_va_53 */
     break;
-    case 3: ret = snprintf_va_54(p,n,"MD4");
+    case 3: ret = snprintf(p,n,"MD4"); /* snprintf_va_54 */
     break;
-    case 4: ret = snprintf_va_55(p,n,"MD5");
+    case 4: ret = snprintf(p,n,"MD5"); /* snprintf_va_55 */
     break;
-    case 5: ret = snprintf_va_56(p,n,"SHA1");
+    case 5: ret = snprintf(p,n,"SHA1"); /* snprintf_va_56 */
     break;
-    case 14: ret = snprintf_va_57(p,n,"SHA224");
+    case 14: ret = snprintf(p,n,"SHA224"); /* snprintf_va_57 */
     break;
-    case 11: ret = snprintf_va_58(p,n,"SHA256");
+    case 11: ret = snprintf(p,n,"SHA256"); /* snprintf_va_58 */
     break;
-    case 12: ret = snprintf_va_59(p,n,"SHA384");
+    case 12: ret = snprintf(p,n,"SHA384"); /* snprintf_va_59 */
     break;
-    case 13: ret = snprintf_va_60(p,n,"SHA512");
+    case 13: ret = snprintf(p,n,"SHA512"); /* snprintf_va_60 */
     break;
-    default: ret = snprintf_va_61(p,n,"?\?\?");
+    default: ret = snprintf(p,n,"?\?\?"); /* snprintf_va_61 */
     break;
   }
   if (ret == -1) {
@@ -42784,7 +42766,7 @@ int x509parse_crl_info(char *buf, size_t size, char const *prefix,
   }
   n -= (unsigned int)ret;
   p += (unsigned int)ret;
-  ret = snprintf_va_62(p,n,"\n");
+  ret = snprintf(p,n,"\n"); /* snprintf_va_62 */
   if (ret == -1) {
     __retres = -1;
     goto return_label;
@@ -43349,12 +43331,12 @@ int x509_self_test(int verbose)
   dhm_context dhm;
   size_t tmp;
   size_t tmp_0;
-  if (verbose != 0) printf_va_127("  X.509 certificate load: ");
+  if (verbose != 0) printf("  X.509 certificate load: "); /* printf_va_127 */
   memset((void *)(& clicert),0,sizeof(x509_cert));
   tmp = strlen(test_cli_crt);
   ret = x509parse_crt(& clicert,(unsigned char const *)(test_cli_crt),tmp);
   if (ret != 0) {
-    if (verbose != 0) printf_va_128("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_128 */
     __retres = ret;
     goto return_label;
   }
@@ -43362,42 +43344,42 @@ int x509_self_test(int verbose)
   tmp_0 = strlen(test_ca_crt);
   ret = x509parse_crt(& cacert,(unsigned char const *)(test_ca_crt),tmp_0);
   if (ret != 0) {
-    if (verbose != 0) printf_va_129("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_129 */
     __retres = ret;
     goto return_label;
   }
-  if (verbose != 0) printf_va_130("passed\n  X.509 private key load: ");
+  if (verbose != 0) printf("passed\n  X.509 private key load: "); /* printf_va_130 */
   i = strlen(test_ca_key);
   j = strlen(test_ca_pwd);
   rsa_init(& rsa,0,0);
   ret = x509parse_key(& rsa,(unsigned char const *)(test_ca_key),i,
                       (unsigned char const *)(test_ca_pwd),j);
   if (ret != 0) {
-    if (verbose != 0) printf_va_131("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_131 */
     __retres = ret;
     goto return_label;
   }
-  if (verbose != 0) printf_va_132("passed\n  X.509 signature verify: ");
+  if (verbose != 0) printf("passed\n  X.509 signature verify: "); /* printf_va_132 */
   ret = x509parse_verify(& clicert,& cacert,(x509_crl *)0,
                          "PolarSSL Client 2",& flags,
                          (int (*)(void *, x509_cert *, int , int ))0,
                          (void *)0);
   if (ret != 0) {
-    printf_va_133("%02x",(unsigned int)flags);
-    if (verbose != 0) printf_va_134("failed\n");
+    printf("%02x",(unsigned int)flags); /* printf_va_133 */
+    if (verbose != 0) printf("failed\n"); /* printf_va_134 */
     __retres = ret;
     goto return_label;
   }
-  if (verbose != 0) printf_va_135("passed\n  X.509 DHM parameter load: ");
+  if (verbose != 0) printf("passed\n  X.509 DHM parameter load: "); /* printf_va_135 */
   i = strlen(test_dhm_params);
   j = strlen(test_ca_pwd);
   ret = x509parse_dhm(& dhm,(unsigned char const *)(test_dhm_params),i);
   if (ret != 0) {
-    if (verbose != 0) printf_va_136("failed\n");
+    if (verbose != 0) printf("failed\n"); /* printf_va_136 */
     __retres = ret;
     goto return_label;
   }
-  if (verbose != 0) printf_va_137("passed\n\n");
+  if (verbose != 0) printf("passed\n\n"); /* printf_va_137 */
   x509_free(& cacert);
   x509_free(& clicert);
   rsa_free(& rsa);
@@ -43771,22 +43753,22 @@ int xtea_self_test(int verbose)
   while (i < 6) {
     {
       int tmp;
-      if (verbose != 0) printf_va_138("  XTEA test #%d: ",i + 1);
+      if (verbose != 0) printf("  XTEA test #%d: ",i + 1); /* printf_va_138 */
       memcpy((void *)(buf),(void const *)(xtea_test_pt[i]),(unsigned int)8);
       xtea_setup(& ctx,(unsigned char *)(xtea_test_key[i]));
       xtea_crypt_ecb(& ctx,1,buf,buf);
       tmp = memcmp((void const *)(buf),(void const *)(xtea_test_ct[i]),
                    (unsigned int)8);
       if (tmp != 0) {
-        if (verbose != 0) printf_va_139("failed\n");
+        if (verbose != 0) printf("failed\n"); /* printf_va_139 */
         __retres = 1;
         goto return_label;
       }
-      if (verbose != 0) printf_va_140("passed\n");
+      if (verbose != 0) printf("passed\n"); /* printf_va_140 */
     }
     i ++;
   }
-  if (verbose != 0) printf_va_141("\n");
+  if (verbose != 0) printf("\n"); /* printf_va_141 */
   __retres = 0;
   return_label: return __retres;
 }
@@ -43829,7 +43811,7 @@ int fprintf_va_1(FILE * __restrict stream, char const * __restrict format,
 void my_debug(void *ctx, int level, char const *str)
 {
   if (level < 0) {
-    fprintf_va_1((FILE *)ctx,"%s",(char *)str);
+    fprintf((FILE *)ctx,"%s",(char *)str); /* fprintf_va_1 */
     fflush((FILE *)ctx);
   }
   return;
diff --git a/qlz/.frama-c/qlz-stream-compress.parse/framac.ast b/qlz/.frama-c/qlz-stream-compress.parse/framac.ast
index c1ad167da0407516a706566b37bcef45923d8ee0..1f2246b9d9e6d44a1b107942eee52068b8a2f543 100644
--- a/qlz/.frama-c/qlz-stream-compress.parse/framac.ast
+++ b/qlz/.frama-c/qlz-stream-compress.parse/framac.ast
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
               (unsigned int)(tmp_2 % 10000 + 1),ifile);
     if (! (d != (size_t)0)) break;
     c = qlz_compress((void const *)file_data,compressed,d,state_compress);
-    printf_va_1("%u bytes compressed into %u\n",d,c);
+    printf("%u bytes compressed into %u\n",d,c); /* printf_va_1 */
     fwrite((void const *)compressed,c,(unsigned int)1,ofile);
   }
   fclose(ifile);
diff --git a/qlz/.frama-c/qlz-stream-decompress.parse/framac.ast b/qlz/.frama-c/qlz-stream-decompress.parse/framac.ast
index c4e1dd552144b3b88b596611277cdcba2180078e..0255daed56831a594da951086f5a0813c7aa9076 100644
--- a/qlz/.frama-c/qlz-stream-decompress.parse/framac.ast
+++ b/qlz/.frama-c/qlz-stream-decompress.parse/framac.ast
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
     fread((void *)(file_data + 9),(unsigned int)1,c - (size_t)9,ifile);
     d = qlz_decompress((char const *)file_data,(void *)decompressed,
                        state_decompress);
-    printf_va_1("%u bytes decompressed into %u.\n",c,d);
+    printf("%u bytes decompressed into %u.\n",c,d); /* printf_va_1 */
     fwrite((void const *)decompressed,d,(unsigned int)1,ofile);
   }
   fclose(ifile);
diff --git a/safestringlib/.frama-c/intelsafestringlib.parse/framac.ast b/safestringlib/.frama-c/intelsafestringlib.parse/framac.ast
index 26497d7f5fbdc5792256c83c82fe582640498a06..e93c95046ed7448fe059681ada4adbd8e5c17070 100644
--- a/safestringlib/.frama-c/intelsafestringlib.parse/framac.ast
+++ b/safestringlib/.frama-c/intelsafestringlib.parse/framac.ast
@@ -208,8 +208,8 @@ void abort_handler_s(char const *msg, void *ptr, errno_t error)
   if (msg) tmp = msg; else tmp = "Null message";
   ;
   ;
-  fprintf_va_1(__fc_stderr,"ABORT CONSTRAINT HANDLER: (%u) %s\n",
-               (unsigned int)error,(char *)tmp);
+  fprintf(__fc_stderr,"ABORT CONSTRAINT HANDLER: (%u) %s\n",
+          (unsigned int)error,(char *)tmp); /* fprintf_va_1 */
   abort();
   return;
 }
@@ -3109,9 +3109,10 @@ unsigned int parse_format(char const *format, char *pformatList,
         break;
         case 'm': index_0 ++;
         continue;
-        default: printf_va_1("failed to recognize format string [");
+        default:
+        printf("failed to recognize format string ["); /* printf_va_1 */
         while (start < index_0) {
-          printf_va_2("%c",(int)*(format + start));
+          printf("%c",(int)*(format + start)); /* printf_va_2 */
           start ++;
         }
         puts("]");
@@ -8044,7 +8045,7 @@ int main(void)
     if (-1 * 410 == err) puts("snprintf_s_si returned failure: Error Bad Format String.");
     else 
       if (-1 * 411 == err) puts("snprintf_s_si returned failure: Error Bad Argument Type for format string.");
-      else printf_va_3("snprintf_s_si failed with unknown error: %d\n",err);
+      else printf("snprintf_s_si failed with unknown error: %d\n",err); /* printf_va_3 */
   else {
     errno_t tmp_0;
     tmp_0 = strcmp_s((char const *)(src),smax,
@@ -8546,10 +8547,9 @@ int test_memcpy16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != (int)mem2_4[i]) printf_va_4("%d - %d m1=%d  m2=%d  \n",
-                                                      86,(int)i,
-                                                      (int)mem1_6[i],
-                                                      (int)mem2_4[i]);
+    if ((int)mem1_6[i] != (int)mem2_4[i]) printf("%d - %d m1=%d  m2=%d  \n",
+                                                 86,(int)i,(int)mem1_6[i],
+                                                 (int)mem2_4[i]); /* printf_va_4 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8567,10 +8567,9 @@ int test_memcpy16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != (int)mem2_4[i]) printf_va_5("%d - %d m1=%d  m2=%d  \n",
-                                                      105,(int)i,
-                                                      (int)mem1_6[i],
-                                                      (int)mem2_4[i]);
+    if ((int)mem1_6[i] != (int)mem2_4[i]) printf("%d - %d m1=%d  m2=%d  \n",
+                                                 105,(int)i,(int)mem1_6[i],
+                                                 (int)mem2_4[i]); /* printf_va_5 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8588,9 +8587,8 @@ int test_memcpy16_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < (uint32_t)(1024 / 2)) {
-    if ((int)mem1_6[i] != 0) printf_va_6("%d - %d m1=%d  m2=%d  \n",125,
-                                         (int)i,(int)mem1_6[i],
-                                         (int)mem2_4[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",125,(int)i,
+                                    (int)mem1_6[i],(int)mem2_4[i]); /* printf_va_6 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8608,9 +8606,8 @@ int test_memcpy16_s(void)
   if (rc != 401) ;
   i = (unsigned int)0;
   while (i < (uint32_t)1024) {
-    if ((int)mem1_6[i] != 0) printf_va_7("%d - %d m1=%d  m2=%d  \n",144,
-                                         (int)i,(int)mem1_6[i],
-                                         (int)mem2_4[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",144,(int)i,
+                                    (int)mem1_6[i],(int)mem2_4[i]); /* printf_va_7 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8628,9 +8625,8 @@ int test_memcpy16_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < (uint32_t)1024) {
-    if ((int)mem1_6[i] != 0) printf_va_8("%d - %d m1=%d  m2=%d  \n",163,
-                                         (int)i,(int)mem1_6[i],
-                                         (int)mem2_4[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",163,(int)i,
+                                    (int)mem1_6[i],(int)mem2_4[i]); /* printf_va_8 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8661,8 +8657,8 @@ int test_memcpy16_s(void)
   if (rc != 404) ;
   i = (unsigned int)0;
   while (i < (uint32_t)100) {
-    if ((int)mem1_6[i] != 0) printf_va_9("%d - %d m1=%d  \n",195,(int)i,
-                                         (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d  \n",195,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_9 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8680,8 +8676,8 @@ int test_memcpy16_s(void)
   if (rc != 404) ;
   i = (unsigned int)10;
   while (i < (uint32_t)100) {
-    if ((int)mem1_6[i] != 0) printf_va_10("%d - %d m1=%d  \n",215,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d  \n",215,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_10 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8699,9 +8695,8 @@ int test_memcpy16_s(void)
   if (rc != 0) ;
   i = (unsigned int)10;
   while (i < (uint32_t)(1024 / 2)) {
-    if ((int)mem1_6[i] != 44) printf_va_11("%d - %d m1=%d  m2=%d  \n",233,
-                                           (int)i,(int)mem1_6[i],
-                                           (int)mem2_4[i]);
+    if ((int)mem1_6[i] != 44) printf("%d - %d m1=%d  m2=%d  \n",233,(int)i,
+                                     (int)mem1_6[i],(int)mem2_4[i]); /* printf_va_11 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -8870,9 +8865,8 @@ int test_memcpy32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != mem2_4[i]) printf_va_12("%d - %d m1=%d  m2=%d  \n",85,
-                                             (int)i,(int)mem1_6[i],
-                                             (int)mem2_4[i]);
+    if (mem1_6[i] != mem2_4[i]) printf("%d - %d m1=%d  m2=%d  \n",85,(int)i,
+                                       (int)mem1_6[i],(int)mem2_4[i]); /* printf_va_12 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8890,9 +8884,8 @@ int test_memcpy32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != mem2_4[i]) printf_va_13("%d - %d m1=%d  m2=%d  \n",104,
-                                             (int)i,(int)mem1_6[i],
-                                             (int)mem2_4[i]);
+    if (mem1_6[i] != mem2_4[i]) printf("%d - %d m1=%d  m2=%d  \n",104,(int)i,
+                                       (int)mem1_6[i],(int)mem2_4[i]); /* printf_va_13 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8910,9 +8903,9 @@ int test_memcpy32_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < (uint32_t)(1024 / 2)) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_14("%d - %d m1=%d  m2=%d  \n",
-                                               124,(int)i,(int)mem1_6[i],
-                                               (int)mem2_4[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d  m2=%d  \n",124,
+                                         (int)i,(int)mem1_6[i],
+                                         (int)mem2_4[i]); /* printf_va_14 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8930,9 +8923,9 @@ int test_memcpy32_s(void)
   if (rc != 401) ;
   i = (unsigned int)0;
   while (i < (uint32_t)1024) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_15("%d - %d m1=%d  m2=%d  \n",
-                                               143,(int)i,(int)mem1_6[i],
-                                               (int)mem2_4[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d  m2=%d  \n",143,
+                                         (int)i,(int)mem1_6[i],
+                                         (int)mem2_4[i]); /* printf_va_15 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8950,9 +8943,9 @@ int test_memcpy32_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < (uint32_t)1024) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_16("%d - %d m1=%d  m2=%d  \n",
-                                               162,(int)i,(int)mem1_6[i],
-                                               (int)mem2_4[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d  m2=%d  \n",162,
+                                         (int)i,(int)mem1_6[i],
+                                         (int)mem2_4[i]); /* printf_va_16 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -8983,9 +8976,9 @@ int test_memcpy32_s(void)
   if (rc != 404) ;
   i = (unsigned int)0;
   while (i < (uint32_t)100) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_17("%d - %d m1=%d  m2=%d  \n",
-                                               194,(int)i,(int)mem1_6[i],
-                                               (int)mem2_4[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d  m2=%d  \n",194,
+                                         (int)i,(int)mem1_6[i],
+                                         (int)mem2_4[i]); /* printf_va_17 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9003,9 +8996,9 @@ int test_memcpy32_s(void)
   if (rc != 404) ;
   i = (unsigned int)10;
   while (i < (uint32_t)100) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_18("%d - %d m1=%d  m2=%d  \n",
-                                               214,(int)i,(int)mem1_6[i],
-                                               (int)mem2_4[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d  m2=%d  \n",214,
+                                         (int)i,(int)mem1_6[i],
+                                         (int)mem2_4[i]); /* printf_va_18 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9023,9 +9016,9 @@ int test_memcpy32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < (uint32_t)(1024 / 2)) {
-    if (mem1_6[i] != (uint32_t)75) printf_va_19("%d - %d m1=%d  m2=%d  \n",
-                                                232,(int)i,(int)mem1_6[i],
-                                                (int)mem2_4[i]);
+    if (mem1_6[i] != (uint32_t)75) printf("%d - %d m1=%d  m2=%d  \n",232,
+                                          (int)i,(int)mem1_6[i],
+                                          (int)mem2_4[i]); /* printf_va_19 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -9299,15 +9292,13 @@ int test_memcpy_s(void)
   if (! (rc != 0)) {
     i = (unsigned int)0;
     while (i < len) {
-      if ((int)mem1_0[i] != (int)mem2_0[i]) printf_va_20("%d - %d m1=%d  m2=%d  \n",
-                                                         85,(int)i,
-                                                         (int)mem1_0[i],
-                                                         (int)mem2_0[i]);
+      if ((int)mem1_0[i] != (int)mem2_0[i]) printf("%d - %d m1=%d  m2=%d  \n",
+                                                   85,(int)i,(int)mem1_0[i],
+                                                   (int)mem2_0[i]); /* printf_va_20 */
       i += (uint32_t)1;
     }
-    if ((int)mem1_0[i] != 33) printf_va_21("%d - %zu m1=%d  m2=%d  \n",91,
-                                           len,(int)mem1_0[len],
-                                           (int)mem2_0[len]);
+    if ((int)mem1_0[i] != 33) printf("%d - %zu m1=%d  m2=%d  \n",91,len,
+                                     (int)mem1_0[len],(int)mem2_0[len]); /* printf_va_21 */
   }
   i = (unsigned int)0;
   while (i < (uint32_t)(1024 + 1)) {
@@ -9324,14 +9315,12 @@ int test_memcpy_s(void)
   if (! (rc == 0)) {
     i = (unsigned int)0;
     while (i < len) {
-      if ((int)mem1_0[i] != 0) printf_va_22("%d - %d m1=%d  m2=%d  \n",112,
-                                            (int)i,(int)mem1_0[i],
-                                            (int)mem2_0[i]);
+      if ((int)mem1_0[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",112,(int)i,
+                                      (int)mem1_0[i],(int)mem2_0[i]); /* printf_va_22 */
       i += (uint32_t)1;
     }
-    if ((int)mem1_0[i] != 33) printf_va_23("%d - %zu m1=%d  m2=%d  \n",118,
-                                           len,(int)mem1_0[len],
-                                           (int)mem2_0[len]);
+    if ((int)mem1_0[i] != 33) printf("%d - %zu m1=%d  m2=%d  \n",118,len,
+                                     (int)mem1_0[len],(int)mem2_0[len]); /* printf_va_23 */
   }
   i = (unsigned int)0;
   while (i < (uint32_t)(1024 + 2)) {
@@ -9349,14 +9338,12 @@ int test_memcpy_s(void)
   if (! (rc != 403)) {
     i = (unsigned int)0;
     while (i < len) {
-      if ((int)mem1_0[i] != 0) printf_va_24("%d - %d m1=%d  m2=%d  \n",139,
-                                            (int)i,(int)mem1_0[i],
-                                            (int)mem2_0[i]);
+      if ((int)mem1_0[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",139,(int)i,
+                                      (int)mem1_0[i],(int)mem2_0[i]); /* printf_va_24 */
       i += (uint32_t)1;
     }
-    if ((int)mem1_0[len] != 33) printf_va_25("%d - %zu m1=%d  m2=%d  \n",145,
-                                             len,(int)mem1_0[len],
-                                             (int)mem2_0[len]);
+    if ((int)mem1_0[len] != 33) printf("%d - %zu m1=%d  m2=%d  \n",145,len,
+                                       (int)mem1_0[len],(int)mem2_0[len]); /* printf_va_25 */
   }
   i = (unsigned int)0;
   while (i < (uint32_t)(1024 + 2)) {
@@ -9373,14 +9360,12 @@ int test_memcpy_s(void)
   if (! (rc != 401)) {
     i = (unsigned int)0;
     while (i < len) {
-      if ((int)mem1_0[i] != 0) printf_va_26("%d - %d m1=%d  m2=%d  \n",166,
-                                            (int)i,(int)mem1_0[i],
-                                            (int)mem2_0[i]);
+      if ((int)mem1_0[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",166,(int)i,
+                                      (int)mem1_0[i],(int)mem2_0[i]); /* printf_va_26 */
       i += (uint32_t)1;
     }
-    if ((int)mem1_0[len] != 33) printf_va_27("%d - %zu m1=%d  m2=%d  \n",172,
-                                             len,(int)mem1_0[len],
-                                             (int)mem2_0[len]);
+    if ((int)mem1_0[len] != 33) printf("%d - %zu m1=%d  m2=%d  \n",172,len,
+                                       (int)mem1_0[len],(int)mem2_0[len]); /* printf_va_27 */
   }
   i = (unsigned int)0;
   while (i < (uint32_t)1024) {
@@ -9398,14 +9383,12 @@ int test_memcpy_s(void)
   if (! (rc != 403)) {
     i = (unsigned int)0;
     while (i < len) {
-      if ((int)mem1_0[i] != 0) printf_va_28("%d - %d m1=%d  m2=%d  \n",193,
-                                            (int)i,(int)mem1_0[i],
-                                            (int)mem2_0[i]);
+      if ((int)mem1_0[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",193,(int)i,
+                                      (int)mem1_0[i],(int)mem2_0[i]); /* printf_va_28 */
       i += (uint32_t)1;
     }
-    if ((int)mem1_0[len] == 0) printf_va_29("%d - %d m1=%d  m2=%d  \n",199,
-                                            (int)i,(int)mem1_0[i],
-                                            (int)mem2_0[i]);
+    if ((int)mem1_0[len] == 0) printf("%d - %d m1=%d  m2=%d  \n",199,(int)i,
+                                      (int)mem1_0[i],(int)mem2_0[i]); /* printf_va_29 */
   }
   i = (unsigned int)0;
   while (i < (uint32_t)1024) {
@@ -9430,14 +9413,12 @@ int test_memcpy_s(void)
   if (! (rc != 404)) {
     i = (unsigned int)0;
     while (i < len) {
-      if ((int)mem1_0[i] != 0) printf_va_30("%d - %d m1=%d  m2=%d  \n",231,
-                                            (int)i,(int)mem1_0[i],
-                                            (int)mem2_0[i]);
+      if ((int)mem1_0[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",231,(int)i,
+                                      (int)mem1_0[i],(int)mem2_0[i]); /* printf_va_30 */
       i += (uint32_t)1;
     }
-    if ((int)mem1_0[len] == 0) printf_va_31("%d - %d m1=%d  m2=%d  \n",237,
-                                            (int)i,(int)mem1_0[i],
-                                            (int)mem2_0[i]);
+    if ((int)mem1_0[len] == 0) printf("%d - %d m1=%d  m2=%d  \n",237,(int)i,
+                                      (int)mem1_0[i],(int)mem2_0[i]); /* printf_va_31 */
   }
   i = (unsigned int)0;
   while (i < (uint32_t)1024) {
@@ -9454,9 +9435,8 @@ int test_memcpy_s(void)
   if (! (rc != 404)) {
     i = (unsigned int)10;
     while (i < len + (rsize_t)10) {
-      if ((int)mem1_0[i] != 0) printf_va_32("%d - %d m1=%d  m2=%d  \n",258,
-                                            (int)i,(int)mem1_0[i],
-                                            (int)mem2_0[i]);
+      if ((int)mem1_0[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",258,(int)i,
+                                      (int)mem1_0[i],(int)mem2_0[i]); /* printf_va_32 */
       i += (uint32_t)1;
     }
   }
@@ -9475,8 +9455,8 @@ int test_memcpy_s(void)
   if (! (rc != 0)) {
     i = (unsigned int)0;
     while (i < len) {
-      if ((int)mem1_0[i] != 55) printf_va_33("%d - %d m1=%d\n",279,(int)i,
-                                             (int)mem1_0[i]);
+      if ((int)mem1_0[i] != 55) printf("%d - %d m1=%d\n",279,(int)i,
+                                       (int)mem1_0[i]); /* printf_va_33 */
       i += (uint32_t)1;
     }
   }
@@ -9495,9 +9475,8 @@ int test_memcpy_s(void)
   if (! (rc != 0)) {
     i = (unsigned int)0;
     while (i < (uint32_t)(1024 / 2)) {
-      if ((int)mem1_0[i] != 55) printf_va_34("%d - %d m1=%d  m2=%d  \n",299,
-                                             (int)i,(int)mem1_0[i],
-                                             (int)mem2_0[i]);
+      if ((int)mem1_0[i] != 55) printf("%d - %d m1=%d  m2=%d  \n",299,(int)i,
+                                       (int)mem1_0[i],(int)mem2_0[i]); /* printf_va_34 */
       i += (uint32_t)1;
     }
   }
@@ -9637,9 +9616,9 @@ int test_memmove16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != (int)mem2_4[i]) printf_va_35("%d m1=%d  m2=%d  \n",
-                                                       (int)i,(int)mem1_6[i],
-                                                       (int)mem2_4[i]);
+    if ((int)mem1_6[i] != (int)mem2_4[i]) printf("%d m1=%d  m2=%d  \n",
+                                                 (int)i,(int)mem1_6[i],
+                                                 (int)mem2_4[i]); /* printf_va_35 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9657,8 +9636,8 @@ int test_memmove16_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_36("%d - %d m1=%d \n",110,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",110,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_36 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9676,8 +9655,8 @@ int test_memmove16_s(void)
   if (rc != 401) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_37("%d - %d m1=%d \n",131,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",131,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_37 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9696,8 +9675,8 @@ int test_memmove16_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_38("%d - %d m1=%d \n",154,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",154,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_38 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9728,8 +9707,8 @@ int test_memmove16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 35) printf_va_39("%d - %d m1=%d \n",186,(int)i,
-                                           (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 35) printf("%d - %d m1=%d \n",186,(int)i,
+                                     (int)mem1_6[i]); /* printf_va_39 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9747,8 +9726,8 @@ int test_memmove16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < (uint32_t)10) {
-    if ((int)mem1_6[i] != 25) printf_va_40("%d - %d m1=%d \n",206,(int)i,
-                                           (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 25) printf("%d - %d m1=%d \n",206,(int)i,
+                                     (int)mem1_6[i]); /* printf_va_40 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -9887,8 +9866,8 @@ int test_memmove32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != mem2_4[i]) printf_va_41("%d m1=%d  m2=%d  \n",(int)i,
-                                             (int)mem1_6[i],(int)mem2_4[i]);
+    if (mem1_6[i] != mem2_4[i]) printf("%d m1=%d  m2=%d  \n",(int)i,
+                                       (int)mem1_6[i],(int)mem2_4[i]); /* printf_va_41 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9906,8 +9885,8 @@ int test_memmove32_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_42("%d - %d m1=%d \n",110,(int)i,
-                                               (int)mem1_6[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d \n",110,(int)i,
+                                         (int)mem1_6[i]); /* printf_va_42 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9925,8 +9904,8 @@ int test_memmove32_s(void)
   if (rc != 401) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_43("%d - %d m1=%d \n",131,(int)i,
-                                               (int)mem1_6[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d \n",131,(int)i,
+                                         (int)mem1_6[i]); /* printf_va_43 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9945,8 +9924,8 @@ int test_memmove32_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_44("%d - %d m1=%d \n",154,(int)i,
-                                               (int)mem1_6[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d \n",154,(int)i,
+                                         (int)mem1_6[i]); /* printf_va_44 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9977,8 +9956,8 @@ int test_memmove32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != (uint32_t)35) printf_va_45("%d - %d m1=%d \n",186,
-                                                (int)i,(int)mem1_6[i]);
+    if (mem1_6[i] != (uint32_t)35) printf("%d - %d m1=%d \n",186,(int)i,
+                                          (int)mem1_6[i]); /* printf_va_45 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -9996,8 +9975,8 @@ int test_memmove32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < (uint32_t)10) {
-    if (mem1_6[i] != (uint32_t)25) printf_va_46("%d - %d m1=%d \n",206,
-                                                (int)i,(int)mem1_6[i]);
+    if (mem1_6[i] != (uint32_t)25) printf("%d - %d m1=%d \n",206,(int)i,
+                                          (int)mem1_6[i]); /* printf_va_46 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -10137,9 +10116,9 @@ int test_memmove_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_1[i] != (int)mem2_1[i]) printf_va_47("%d m1=%d  m2=%d  \n",
-                                                       (int)i,(int)mem1_1[i],
-                                                       (int)mem2_1[i]);
+    if ((int)mem1_1[i] != (int)mem2_1[i]) printf("%d m1=%d  m2=%d  \n",
+                                                 (int)i,(int)mem1_1[i],
+                                                 (int)mem2_1[i]); /* printf_va_47 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10158,8 +10137,8 @@ int test_memmove_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_1[i] != 0) printf_va_48("%d - %d m1=%d \n",107,(int)i,
-                                          (int)mem1_1[i]);
+    if ((int)mem1_1[i] != 0) printf("%d - %d m1=%d \n",107,(int)i,
+                                    (int)mem1_1[i]); /* printf_va_48 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10177,8 +10156,8 @@ int test_memmove_s(void)
   if (rc != 401) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_1[i] != 0) printf_va_49("%d - %d m1=%d \n",128,(int)i,
-                                          (int)mem1_1[i]);
+    if ((int)mem1_1[i] != 0) printf("%d - %d m1=%d \n",128,(int)i,
+                                    (int)mem1_1[i]); /* printf_va_49 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10197,8 +10176,8 @@ int test_memmove_s(void)
   if (rc != 403) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_1[i] != 0) printf_va_50("%d - %d m1=%d \n",149,(int)i,
-                                          (int)mem1_1[i]);
+    if ((int)mem1_1[i] != 0) printf("%d - %d m1=%d \n",149,(int)i,
+                                    (int)mem1_1[i]); /* printf_va_50 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10229,8 +10208,8 @@ int test_memmove_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_1[i] != 35) printf_va_51("%d - %d m1=%d \n",181,(int)i,
-                                           (int)mem1_1[i]);
+    if ((int)mem1_1[i] != 35) printf("%d - %d m1=%d \n",181,(int)i,
+                                     (int)mem1_1[i]); /* printf_va_51 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10258,8 +10237,8 @@ int test_memmove_s(void)
   }
   i = (unsigned int)0;
   while (i < (uint32_t)10) {
-    if ((int)mem1_1[i] != 25) printf_va_52("%d - %d m1=%d \n",204,(int)i,
-                                           (int)mem1_1[i]);
+    if ((int)mem1_1[i] != 25) printf("%d - %d m1=%d \n",204,(int)i,
+                                     (int)mem1_1[i]); /* printf_va_52 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -10366,8 +10345,8 @@ int test_memset16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != (int)value) printf_va_53("%d - %d m1=%d \n",59,
-                                                   (int)i,(int)mem1_6[i]);
+    if ((int)mem1_6[i] != (int)value) printf("%d - %d m1=%d \n",59,(int)i,
+                                             (int)mem1_6[i]); /* printf_va_53 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10381,8 +10360,8 @@ int test_memset16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != (int)value) printf_va_54("%d - %d m1=%d \n",79,
-                                                   (int)i,(int)mem1_6[i]);
+    if ((int)mem1_6[i] != (int)value) printf("%d - %d m1=%d \n",79,(int)i,
+                                             (int)mem1_6[i]); /* printf_va_54 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10396,8 +10375,8 @@ int test_memset16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != (int)value) printf_va_55("%d - %d m1=%d \n",99,
-                                                   (int)i,(int)mem1_6[i]);
+    if ((int)mem1_6[i] != (int)value) printf("%d - %d m1=%d \n",99,(int)i,
+                                             (int)mem1_6[i]); /* printf_va_55 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10411,8 +10390,8 @@ int test_memset16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != (int)value) printf_va_56("%d - %d m1=%d \n",119,
-                                                   (int)i,(int)mem1_6[i]);
+    if ((int)mem1_6[i] != (int)value) printf("%d - %d m1=%d \n",119,(int)i,
+                                             (int)mem1_6[i]); /* printf_va_56 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10426,8 +10405,8 @@ int test_memset16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != (int)value) printf_va_57("%d - %d m1=%d \n",139,
-                                                   (int)i,(int)mem1_6[i]);
+    if ((int)mem1_6[i] != (int)value) printf("%d - %d m1=%d \n",139,(int)i,
+                                             (int)mem1_6[i]); /* printf_va_57 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -10539,8 +10518,8 @@ int test_memset32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != value) printf_va_58("%d - %d m1=%d  \n",62,(int)i,
-                                         (int)mem1_6[i]);
+    if (mem1_6[i] != value) printf("%d - %d m1=%d  \n",62,(int)i,
+                                   (int)mem1_6[i]); /* printf_va_58 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10554,8 +10533,8 @@ int test_memset32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != value) printf_va_59("%d - %d m1=%d  \n",82,(int)i,
-                                         (int)mem1_6[i]);
+    if (mem1_6[i] != value) printf("%d - %d m1=%d  \n",82,(int)i,
+                                   (int)mem1_6[i]); /* printf_va_59 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10569,8 +10548,8 @@ int test_memset32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != value) printf_va_60("%d - %d m1=%d  \n",102,(int)i,
-                                         (int)mem1_6[i]);
+    if (mem1_6[i] != value) printf("%d - %d m1=%d  \n",102,(int)i,
+                                   (int)mem1_6[i]); /* printf_va_60 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10584,8 +10563,8 @@ int test_memset32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != value) printf_va_61("%d - %d m1=%d  \n",122,(int)i,
-                                         (int)mem1_6[i]);
+    if (mem1_6[i] != value) printf("%d - %d m1=%d  \n",122,(int)i,
+                                   (int)mem1_6[i]); /* printf_va_61 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10599,8 +10578,8 @@ int test_memset32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != value) printf_va_62("%d - %d m1=%d  \n",142,(int)i,
-                                         (int)mem1_6[i]);
+    if (mem1_6[i] != value) printf("%d - %d m1=%d  \n",142,(int)i,
+                                   (int)mem1_6[i]); /* printf_va_62 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -10707,8 +10686,8 @@ int test_memset_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_2[i] != (int)value) printf_va_63("%d - %d m1=%d \n",59,
-                                                   (int)i,(int)mem1_2[i]);
+    if ((int)mem1_2[i] != (int)value) printf("%d - %d m1=%d \n",59,(int)i,
+                                             (int)mem1_2[i]); /* printf_va_63 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10722,8 +10701,8 @@ int test_memset_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_2[i] != (int)value) printf_va_64("%d - %d m1=%d \n",79,
-                                                   (int)i,(int)mem1_2[i]);
+    if ((int)mem1_2[i] != (int)value) printf("%d - %d m1=%d \n",79,(int)i,
+                                             (int)mem1_2[i]); /* printf_va_64 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10737,8 +10716,8 @@ int test_memset_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_2[i] != (int)value) printf_va_65("%d - %d m1=%d \n",99,
-                                                   (int)i,(int)mem1_2[i]);
+    if ((int)mem1_2[i] != (int)value) printf("%d - %d m1=%d \n",99,(int)i,
+                                             (int)mem1_2[i]); /* printf_va_65 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10752,8 +10731,8 @@ int test_memset_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_2[i] != (int)value) printf_va_66("%d - %d m1=%d \n",119,
-                                                   (int)i,(int)mem1_2[i]);
+    if ((int)mem1_2[i] != (int)value) printf("%d - %d m1=%d \n",119,(int)i,
+                                             (int)mem1_2[i]); /* printf_va_66 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10767,8 +10746,8 @@ int test_memset_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_2[i] != (int)value) printf_va_67("%d - %d m1=%d \n",139,
-                                                   (int)i,(int)mem1_2[i]);
+    if ((int)mem1_2[i] != (int)value) printf("%d - %d m1=%d \n",139,(int)i,
+                                             (int)mem1_2[i]); /* printf_va_67 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -10859,8 +10838,8 @@ int test_memzero16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_68("%d - %d m1=%d \n",61,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",61,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_68 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10873,8 +10852,8 @@ int test_memzero16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_69("%d - %d m1=%d \n",80,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",80,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_69 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10887,8 +10866,8 @@ int test_memzero16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_70("%d - %d m1=%d \n",99,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",99,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_70 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -10901,8 +10880,8 @@ int test_memzero16_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_71("%d - %d m1=%d \n",118,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",118,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_71 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -10993,8 +10972,8 @@ int test_memzero32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_72("%d - %d m1=%d \n",61,(int)i,
-                                               (int)mem1_6[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d \n",61,(int)i,
+                                         (int)mem1_6[i]); /* printf_va_72 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -11007,8 +10986,8 @@ int test_memzero32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_73("%d - %d m1=%d \n",80,(int)i,
-                                               (int)mem1_6[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d \n",80,(int)i,
+                                         (int)mem1_6[i]); /* printf_va_73 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -11021,8 +11000,8 @@ int test_memzero32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_74("%d - %d m1=%d \n",99,(int)i,
-                                               (int)mem1_6[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d \n",99,(int)i,
+                                         (int)mem1_6[i]); /* printf_va_74 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -11035,8 +11014,8 @@ int test_memzero32_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_6[i] != (uint32_t)0) printf_va_75("%d - %d m1=%d \n",118,(int)i,
-                                               (int)mem1_6[i]);
+    if (mem1_6[i] != (uint32_t)0) printf("%d - %d m1=%d \n",118,(int)i,
+                                         (int)mem1_6[i]); /* printf_va_75 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -11127,8 +11106,8 @@ int test_memzero_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_76("%d - %d m1=%d \n",61,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",61,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_76 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -11141,8 +11120,8 @@ int test_memzero_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_77("%d - %d m1=%d \n",80,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",80,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_77 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -11155,8 +11134,8 @@ int test_memzero_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_78("%d - %d m1=%d \n",99,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",99,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_78 */
     i += (uint32_t)1;
   }
   i = (unsigned int)0;
@@ -11169,8 +11148,8 @@ int test_memzero_s(void)
   if (rc != 0) ;
   i = (unsigned int)0;
   while (i < len) {
-    if ((int)mem1_6[i] != 0) printf_va_79("%d - %d m1=%d \n",118,(int)i,
-                                          (int)mem1_6[i]);
+    if ((int)mem1_6[i] != 0) printf("%d - %d m1=%d \n",118,(int)i,
+                                    (int)mem1_6[i]); /* printf_va_79 */
     i += (uint32_t)1;
   }
   __retres = 0;
@@ -12108,65 +12087,59 @@ int test_stpcpy_s(void)
   errno_t rc;
   int32_t ind;
   unsigned int testno = (unsigned int)0;
-  printf_va_80("\nTesting stpcpy_s:\n");
+  printf("\nTesting stpcpy_s:\n"); /* printf_va_80 */
   testno ++;
-  printf_va_81("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_81 */
   ret = stpcpy_s((char *)0,(unsigned int)128,(char const *)(str2),& rc);
-  if (rc != 400) printf_va_82("%s %u   Error rc=%u \n",
-                              (char *)"test_stpcpy_s",(unsigned int)99,
-                              (unsigned int)rc);
-  if (ret != (char *)0) printf_va_83("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                     (char *)"test_stpcpy_s",
-                                     (unsigned int)104,(unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                        (unsigned int)99,(unsigned int)rc); /* printf_va_82 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpcpy_s",(unsigned int)104,
+                               (unsigned int)rc); /* printf_va_83 */
   testno ++;
-  printf_va_84("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_84 */
   ret = stpcpy_s(str1,(unsigned int)0,(char const *)(str2),& rc);
-  if (rc != 401) printf_va_85("%s %u   Error rc=%u \n",
-                              (char *)"test_stpcpy_s",(unsigned int)114,
-                              (unsigned int)rc);
-  if (ret != (char *)0) printf_va_86("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                     (char *)"test_stpcpy_s",
-                                     (unsigned int)118,(unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                        (unsigned int)114,(unsigned int)rc); /* printf_va_85 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpcpy_s",(unsigned int)118,
+                               (unsigned int)rc); /* printf_va_86 */
   testno ++;
-  printf_va_87("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_87 */
   ret = stpcpy_s(str1,(unsigned int)((4UL << 10) + (unsigned long)1),
                  (char const *)(str2),& rc);
-  if (rc != 403) printf_va_88("%s %u   Error rc=%u \n",
-                              (char *)"test_stpcpy_s",(unsigned int)129,
-                              (unsigned int)rc);
-  if (ret != (char *)0) printf_va_89("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                     (char *)"test_stpcpy_s",
-                                     (unsigned int)133,(unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                        (unsigned int)129,(unsigned int)rc); /* printf_va_88 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpcpy_s",(unsigned int)133,
+                               (unsigned int)rc); /* printf_va_89 */
   testno ++;
-  printf_va_90("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_90 */
   strcpy(str1,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   ret = stpcpy_s(str1,(unsigned int)5,(char const *)0,& rc);
-  if (rc != 400) printf_va_91("%s %u   Error rc=%u \n",
-                              (char *)"test_stpcpy_s",(unsigned int)145,
-                              (unsigned int)rc);
-  if (ret != (char *)0) printf_va_92("Returned pointer incorrect: %s %u   Error rc=%u \n",
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                        (unsigned int)145,(unsigned int)rc); /* printf_va_91 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpcpy_s",(unsigned int)150,
+                               (unsigned int)rc); /* printf_va_92 */
+  if ((int)str1[0] != '\000') printf("%s %u   Error rc=%u \n",
                                      (char *)"test_stpcpy_s",
-                                     (unsigned int)150,(unsigned int)rc);
-  if ((int)str1[0] != '\000') printf_va_93("%s %u   Error rc=%u \n",
-                                           (char *)"test_stpcpy_s",
-                                           (unsigned int)163,
-                                           (unsigned int)rc);
+                                     (unsigned int)163,(unsigned int)rc); /* printf_va_93 */
   testno ++;
-  printf_va_94("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_94 */
   strcpy(str1,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   ret = stpcpy_s(str1,(unsigned int)5,(char const *)(str1),& rc);
-  if (rc != 406) printf_va_95("%s %u   Error rc=%u \n",
-                              (char *)"test_stpcpy_s",(unsigned int)177,
-                              (unsigned int)rc);
-  if (ret != (char *)0) printf_va_96("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                     (char *)"test_stpcpy_s",
-                                     (unsigned int)183,(unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                        (unsigned int)177,(unsigned int)rc); /* printf_va_95 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpcpy_s",(unsigned int)183,
+                               (unsigned int)rc); /* printf_va_96 */
   testno ++;
-  printf_va_97("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_97 */
   strcpy(str1,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   ret = stpcpy_s(str1,(unsigned int)128,(char const *)(str1),& rc);
-  if (rc != 0) printf_va_98("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
-                            (unsigned int)196,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                      (unsigned int)196,(unsigned int)rc); /* printf_va_98 */
   if (ret == (char *)0) goto _LOR;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR;
@@ -12175,91 +12148,80 @@ int test_stpcpy_s(void)
       tmp = strnlen_s((char const *)(str1),(unsigned int)128);
       ;
       if (ret != & str1[tmp]) _LOR:
-                              printf_va_99("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                           (char *)"test_stpcpy_s",
-                                           (unsigned int)201,
-                                           (unsigned int)rc);
+                              printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                     (char *)"test_stpcpy_s",
+                                     (unsigned int)201,(unsigned int)rc); /* printf_va_99 */
     }
   testno ++;
-  printf_va_100("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_100 */
   strcpy(str1,"keep it simple");
   ret = stpcpy_s(str1,(unsigned int)128,(char const *)(& str1[5]),& rc);
-  if (rc != 404) printf_va_101("%s %u   Error rc=%u \n",
-                               (char *)"test_stpcpy_s",(unsigned int)215,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_102("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpcpy_s",
-                                      (unsigned int)219,(unsigned int)rc);
-  if ((int)str1[0] != '\000') printf_va_103("%s %u   Error rc=%u \n",
-                                            (char *)"test_stpcpy_s",
-                                            (unsigned int)232,
-                                            (unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                        (unsigned int)215,(unsigned int)rc); /* printf_va_101 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpcpy_s",(unsigned int)219,
+                               (unsigned int)rc); /* printf_va_102 */
+  if ((int)str1[0] != '\000') printf("%s %u   Error rc=%u \n",
+                                     (char *)"test_stpcpy_s",
+                                     (unsigned int)232,(unsigned int)rc); /* printf_va_103 */
   testno ++;
-  printf_va_104("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_104 */
   strcpy(str1,"keep it simple");
   ret = stpcpy_s(& str1[5],(unsigned int)128,(char const *)(str1),& rc);
-  if (rc != 404) printf_va_105("%s %u   Error rc=%u \n",
-                               (char *)"test_stpcpy_s",(unsigned int)248,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_106("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpcpy_s",
-                                      (unsigned int)252,(unsigned int)rc);
-  if ((int)str1[5] != '\000') printf_va_107("%s %u   Error rc=%u \n",
-                                            (char *)"test_stpcpy_s",
-                                            (unsigned int)265,
-                                            (unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                        (unsigned int)248,(unsigned int)rc); /* printf_va_105 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpcpy_s",(unsigned int)252,
+                               (unsigned int)rc); /* printf_va_106 */
+  if ((int)str1[5] != '\000') printf("%s %u   Error rc=%u \n",
+                                     (char *)"test_stpcpy_s",
+                                     (unsigned int)265,(unsigned int)rc); /* printf_va_107 */
   testno ++;
-  printf_va_108("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_108 */
   strcpy(str1,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   str2[0] = (char)'\000';
   ret = stpcpy_s(str1,(unsigned int)(128 / 2),(char const *)(str2),& rc);
-  if (rc != 0) printf_va_109("%s %u   Error rc=%u \n",
-                             (char *)"test_stpcpy_s",(unsigned int)287,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                      (unsigned int)287,(unsigned int)rc); /* printf_va_109 */
   if (ret == (char *)0) goto _LOR_0;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_0;
     else 
       if (ret != str1) _LOR_0:
-                       printf_va_110("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                       printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                              (char *)"test_stpcpy_s",(unsigned int)291,
+                              (unsigned int)rc); /* printf_va_110 */
+  if ((int)str1[0] != '\000') printf("%s %u   Error rc=%u \n",
                                      (char *)"test_stpcpy_s",
-                                     (unsigned int)291,(unsigned int)rc);
-  if ((int)str1[0] != '\000') printf_va_111("%s %u   Error rc=%u \n",
-                                            (char *)"test_stpcpy_s",
-                                            (unsigned int)304,
-                                            (unsigned int)rc);
+                                     (unsigned int)304,(unsigned int)rc); /* printf_va_111 */
   testno ++;
-  printf_va_112("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_112 */
   str1[0] = (char)'\000';
   strcpy(str2,"keep it simple");
   ret = stpcpy_s(str2,(unsigned int)128,(char const *)(str1),& rc);
-  if (rc != 0) printf_va_113("%s %u   Error rc=%u \n",
-                             (char *)"test_stpcpy_s",(unsigned int)319,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                      (unsigned int)319,(unsigned int)rc); /* printf_va_113 */
   if (ret == (char *)0) goto _LOR_1;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_1;
     else 
       if (ret != str2) _LOR_1:
-                       printf_va_114("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                       printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                              (char *)"test_stpcpy_s",(unsigned int)323,
+                              (unsigned int)rc); /* printf_va_114 */
+  if ((int)str2[0] != '\000') printf("%s %u -%s-  Error rc=%u \n",
                                      (char *)"test_stpcpy_s",
-                                     (unsigned int)323,(unsigned int)rc);
-  if ((int)str2[0] != '\000') printf_va_115("%s %u -%s-  Error rc=%u \n",
-                                            (char *)"test_stpcpy_s",
-                                            (unsigned int)328,str1,
-                                            (unsigned int)rc);
+                                     (unsigned int)328,str1,(unsigned int)rc); /* printf_va_115 */
   testno ++;
-  printf_va_116("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_116 */
   str1[0] = (char)'\000';
   strcpy(str2,"keep it simple");
   ret = stpcpy_s(str1,(unsigned int)128,(char const *)(str2),& rc);
-  if (rc != 0) printf_va_117("%s %u   Error rc=%u \n",
-                             (char *)"test_stpcpy_s",(unsigned int)341,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                      (unsigned int)341,(unsigned int)rc); /* printf_va_117 */
   ind = strcmp((char const *)(str1),(char const *)(str2));
-  if (ind != 0) printf_va_118("%s %u -%s-  Error rc=%u \n",
-                              (char *)"test_stpcpy_s",(unsigned int)348,str1,
-                              (unsigned int)rc);
+  if (ind != 0) printf("%s %u -%s-  Error rc=%u \n",(char *)"test_stpcpy_s",
+                       (unsigned int)348,str1,(unsigned int)rc); /* printf_va_118 */
   if (ret == (char *)0) goto _LOR_2;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_2;
@@ -12268,19 +12230,17 @@ int test_stpcpy_s(void)
       tmp_0 = strnlen_s((char const *)(str1),(unsigned int)128);
       ;
       if (ret != & str1[tmp_0]) _LOR_2:
-                                printf_va_119("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                              (char *)"test_stpcpy_s",
-                                              (unsigned int)353,
-                                              (unsigned int)rc);
+                                printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                       (char *)"test_stpcpy_s",
+                                       (unsigned int)353,(unsigned int)rc); /* printf_va_119 */
     }
   testno ++;
-  printf_va_120("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_120 */
   strcpy(str1,"qqweqeqeqeq");
   strcpy(str2,"keep it simple");
   ret = stpcpy_s(str1,(unsigned int)128,(char const *)(str2),& rc);
-  if (rc != 0) printf_va_121("%s %u   Error rc=%u \n",
-                             (char *)"test_stpcpy_s",(unsigned int)366,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                      (unsigned int)366,(unsigned int)rc); /* printf_va_121 */
   if (ret == (char *)0) goto _LOR_3;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_3;
@@ -12289,57 +12249,49 @@ int test_stpcpy_s(void)
       tmp_1 = strnlen_s((char const *)(str1),(unsigned int)128);
       ;
       if (ret != & str1[tmp_1]) _LOR_3:
-                                printf_va_122("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                              (char *)"test_stpcpy_s",
-                                              (unsigned int)371,
-                                              (unsigned int)rc);
+                                printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                       (char *)"test_stpcpy_s",
+                                       (unsigned int)371,(unsigned int)rc); /* printf_va_122 */
     }
   ind = strcmp((char const *)(str1),(char const *)(str2));
-  if (ind != 0) printf_va_123("%s %u -%s-  Error rc=%u \n",
-                              (char *)"test_stpcpy_s",(unsigned int)378,str1,
-                              (unsigned int)rc);
+  if (ind != 0) printf("%s %u -%s-  Error rc=%u \n",(char *)"test_stpcpy_s",
+                       (unsigned int)378,str1,(unsigned int)rc); /* printf_va_123 */
   testno ++;
-  printf_va_124("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_124 */
   strcpy(str1,"qqweqeqeqeq");
   strcpy(str2,"keep it simple");
   ret = stpcpy_s(str1,(unsigned int)1,(char const *)(str2),& rc);
-  if (rc != 406) printf_va_125("%s %u   Error rc=%u \n",
-                               (char *)"test_stpcpy_s",(unsigned int)391,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_126("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpcpy_s",
-                                      (unsigned int)395,(unsigned int)rc);
-  if ((int)str1[0] != '\000') printf_va_127("%s %u -%s-  Error rc=%u \n",
-                                            (char *)"test_stpcpy_s",
-                                            (unsigned int)400,str1,
-                                            (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                        (unsigned int)391,(unsigned int)rc); /* printf_va_125 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpcpy_s",(unsigned int)395,
+                               (unsigned int)rc); /* printf_va_126 */
+  if ((int)str1[0] != '\000') printf("%s %u -%s-  Error rc=%u \n",
+                                     (char *)"test_stpcpy_s",
+                                     (unsigned int)400,str1,(unsigned int)rc); /* printf_va_127 */
   testno ++;
-  printf_va_128("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_128 */
   strcpy(str1,"qqweqeqeqeq");
   strcpy(str2,"keep it simple");
   ret = stpcpy_s(str2,(unsigned int)2,(char const *)(str1),& rc);
-  if (rc != 406) printf_va_129("%s %u   Error rc=%u \n",
-                               (char *)"test_stpcpy_s",(unsigned int)413,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_130("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpcpy_s",
-                                      (unsigned int)417,(unsigned int)rc);
-  if ((int)str2[0] != '\000') printf_va_131("%s %u -%s-  Error rc=%u \n",
-                                            (char *)"test_stpcpy_s",
-                                            (unsigned int)422,str1,
-                                            (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                        (unsigned int)413,(unsigned int)rc); /* printf_va_129 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpcpy_s",(unsigned int)417,
+                               (unsigned int)rc); /* printf_va_130 */
+  if ((int)str2[0] != '\000') printf("%s %u -%s-  Error rc=%u \n",
+                                     (char *)"test_stpcpy_s",
+                                     (unsigned int)422,str1,(unsigned int)rc); /* printf_va_131 */
   testno ++;
-  printf_va_132("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_132 */
   strcpy(str1,"qqweqeqeqeq");
   strcpy(str2,"it");
   ret = stpcpy_s(str1,(unsigned int)3,(char const *)(str2),& rc);
-  if (rc != 0) printf_va_133("%s %u   Error rc=%u \n",
-                             (char *)"test_stpcpy_s",(unsigned int)435,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                      (unsigned int)435,(unsigned int)rc); /* printf_va_133 */
   ind = strcmp((char const *)(str1),(char const *)(str2));
-  if (ind != 0) printf_va_134("%s %u -%s-  Error rc=%u \n",
-                              (char *)"test_stpcpy_s",(unsigned int)442,str1,
-                              (unsigned int)rc);
+  if (ind != 0) printf("%s %u -%s-  Error rc=%u \n",(char *)"test_stpcpy_s",
+                       (unsigned int)442,str1,(unsigned int)rc); /* printf_va_134 */
   if (ret == (char *)0) goto _LOR_4;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_4;
@@ -12348,19 +12300,17 @@ int test_stpcpy_s(void)
       tmp_2 = strnlen_s((char const *)(str1),(unsigned int)128);
       ;
       if (ret != & str1[tmp_2]) _LOR_4:
-                                printf_va_135("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                              (char *)"test_stpcpy_s",
-                                              (unsigned int)446,
-                                              (unsigned int)rc);
+                                printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                       (char *)"test_stpcpy_s",
+                                       (unsigned int)446,(unsigned int)rc); /* printf_va_135 */
     }
   testno ++;
-  printf_va_136("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_136 */
   strcpy(str2,"qq12345weqeqeqeq");
   strcpy(str1,"it");
   ret = stpcpy_s(str2,(unsigned int)10,(char const *)(str1),& rc);
-  if (rc != 0) printf_va_137("%s %u   Error rc=%u \n",
-                             (char *)"test_stpcpy_s",(unsigned int)459,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpcpy_s",
+                      (unsigned int)459,(unsigned int)rc); /* printf_va_137 */
   if (ret == (char *)0) goto _LOR_5;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_5;
@@ -12369,15 +12319,13 @@ int test_stpcpy_s(void)
       tmp_3 = strnlen_s((char const *)(str2),(unsigned int)128);
       ;
       if (ret != & str2[tmp_3]) _LOR_5:
-                                printf_va_138("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                              (char *)"test_stpcpy_s",
-                                              (unsigned int)463,
-                                              (unsigned int)rc);
+                                printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                       (char *)"test_stpcpy_s",
+                                       (unsigned int)463,(unsigned int)rc); /* printf_va_138 */
     }
   ind = strcmp((char const *)(str1),(char const *)(str2));
-  if (ind != 0) printf_va_139("%s %u -%s-  Error rc=%u \n",
-                              (char *)"test_stpcpy_s",(unsigned int)470,str1,
-                              (unsigned int)rc);
+  if (ind != 0) printf("%s %u -%s-  Error rc=%u \n",(char *)"test_stpcpy_s",
+                       (unsigned int)470,str1,(unsigned int)rc); /* printf_va_139 */
   __retres = 0;
   return __retres;
 }
@@ -13597,71 +13545,64 @@ int test_stpncpy_s(void)
   int32_t ind;
   rsize_t sz;
   unsigned int testno = (unsigned int)0;
-  printf_va_140("\nTesting stpncpy_s:\n");
+  printf("\nTesting stpncpy_s:\n"); /* printf_va_140 */
   testno ++;
-  printf_va_141("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_141 */
   ret = stpncpy_s((char *)0,(unsigned int)128,(char const *)(str2_0),
                   (unsigned int)128,& rc);
-  if (rc != 400) printf_va_142("%s %u   Error rc=%u \n",
-                               (char *)"test_stpncpy_s",(unsigned int)107,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_143("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpncpy_s",
-                                      (unsigned int)112,(unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                        (unsigned int)107,(unsigned int)rc); /* printf_va_142 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpncpy_s",(unsigned int)112,
+                               (unsigned int)rc); /* printf_va_143 */
   testno ++;
-  printf_va_144("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_144 */
   ret = stpncpy_s(str1_0,(unsigned int)0,(char const *)(str2_0),
                   (unsigned int)128,& rc);
-  if (rc != 401) printf_va_145("%s %u   Error rc=%u \n",
-                               (char *)"test_stpncpy_s",(unsigned int)122,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_146("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpncpy_s",
-                                      (unsigned int)126,(unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                        (unsigned int)122,(unsigned int)rc); /* printf_va_145 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpncpy_s",(unsigned int)126,
+                               (unsigned int)rc); /* printf_va_146 */
   testno ++;
-  printf_va_147("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_147 */
   ret = stpncpy_s(str1_0,(unsigned int)((4UL << 10) + (unsigned long)1),
                   (char const *)(str2_0),(unsigned int)128,& rc);
-  if (rc != 403) printf_va_148("%s %u   Error rc=%u \n",
-                               (char *)"test_stpncpy_s",(unsigned int)137,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_149("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpncpy_s",
-                                      (unsigned int)141,(unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                        (unsigned int)137,(unsigned int)rc); /* printf_va_148 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpncpy_s",(unsigned int)141,
+                               (unsigned int)rc); /* printf_va_149 */
   testno ++;
-  printf_va_150("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_150 */
   strcpy(str1_0,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   ret = stpncpy_s(str1_0,(unsigned int)5,(char const *)0,(unsigned int)128,
                   & rc);
-  if (rc != 400) printf_va_151("%s %u   Error rc=%u \n",
-                               (char *)"test_stpncpy_s",(unsigned int)153,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_152("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpncpy_s",
-                                      (unsigned int)158,(unsigned int)rc);
-  if ((int)str1_0[0] != '\000') printf_va_153("%s %u   Error rc=%u \n",
-                                              (char *)"test_stpncpy_s",
-                                              (unsigned int)171,
-                                              (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                        (unsigned int)153,(unsigned int)rc); /* printf_va_151 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpncpy_s",(unsigned int)158,
+                               (unsigned int)rc); /* printf_va_152 */
+  if ((int)str1_0[0] != '\000') printf("%s %u   Error rc=%u \n",
+                                       (char *)"test_stpncpy_s",
+                                       (unsigned int)171,(unsigned int)rc); /* printf_va_153 */
   testno ++;
-  printf_va_154("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_154 */
   strcpy(str1_0,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   sz = strnlen_s((char const *)(str1_0),(unsigned int)128);
   ret = stpncpy_s(str1_0,(unsigned int)5,(char const *)(str1_0),sz,& rc);
-  if (rc != 406) printf_va_155("%s %u   Error rc=%u \n",
-                               (char *)"test_stpncpy_s",(unsigned int)186,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_156("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpncpy_s",
-                                      (unsigned int)192,(unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                        (unsigned int)186,(unsigned int)rc); /* printf_va_155 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpncpy_s",(unsigned int)192,
+                               (unsigned int)rc); /* printf_va_156 */
   testno ++;
-  printf_va_157("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_157 */
   strcpy(str1_0,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   sz = strnlen_s((char const *)(str1_0),(unsigned int)128);
   ret = stpncpy_s(str1_0,(unsigned int)128,(char const *)(str1_0),sz,& rc);
-  if (rc != 0) printf_va_158("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)206,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)206,(unsigned int)rc); /* printf_va_158 */
   if (ret == (char *)0) goto _LOR;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR;
@@ -13670,98 +13611,89 @@ int test_stpncpy_s(void)
       tmp = strnlen_s((char const *)(str1_0),(unsigned int)128);
       ;
       if (ret != & str1_0[tmp]) _LOR:
-                                printf_va_159("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                              (char *)"test_stpncpy_s",
-                                              (unsigned int)211,
-                                              (unsigned int)rc);
+                                printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                       (char *)"test_stpncpy_s",
+                                       (unsigned int)211,(unsigned int)rc); /* printf_va_159 */
     }
   testno ++;
-  printf_va_160("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_160 */
   strcpy(str1_0,"keep it simple");
   sz = strnlen_s((char const *)(str1_0),(unsigned int)128);
   ret = stpncpy_s(str1_0,(unsigned int)128,(char const *)(& str1_0[5]),sz,
                   & rc);
-  if (rc != 404) printf_va_161("%s %u   Error rc=%u \n",
-                               (char *)"test_stpncpy_s",(unsigned int)225,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_162("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpncpy_s",
-                                      (unsigned int)229,(unsigned int)rc);
-  if ((int)str1_0[0] != '\000') printf_va_163("%s %u   Error rc=%u \n",
-                                              (char *)"test_stpncpy_s",
-                                              (unsigned int)242,
-                                              (unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                        (unsigned int)225,(unsigned int)rc); /* printf_va_161 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpncpy_s",(unsigned int)229,
+                               (unsigned int)rc); /* printf_va_162 */
+  if ((int)str1_0[0] != '\000') printf("%s %u   Error rc=%u \n",
+                                       (char *)"test_stpncpy_s",
+                                       (unsigned int)242,(unsigned int)rc); /* printf_va_163 */
   testno ++;
-  printf_va_164("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_164 */
   strcpy(str1_0,"keep it simple");
   sz = strnlen_s((char const *)(str1_0),(unsigned int)128);
   ret = stpncpy_s(& str1_0[5],(unsigned int)128,(char const *)(str1_0),sz,
                   & rc);
-  if (rc != 404) printf_va_165("%s %u   Error rc=%u \n",
-                               (char *)"test_stpncpy_s",(unsigned int)258,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_166("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpncpy_s",
-                                      (unsigned int)262,(unsigned int)rc);
-  if ((int)str1_0[5] != '\000') printf_va_167("%s %u   Error rc=%u \n",
-                                              (char *)"test_stpncpy_s",
-                                              (unsigned int)275,
-                                              (unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                        (unsigned int)258,(unsigned int)rc); /* printf_va_165 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpncpy_s",(unsigned int)262,
+                               (unsigned int)rc); /* printf_va_166 */
+  if ((int)str1_0[5] != '\000') printf("%s %u   Error rc=%u \n",
+                                       (char *)"test_stpncpy_s",
+                                       (unsigned int)275,(unsigned int)rc); /* printf_va_167 */
   testno ++;
-  printf_va_168("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_168 */
   strcpy(str1_0,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   str2_0[0] = (char)'\000';
   ret = stpncpy_s(str1_0,(unsigned int)(128 / 2),(char const *)(str2_0),
                   (unsigned int)1,& rc);
-  if (rc != 0) printf_va_169("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)297,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)297,(unsigned int)rc); /* printf_va_169 */
   if (ret == (char *)0) goto _LOR_0;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_0;
     else 
       if (ret != str1_0) _LOR_0:
-                         printf_va_170("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                (char *)"test_stpncpy_s",(unsigned int)301,
+                                (unsigned int)rc); /* printf_va_170 */
+  if ((int)str1_0[0] != '\000') printf("%s %u   Error rc=%u \n",
                                        (char *)"test_stpncpy_s",
-                                       (unsigned int)301,(unsigned int)rc);
-  if ((int)str1_0[0] != '\000') printf_va_171("%s %u   Error rc=%u \n",
-                                              (char *)"test_stpncpy_s",
-                                              (unsigned int)314,
-                                              (unsigned int)rc);
+                                       (unsigned int)314,(unsigned int)rc); /* printf_va_171 */
   testno ++;
-  printf_va_172("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_172 */
   memset_s((void *)(str1_0),(unsigned int)'\000',(unsigned char)5);
   strcpy(str2_0,"keep it simple");
   ret = stpncpy_s(str2_0,(unsigned int)128,(char const *)(str1_0),
                   (unsigned int)5,& rc);
-  if (rc != 0) printf_va_173("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)329,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)329,(unsigned int)rc); /* printf_va_173 */
   if (ret == (char *)0) goto _LOR_1;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_1;
     else 
       if (ret != str2_0) _LOR_1:
-                         printf_va_174("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                (char *)"test_stpncpy_s",(unsigned int)333,
+                                (unsigned int)rc); /* printf_va_174 */
+  if ((int)str2_0[0] != '\000') printf("%s %u -%s-  Error rc=%u \n",
                                        (char *)"test_stpncpy_s",
-                                       (unsigned int)333,(unsigned int)rc);
-  if ((int)str2_0[0] != '\000') printf_va_175("%s %u -%s-  Error rc=%u \n",
-                                              (char *)"test_stpncpy_s",
-                                              (unsigned int)338,str1_0,
-                                              (unsigned int)rc);
+                                       (unsigned int)338,str1_0,
+                                       (unsigned int)rc); /* printf_va_175 */
   testno ++;
-  printf_va_176("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_176 */
   memset_s((void *)(str1_0),(unsigned int)'\000',(unsigned char)50);
   strcpy(str2_0,"keep it simple");
   sz = strnlen_s((char const *)(str2_0),(unsigned int)128);
   ret = stpncpy_s(str1_0,(unsigned int)128,(char const *)(str2_0),sz,& rc);
-  if (rc != 0) printf_va_177("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)353,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)353,(unsigned int)rc); /* printf_va_177 */
   ind = strcmp((char const *)(str1_0),(char const *)(str2_0));
-  if (ind != 0) printf_va_178("%s %u -%s- <> -%s-  (smax=%zu) Error rc=%u \n",
-                              (char *)"test_stpncpy_s",(unsigned int)360,
-                              str1_0,str2_0,sz,(unsigned int)rc);
+  if (ind != 0) printf("%s %u -%s- <> -%s-  (smax=%zu) Error rc=%u \n",
+                       (char *)"test_stpncpy_s",(unsigned int)360,str1_0,
+                       str2_0,sz,(unsigned int)rc); /* printf_va_178 */
   if (ret == (char *)0) goto _LOR_2;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_2;
@@ -13770,20 +13702,18 @@ int test_stpncpy_s(void)
       tmp_0 = strnlen_s((char const *)(str1_0),(unsigned int)128);
       ;
       if (ret != & str1_0[tmp_0]) _LOR_2:
-                                  printf_va_179("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                (char *)"test_stpncpy_s",
-                                                (unsigned int)365,
-                                                (unsigned int)rc);
+                                  printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                         (char *)"test_stpncpy_s",
+                                         (unsigned int)365,(unsigned int)rc); /* printf_va_179 */
     }
   testno ++;
-  printf_va_180("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_180 */
   strcpy(str1_0,"xxxxxxxxxx");
   strcpy(str2_0,"abcde");
   ret = stpncpy_s(str1_0,(unsigned int)128,(char const *)(str2_0),
                   (unsigned int)3,& rc);
-  if (rc != 0) printf_va_181("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)378,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)378,(unsigned int)rc); /* printf_va_181 */
   if (ret == (char *)0) goto _LOR_4;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_4;
@@ -13792,39 +13722,37 @@ int test_stpncpy_s(void)
       tmp_1 = strnlen_s((char const *)(str1_0),(unsigned int)128);
       ;
       if (ret != & str1_0[tmp_1]) _LOR_4:
-                                  printf_va_182("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                (char *)"test_stpncpy_s",
-                                                (unsigned int)383,
-                                                (unsigned int)rc);
+                                  printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                         (char *)"test_stpncpy_s",
+                                         (unsigned int)383,(unsigned int)rc); /* printf_va_182 */
       else {
         sz = strnlen_s((char const *)(str1_0),(unsigned int)128);
         ind = strncmp((char const *)(str1_0),(char const *)(str2_0),sz);
         if (ind != 0) goto _LOR_3;
         else 
           if (sz != (rsize_t)3) _LOR_3:
-                                printf_va_183("%s %u -%s- <> -%s-  (smax=%zu) Error rc=%u \n",
-                                              (char *)"test_stpncpy_s",
-                                              (unsigned int)391,str1_0,
-                                              str2_0,sz,(unsigned int)rc);
+                                printf("%s %u -%s- <> -%s-  (smax=%zu) Error rc=%u \n",
+                                       (char *)"test_stpncpy_s",
+                                       (unsigned int)391,str1_0,str2_0,sz,
+                                       (unsigned int)rc); /* printf_va_183 */
         i = (unsigned int)1;
         while (i < (uint32_t)6) {
-          if ((int)*(ret + i) != 'x') printf_va_184("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
-                                                    (char *)"test_stpncpy_s",
-                                                    (unsigned int)397,(int)i,
-                                                    (unsigned int)rc);
+          if ((int)*(ret + i) != 'x') printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
+                                             (char *)"test_stpncpy_s",
+                                             (unsigned int)397,(int)i,
+                                             (unsigned int)rc); /* printf_va_184 */
           i += (uint32_t)1;
         }
       }
     }
   testno ++;
-  printf_va_185("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_185 */
   strcpy(str1_0,"xxxxxxxxxxxxxxxxxxxx");
   strcpy(str2_0,"abcde");
   ret = stpncpy_s(str1_0,(unsigned int)128,(char const *)(str2_0),
                   (unsigned int)10,& rc);
-  if (rc != 0) printf_va_186("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)412,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)412,(unsigned int)rc); /* printf_va_186 */
   if (ret == (char *)0) goto _LOR_5;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_5;
@@ -13833,46 +13761,41 @@ int test_stpncpy_s(void)
       tmp_2 = strnlen_s((char const *)(str1_0),(unsigned int)128);
       ;
       if (ret != & str1_0[tmp_2]) _LOR_5:
-                                  printf_va_187("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                (char *)"test_stpncpy_s",
-                                                (unsigned int)417,
-                                                (unsigned int)rc);
+                                  printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                         (char *)"test_stpncpy_s",
+                                         (unsigned int)417,(unsigned int)rc); /* printf_va_187 */
       else {
         ind = strcmp((char const *)(str1_0),(char const *)(str2_0));
-        if (ind != 0) printf_va_188("%s %u -%s-  Error rc=%u \n",
-                                    (char *)"test_stpncpy_s",
-                                    (unsigned int)424,str1_0,
-                                    (unsigned int)rc);
+        if (ind != 0) printf("%s %u -%s-  Error rc=%u \n",
+                             (char *)"test_stpncpy_s",(unsigned int)424,
+                             str1_0,(unsigned int)rc); /* printf_va_188 */
         else {
           i = (unsigned int)0;
           while (i < (uint32_t)5) {
-            if ((int)*(ret + i) != '\000') printf_va_189("%s %u Incorrect NULL fill at returned ptr index %d  Error rc=%u \n",
-                                                         (char *)"test_stpncpy_s",
-                                                         (unsigned int)430,
-                                                         (int)i,
-                                                         (unsigned int)rc);
+            if ((int)*(ret + i) != '\000') printf("%s %u Incorrect NULL fill at returned ptr index %d  Error rc=%u \n",
+                                                  (char *)"test_stpncpy_s",
+                                                  (unsigned int)430,(int)i,
+                                                  (unsigned int)rc); /* printf_va_189 */
             i += (uint32_t)1;
           }
           while (i < (uint32_t)15) {
-            if ((int)*(ret + i) != 'x') printf_va_190("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
-                                                      (char *)"test_stpncpy_s",
-                                                      (unsigned int)437,
-                                                      (int)i,
-                                                      (unsigned int)rc);
+            if ((int)*(ret + i) != 'x') printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
+                                               (char *)"test_stpncpy_s",
+                                               (unsigned int)437,(int)i,
+                                               (unsigned int)rc); /* printf_va_190 */
             i += (uint32_t)1;
           }
         }
       }
     }
   testno ++;
-  printf_va_191("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_191 */
   strcpy(str1_0,"xxxxxxxxxx");
   strcpy(str2_0,"abcde");
   ret = stpncpy_s(str1_0,(unsigned int)128,(char const *)(str2_0),
                   (unsigned int)5,& rc);
-  if (rc != 0) printf_va_192("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)453,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)453,(unsigned int)rc); /* printf_va_192 */
   if (ret == (char *)0) goto _LOR_6;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_6;
@@ -13881,38 +13804,34 @@ int test_stpncpy_s(void)
       tmp_3 = strnlen_s((char const *)(str1_0),(unsigned int)128);
       ;
       if (ret != & str1_0[tmp_3]) _LOR_6:
-                                  printf_va_193("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                (char *)"test_stpncpy_s",
-                                                (unsigned int)458,
-                                                (unsigned int)rc);
+                                  printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                         (char *)"test_stpncpy_s",
+                                         (unsigned int)458,(unsigned int)rc); /* printf_va_193 */
       else {
         ind = strcmp((char const *)(str1_0),(char const *)(str2_0));
-        if (ind != 0) printf_va_194("%s %u -%s-  Error rc=%u \n",
-                                    (char *)"test_stpncpy_s",
-                                    (unsigned int)465,str1_0,
-                                    (unsigned int)rc);
+        if (ind != 0) printf("%s %u -%s-  Error rc=%u \n",
+                             (char *)"test_stpncpy_s",(unsigned int)465,
+                             str1_0,(unsigned int)rc); /* printf_va_194 */
         else {
           i = (unsigned int)1;
           while (i < (uint32_t)5) {
-            if ((int)*(ret + i) != 'x') printf_va_195("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
-                                                      (char *)"test_stpncpy_s",
-                                                      (unsigned int)471,
-                                                      (int)i,
-                                                      (unsigned int)rc);
+            if ((int)*(ret + i) != 'x') printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
+                                               (char *)"test_stpncpy_s",
+                                               (unsigned int)471,(int)i,
+                                               (unsigned int)rc); /* printf_va_195 */
             i += (uint32_t)1;
           }
         }
       }
     }
   testno ++;
-  printf_va_196("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_196 */
   strcpy(str1_0,"xxxxxxxxxx");
   strcpy(str2_0,"abcde");
   ret = stpncpy_s(str1_0,(unsigned int)128,(char const *)(str2_0),
                   (unsigned int)6,& rc);
-  if (rc != 0) printf_va_197("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)487,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)487,(unsigned int)rc); /* printf_va_197 */
   if (ret == (char *)0) goto _LOR_7;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_7;
@@ -13921,74 +13840,67 @@ int test_stpncpy_s(void)
       tmp_4 = strnlen_s((char const *)(str1_0),(unsigned int)128);
       ;
       if (ret != & str1_0[tmp_4]) _LOR_7:
-                                  printf_va_198("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                (char *)"test_stpncpy_s",
-                                                (unsigned int)492,
-                                                (unsigned int)rc);
+                                  printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                         (char *)"test_stpncpy_s",
+                                         (unsigned int)492,(unsigned int)rc); /* printf_va_198 */
       else {
         ind = strcmp((char const *)(str1_0),(char const *)(str2_0));
-        if (ind != 0) printf_va_199("%s %u -%s-  Error rc=%u \n",
-                                    (char *)"test_stpncpy_s",
-                                    (unsigned int)499,str1_0,
-                                    (unsigned int)rc);
+        if (ind != 0) printf("%s %u -%s-  Error rc=%u \n",
+                             (char *)"test_stpncpy_s",(unsigned int)499,
+                             str1_0,(unsigned int)rc); /* printf_va_199 */
         else {
           i = (unsigned int)1;
           while (i < (uint32_t)5) {
-            if ((int)*(ret + i) != 'x') printf_va_200("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
-                                                      (char *)"test_stpncpy_s",
-                                                      (unsigned int)505,
-                                                      (int)i,
-                                                      (unsigned int)rc);
+            if ((int)*(ret + i) != 'x') printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
+                                               (char *)"test_stpncpy_s",
+                                               (unsigned int)505,(int)i,
+                                               (unsigned int)rc); /* printf_va_200 */
             i += (uint32_t)1;
           }
         }
       }
     }
   testno ++;
-  printf_va_201("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_201 */
   strcpy(str1_0,"qqweqeqeqeq");
   strcpy(str2_0,"keep it simple");
   sz = strnlen_s((char const *)(str2_0),(unsigned int)128);
   ret = stpncpy_s(str1_0,(unsigned int)1,(char const *)(str2_0),sz,& rc);
-  if (rc != 406) printf_va_202("%s %u   Error rc=%u \n",
-                               (char *)"test_stpncpy_s",(unsigned int)522,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_203("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpncpy_s",
-                                      (unsigned int)526,(unsigned int)rc);
-  if ((int)str1_0[0] != '\000') printf_va_204("%s %u -%s-  Error rc=%u \n",
-                                              (char *)"test_stpncpy_s",
-                                              (unsigned int)531,str1_0,
-                                              (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                        (unsigned int)522,(unsigned int)rc); /* printf_va_202 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpncpy_s",(unsigned int)526,
+                               (unsigned int)rc); /* printf_va_203 */
+  if ((int)str1_0[0] != '\000') printf("%s %u -%s-  Error rc=%u \n",
+                                       (char *)"test_stpncpy_s",
+                                       (unsigned int)531,str1_0,
+                                       (unsigned int)rc); /* printf_va_204 */
   testno ++;
-  printf_va_205("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_205 */
   strcpy(str1_0,"qqweqeqeqeq");
   strcpy(str2_0,"keep it simple");
   sz = strnlen_s((char const *)(str2_0),(unsigned int)128);
   ret = stpncpy_s(str1_0,(unsigned int)14,(char const *)(str2_0),sz,& rc);
-  if (rc != 406) printf_va_206("%s %u   Error rc=%u \n",
-                               (char *)"test_stpncpy_s",(unsigned int)545,
-                               (unsigned int)rc);
-  if (ret != (char *)0) printf_va_207("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                      (char *)"test_stpncpy_s",
-                                      (unsigned int)549,(unsigned int)rc);
-  if ((int)str1_0[0] != '\000') printf_va_208("%s %u -%s-  Error rc=%u \n",
-                                              (char *)"test_stpncpy_s",
-                                              (unsigned int)554,str1_0,
-                                              (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                        (unsigned int)545,(unsigned int)rc); /* printf_va_206 */
+  if (ret != (char *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                               (char *)"test_stpncpy_s",(unsigned int)549,
+                               (unsigned int)rc); /* printf_va_207 */
+  if ((int)str1_0[0] != '\000') printf("%s %u -%s-  Error rc=%u \n",
+                                       (char *)"test_stpncpy_s",
+                                       (unsigned int)554,str1_0,
+                                       (unsigned int)rc); /* printf_va_208 */
   testno ++;
-  printf_va_209("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_209 */
   strcpy(str1_0,"qqweqeqeqeq");
   strcpy(str2_0,"it");
   sz = strnlen_s((char const *)(str2_0),(unsigned int)128);
   ret = stpncpy_s(str1_0,(unsigned int)3,(char const *)(str2_0),sz,& rc);
-  if (rc != 0) printf_va_210("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)568,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)568,(unsigned int)rc); /* printf_va_210 */
   ind = strcmp((char const *)(str1_0),(char const *)(str2_0));
-  if (ind != 0) printf_va_211("%s %u -%s-  Error rc=%u \n",
-                              (char *)"test_stpncpy_s",(unsigned int)575,
-                              str1_0,(unsigned int)rc);
+  if (ind != 0) printf("%s %u -%s-  Error rc=%u \n",(char *)"test_stpncpy_s",
+                       (unsigned int)575,str1_0,(unsigned int)rc); /* printf_va_211 */
   if (ret == (char *)0) goto _LOR_8;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_8;
@@ -13997,20 +13909,18 @@ int test_stpncpy_s(void)
       tmp_5 = strnlen_s((char const *)(str1_0),(unsigned int)128);
       ;
       if (ret != & str1_0[tmp_5]) _LOR_8:
-                                  printf_va_212("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                (char *)"test_stpncpy_s",
-                                                (unsigned int)579,
-                                                (unsigned int)rc);
+                                  printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                         (char *)"test_stpncpy_s",
+                                         (unsigned int)579,(unsigned int)rc); /* printf_va_212 */
     }
   testno ++;
-  printf_va_213("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_213 */
   strcpy(str1_0,"qq12345weqeqeqeq");
   strcpy(str2_0,"it");
   ret = stpncpy_s(str1_0,(unsigned int)10,(char const *)(str2_0),
                   (unsigned int)2,& rc);
-  if (rc != 0) printf_va_214("%s %u   Error rc=%u \n",
-                             (char *)"test_stpncpy_s",(unsigned int)592,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_stpncpy_s",
+                      (unsigned int)592,(unsigned int)rc); /* printf_va_214 */
   if (ret == (char *)0) goto _LOR_9;
   else 
     if ((int)*(ret + 0) != '\000') goto _LOR_9;
@@ -14019,15 +13929,13 @@ int test_stpncpy_s(void)
       tmp_6 = strnlen_s((char const *)(str1_0),(unsigned int)128);
       ;
       if (ret != & str1_0[tmp_6]) _LOR_9:
-                                  printf_va_215("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                (char *)"test_stpncpy_s",
-                                                (unsigned int)596,
-                                                (unsigned int)rc);
+                                  printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                         (char *)"test_stpncpy_s",
+                                         (unsigned int)596,(unsigned int)rc); /* printf_va_215 */
     }
   ind = strcmp((char const *)(str1_0),(char const *)(str2_0));
-  if (ind != 0) printf_va_216("%s %u -%s-  Error rc=%u \n",
-                              (char *)"test_stpncpy_s",(unsigned int)603,
-                              str1_0,(unsigned int)rc);
+  if (ind != 0) printf("%s %u -%s-  Error rc=%u \n",(char *)"test_stpncpy_s",
+                       (unsigned int)603,str1_0,(unsigned int)rc); /* printf_va_216 */
   __retres = 0;
   return __retres;
 }
@@ -14521,138 +14429,114 @@ int test_strcasecmp_s(void)
   int std_ind;
   rc = strcasecmp_s((char const *)0,(unsigned int)128,(char const *)(str2_1),
                     & ind);
-  if (rc != 400) printf_va_217("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasecmp_s",(unsigned int)29,
-                               rc);
-  if (ind != 0) printf_va_218("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)34,
-                              ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                        (unsigned int)29,rc); /* printf_va_217 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)34,ind,rc); /* printf_va_218 */
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)128,(char const *)0,
                     & ind);
-  if (rc != 400) printf_va_219("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasecmp_s",(unsigned int)42,
-                               rc);
-  if (ind != 0) printf_va_220("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)47,
-                              ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                        (unsigned int)42,rc); /* printf_va_219 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)47,ind,rc); /* printf_va_220 */
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)128,
                     (char const *)(str2_1),(int *)0);
-  if (rc != 400) printf_va_221("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasecmp_s",(unsigned int)55,
-                               rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                        (unsigned int)55,rc); /* printf_va_221 */
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)0,
                     (char const *)(str2_1),& ind);
-  if (rc != 401) printf_va_222("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasecmp_s",(unsigned int)63,
-                               rc);
-  if (ind != 0) printf_va_223("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)68,
-                              ind,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                        (unsigned int)63,rc); /* printf_va_222 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)68,ind,rc); /* printf_va_223 */
   rc = strcasecmp_s((char const *)(str1_1),
                     (unsigned int)((4UL << 10) + (unsigned long)1),
                     (char const *)(str2_1),& ind);
-  if (rc != 403) printf_va_224("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasecmp_s",(unsigned int)76,
-                               rc);
-  if (ind != 0) printf_va_225("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)81,
-                              ind,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                        (unsigned int)76,rc); /* printf_va_224 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)81,ind,rc); /* printf_va_225 */
   str1_1[0] = (char)'\000';
   str2_1[0] = (char)'\000';
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)128,
                     (char const *)(str2_1),& ind);
-  if (rc != 0) printf_va_226("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasecmp_s",(unsigned int)92,rc);
-  if (ind != 0) printf_va_227("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)97,
-                              ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                      (unsigned int)92,rc); /* printf_va_226 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)97,ind,rc); /* printf_va_227 */
   std_ind = strcasecmp((char const *)(str1_1),(char const *)(str2_1));
-  if (ind != std_ind) printf_va_228("%s %u  ind=%d  std_ind=%d  rc=%d \n",
-                                    (char *)"test_strcasecmp_s",
-                                    (unsigned int)103,ind,std_ind,rc);
+  if (ind != std_ind) printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
+                             (char *)"test_strcasecmp_s",(unsigned int)103,
+                             ind,std_ind,rc); /* printf_va_228 */
   strcpy(str1_1,"KEEP IT SIMPLE");
   strcpy(str2_1,"keep it simple");
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)1,
                     (char const *)(str2_1),& ind);
-  if (rc != 0) printf_va_229("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasecmp_s",(unsigned int)114,
-                             rc);
-  if (ind != 0) printf_va_230("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)119,
-                              ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                      (unsigned int)114,rc); /* printf_va_229 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)119,ind,rc); /* printf_va_230 */
   strcpy(str1_1,"KEEP IT SIMPLE");
   strcpy(str2_1,"keep it simple");
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)2,
                     (char const *)(str2_1),& ind);
-  if (rc != 0) printf_va_231("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasecmp_s",(unsigned int)129,
-                             rc);
-  if (ind != 0) printf_va_232("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)134,
-                              ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                      (unsigned int)129,rc); /* printf_va_231 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)134,ind,rc); /* printf_va_232 */
   strcpy(str1_1,"KEEP IT SIMPLE");
   strcpy(str2_1,"keep it simple");
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)4,
                     (char const *)(str2_1),& ind);
-  if (rc != 0) printf_va_233("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasecmp_s",(unsigned int)145,
-                             rc);
-  if (ind != 0) printf_va_234("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)150,
-                              ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                      (unsigned int)145,rc); /* printf_va_233 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)150,ind,rc); /* printf_va_234 */
   strcpy(str1_1,"KEEP IT SIMPLE");
   strcpy(str2_1,"keep it simple");
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)128,
                     (char const *)(str2_1),& ind);
-  if (rc != 0) printf_va_235("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasecmp_s",(unsigned int)161,
-                             rc);
-  if (ind != 0) printf_va_236("%s %u  Error ind=%d  rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)166,
-                              ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                      (unsigned int)161,rc); /* printf_va_235 */
+  if (ind != 0) printf("%s %u  Error ind=%d  rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)166,ind,rc); /* printf_va_236 */
   std_ind = strcasecmp((char const *)(str1_1),(char const *)(str2_1));
-  if (ind != std_ind) printf_va_237("%s %u  ind=%d  std_ind=%d  rc=%d \n",
-                                    (char *)"test_strcasecmp_s",
-                                    (unsigned int)172,ind,std_ind,rc);
+  if (ind != std_ind) printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
+                             (char *)"test_strcasecmp_s",(unsigned int)172,
+                             ind,std_ind,rc); /* printf_va_237 */
   strcpy(str1_1,"keep it simple");
   strcpy(str2_1,"keeP it simple");
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)128,
                     (char const *)(str2_1),& ind);
-  if (rc != 0) printf_va_238("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasecmp_s",(unsigned int)183,
-                             rc);
-  if (ind != 0) printf_va_239("%s %u  Error ind=%d  rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)188,
-                              ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                      (unsigned int)183,rc); /* printf_va_238 */
+  if (ind != 0) printf("%s %u  Error ind=%d  rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)188,ind,rc); /* printf_va_239 */
   strcpy(str1_1,"keep it simple");
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)128,
                     (char const *)(str1_1),& ind);
-  if (rc != 0) printf_va_240("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasecmp_s",(unsigned int)198,
-                             rc);
-  if (ind != 0) printf_va_241("%s %u  Error ind=%d  rc=%d \n",
-                              (char *)"test_strcasecmp_s",(unsigned int)203,
-                              ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                      (unsigned int)198,rc); /* printf_va_240 */
+  if (ind != 0) printf("%s %u  Error ind=%d  rc=%d \n",
+                       (char *)"test_strcasecmp_s",(unsigned int)203,ind,rc); /* printf_va_241 */
   strcpy(str1_1,"KEEP it simplified");
   strcpy(str2_1,"keep it simple");
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)128,
                     (char const *)(str2_1),& ind);
-  if (rc != 0) printf_va_242("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasecmp_s",(unsigned int)214,
-                             rc);
-  if (ind != 'I' - 'E') printf_va_243("%s %u  Error ind=%d  rc=%d \n",
-                                      (char *)"test_strcasecmp_s",
-                                      (unsigned int)219,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                      (unsigned int)214,rc); /* printf_va_242 */
+  if (ind != 'I' - 'E') printf("%s %u  Error ind=%d  rc=%d \n",
+                               (char *)"test_strcasecmp_s",(unsigned int)219,
+                               ind,rc); /* printf_va_243 */
   strcpy(str1_1,"KEEP 1234567890");
   strcpy(str2_1,"keep it simple");
   rc = strcasecmp_s((char const *)(str1_1),(unsigned int)128,
                     (char const *)(str2_1),& ind);
-  if (rc != 0) printf_va_244("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasecmp_s",(unsigned int)230,
-                             rc);
-  if (ind != '1' - 'I') printf_va_245("%s %u  Error ind=%d  rc=%d  %d \n",
-                                      (char *)"test_strcasecmp_s",
-                                      (unsigned int)235,ind,rc,'1' - 'I');
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasecmp_s",
+                      (unsigned int)230,rc); /* printf_va_244 */
+  if (ind != '1' - 'I') printf("%s %u  Error ind=%d  rc=%d  %d \n",
+                               (char *)"test_strcasecmp_s",(unsigned int)235,
+                               ind,rc,'1' - 'I'); /* printf_va_245 */
   __retres = 0;
   return __retres;
 }
@@ -15723,161 +15607,143 @@ int test_strcasestr_s(void)
   char str2_16[128];
   rc = strcasestr_s((char *)0,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 400) printf_va_246("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasestr_s",(unsigned int)34,
-                               rc);
-  if (sub) printf_va_247("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
-                         (unsigned int)39,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                        (unsigned int)34,rc); /* printf_va_246 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                  (unsigned int)39,rc); /* printf_va_247 */
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)0,
                     (unsigned int)128,& sub);
-  if (rc != 400) printf_va_248("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasestr_s",(unsigned int)47,
-                               rc);
-  if (sub) printf_va_249("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
-                         (unsigned int)52,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                        (unsigned int)47,rc); /* printf_va_248 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                  (unsigned int)52,rc); /* printf_va_249 */
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,(char **)0);
-  if (rc != 400) printf_va_250("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasestr_s",(unsigned int)60,
-                               rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                        (unsigned int)60,rc); /* printf_va_250 */
   rc = strcasestr_s(str1_17,(unsigned int)0,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 401) printf_va_251("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasestr_s",(unsigned int)68,
-                               rc);
-  if (sub) printf_va_252("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
-                         (unsigned int)73,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                        (unsigned int)68,rc); /* printf_va_251 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                  (unsigned int)73,rc); /* printf_va_252 */
   rc = strcasestr_s(str1_17,(unsigned int)((4UL << 10) + (unsigned long)1),
                     (char const *)(str2_16),(unsigned int)128,& sub);
-  if (rc != 403) printf_va_253("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasestr_s",(unsigned int)81,
-                               rc);
-  if (sub) printf_va_254("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
-                         (unsigned int)86,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                        (unsigned int)81,rc); /* printf_va_253 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                  (unsigned int)86,rc); /* printf_va_254 */
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)0,& sub);
-  if (rc != 401) printf_va_255("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasestr_s",(unsigned int)94,
-                               rc);
-  if (sub) printf_va_256("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
-                         (unsigned int)99,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                        (unsigned int)94,rc); /* printf_va_255 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                  (unsigned int)99,rc); /* printf_va_256 */
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)((4UL << 10) + (unsigned long)1),& sub);
-  if (rc != 403) printf_va_257("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasestr_s",(unsigned int)107,
-                               rc);
-  if (sub) printf_va_258("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
-                         (unsigned int)112,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                        (unsigned int)107,rc); /* printf_va_257 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                  (unsigned int)112,rc); /* printf_va_258 */
   str1_17[0] = (char)'\000';
   str2_16[0] = (char)'\000';
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 0) printf_va_259("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)123,
-                             rc);
-  if (sub != str1_17) printf_va_260("%s %u  Error rc=%d \n",
-                                    (char *)"test_strcasestr_s",
-                                    (unsigned int)128,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)123,rc); /* printf_va_259 */
+  if (sub != str1_17) printf("%s %u  Error rc=%d \n",
+                             (char *)"test_strcasestr_s",(unsigned int)128,
+                             rc); /* printf_va_260 */
   std_sub = strcasestr((char const *)(str1_17),(char const *)(str2_16));
   if ((int)sub != (int)std_sub) {
-    printf_va_261("%s %u  Error strcasestr_s() does not have same return as strcasestr() when str1 & str2 are zero length strings. rc=%u \n",
-                  (char *)"test_strcasestr_s",(unsigned int)135,
-                  (unsigned int)rc);
-    printf_va_262("str1:[%s]\n",str1_17);
-    printf_va_263("str2:[%s]\n",str2_16);
-    printf_va_264("strcasestr_s returns:[%p]\n",(void *)sub);
-    printf_va_265("strcasestr   returns:[%p]\n\n",(void *)std_sub);
+    printf("%s %u  Error strcasestr_s() does not have same return as strcasestr() when str1 & str2 are zero length strings. rc=%u \n",
+           (char *)"test_strcasestr_s",(unsigned int)135,(unsigned int)rc); /* printf_va_261 */
+    printf("str1:[%s]\n",str1_17); /* printf_va_262 */
+    printf("str2:[%s]\n",str2_16); /* printf_va_263 */
+    printf("strcasestr_s returns:[%p]\n",(void *)sub); /* printf_va_264 */
+    printf("strcasestr   returns:[%p]\n\n",(void *)std_sub); /* printf_va_265 */
   }
   str1_17[0] = (char)'\000';
   strcpy(str1_17,"key");
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 0) printf_va_266("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)150,
-                             rc);
-  if (sub != str1_17) printf_va_267("%s %u  Error rc=%d \n",
-                                    (char *)"test_strcasestr_s",
-                                    (unsigned int)155,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)150,rc); /* printf_va_266 */
+  if (sub != str1_17) printf("%s %u  Error rc=%d \n",
+                             (char *)"test_strcasestr_s",(unsigned int)155,
+                             rc); /* printf_va_267 */
   std_sub = strcasestr((char const *)(str1_17),(char const *)(str2_16));
   if ((int)sub != (int)std_sub) {
-    printf_va_268("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is zero length string. rc=%u \n",
-                  (char *)"test_strcasestr_s",(unsigned int)162,
-                  (unsigned int)rc);
-    printf_va_269("str1:[%s]\n",str1_17);
-    printf_va_270("str2:[%s]\n",str2_16);
-    printf_va_271("strcasestr_s returns:[%p]\n",(void *)sub);
-    printf_va_272("strcasestr   returns:[%p]\n\n",(void *)std_sub);
+    printf("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is zero length string. rc=%u \n",
+           (char *)"test_strcasestr_s",(unsigned int)162,(unsigned int)rc); /* printf_va_268 */
+    printf("str1:[%s]\n",str1_17); /* printf_va_269 */
+    printf("str2:[%s]\n",str2_16); /* printf_va_270 */
+    printf("strcasestr_s returns:[%p]\n",(void *)sub); /* printf_va_271 */
+    printf("strcasestr   returns:[%p]\n\n",(void *)std_sub); /* printf_va_272 */
   }
   strcpy(str1_17,"keep it all together");
   str2_16[0] = (char)'\000';
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 0) printf_va_273("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)178,
-                             rc);
-  if (sub != str1_17) printf_va_274("%s %u  Error rc=%d \n",
-                                    (char *)"test_strcasestr_s",
-                                    (unsigned int)183,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)178,rc); /* printf_va_273 */
+  if (sub != str1_17) printf("%s %u  Error rc=%d \n",
+                             (char *)"test_strcasestr_s",(unsigned int)183,
+                             rc); /* printf_va_274 */
   std_sub = strcasestr((char const *)(str1_17),(char const *)(str2_16));
   if ((int)sub != (int)std_sub) {
-    printf_va_275("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is zero length string. rc=%u \n",
-                  (char *)"test_strcasestr_s",(unsigned int)190,
-                  (unsigned int)rc);
-    printf_va_276("str1:[%s]\n",str1_17);
-    printf_va_277("str2:[%s]\n",str2_16);
-    printf_va_278("strcasestr_s returns:[%p]\n",(void *)sub);
-    printf_va_279("strcasestr   returns:[%p]\n\n",(void *)std_sub);
+    printf("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is zero length string. rc=%u \n",
+           (char *)"test_strcasestr_s",(unsigned int)190,(unsigned int)rc); /* printf_va_275 */
+    printf("str1:[%s]\n",str1_17); /* printf_va_276 */
+    printf("str2:[%s]\n",str2_16); /* printf_va_277 */
+    printf("strcasestr_s returns:[%p]\n",(void *)sub); /* printf_va_278 */
+    printf("strcasestr   returns:[%p]\n\n",(void *)std_sub); /* printf_va_279 */
   }
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"kee");
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 0) printf_va_280("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)206,
-                             rc);
-  if (sub != str1_17) printf_va_281("%s %u  Error rc=%d \n",
-                                    (char *)"test_strcasestr_s",
-                                    (unsigned int)211,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)206,rc); /* printf_va_280 */
+  if (sub != str1_17) printf("%s %u  Error rc=%d \n",
+                             (char *)"test_strcasestr_s",(unsigned int)211,
+                             rc); /* printf_va_281 */
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"eep it");
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 0) printf_va_282("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)223,
-                             rc);
-  if (sub != & str1_17[1]) printf_va_283("%s %u  Error rc=%d \n",
-                                         (char *)"test_strcasestr_s",
-                                         (unsigned int)228,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)223,rc); /* printf_va_282 */
+  if (sub != & str1_17[1]) printf("%s %u  Error rc=%d \n",
+                                  (char *)"test_strcasestr_s",
+                                  (unsigned int)228,rc); /* printf_va_283 */
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"ethe");
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 0) printf_va_284("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)240,
-                             rc);
-  if (sub != & str1_17[15]) printf_va_285("%s %u  Error rc=%d \n",
-                                          (char *)"test_strcasestr_s",
-                                          (unsigned int)245,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)240,rc); /* printf_va_284 */
+  if (sub != & str1_17[15]) printf("%s %u  Error rc=%d \n",
+                                   (char *)"test_strcasestr_s",
+                                   (unsigned int)245,rc); /* printf_va_285 */
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"er");
   len1 = strlen((char const *)(str1_17));
   len2 = strlen((char const *)(str2_16));
   rc = strcasestr_s(str1_17,len1,(char const *)(str2_16),len2,& sub);
-  if (rc != 0) printf_va_286("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)260,
-                             rc);
-  if (sub != & str1_17[18]) printf_va_287("%s %u  Error rc=%d \n",
-                                          (char *)"test_strcasestr_s",
-                                          (unsigned int)265,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)260,rc); /* printf_va_286 */
+  if (sub != & str1_17[18]) printf("%s %u  Error rc=%d \n",
+                                   (char *)"test_strcasestr_s",
+                                   (unsigned int)265,rc); /* printf_va_287 */
   std_sub = strcasestr((char const *)(str1_17),(char const *)(str2_16));
   if ((int)sub != (int)std_sub) {
-    printf_va_288("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is substring of the end of str1. rc=%u \n",
-                  (char *)"test_strcasestr_s",(unsigned int)272,
-                  (unsigned int)rc);
-    printf_va_289("str1:[%s]\n",str1_17);
-    printf_va_290("str2:[%s]\n",str2_16);
-    printf_va_291("strcasestr_s returns:[%p]\n",(void *)sub);
-    printf_va_292("strcasestr   returns:[%p]\n\n",(void *)std_sub);
+    printf("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is substring of the end of str1. rc=%u \n",
+           (char *)"test_strcasestr_s",(unsigned int)272,(unsigned int)rc); /* printf_va_288 */
+    printf("str1:[%s]\n",str1_17); /* printf_va_289 */
+    printf("str2:[%s]\n",str2_16); /* printf_va_290 */
+    printf("strcasestr_s returns:[%p]\n",(void *)sub); /* printf_va_291 */
+    printf("strcasestr   returns:[%p]\n\n",(void *)std_sub); /* printf_va_292 */
   }
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"er");
@@ -15885,98 +15751,88 @@ int test_strcasestr_s(void)
   len2 = strlen((char const *)(str2_16));
   rc = strcasestr_s(str1_17,len1,(char const *)(str2_16),(unsigned int)2,
                     & sub);
-  if (rc != 0) printf_va_293("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)291,
-                             rc);
-  if (sub != & str1_17[18]) printf_va_294("%s %u  Error rc=%d \n",
-                                          (char *)"test_strcasestr_s",
-                                          (unsigned int)296,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)291,rc); /* printf_va_293 */
+  if (sub != & str1_17[18]) printf("%s %u  Error rc=%d \n",
+                                   (char *)"test_strcasestr_s",
+                                   (unsigned int)296,rc); /* printf_va_294 */
   std_sub = strcasestr((char const *)(str1_17),(char const *)(str2_16));
   if ((int)sub != (int)std_sub) {
-    printf_va_295("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is substring of middle of str1. rc=%u \n",
-                  (char *)"test_strcasestr_s",(unsigned int)303,
-                  (unsigned int)rc);
-    printf_va_296("str1:[%s]\n",str1_17);
-    printf_va_297("str2:[%s]\n",str2_16);
-    printf_va_298("strcasestr_s returns:[%p]\n",(void *)sub);
-    printf_va_299("strcasestr   returns:[%p]\n\n",(void *)std_sub);
+    printf("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is substring of middle of str1. rc=%u \n",
+           (char *)"test_strcasestr_s",(unsigned int)303,(unsigned int)rc); /* printf_va_295 */
+    printf("str1:[%s]\n",str1_17); /* printf_va_296 */
+    printf("str2:[%s]\n",str2_16); /* printf_va_297 */
+    printf("strcasestr_s returns:[%p]\n",(void *)sub); /* printf_va_298 */
+    printf("strcasestr   returns:[%p]\n\n",(void *)std_sub); /* printf_va_299 */
   }
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"it all");
   rc = strcasestr_s(str1_17,(unsigned int)3,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 409) printf_va_300("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasestr_s",(unsigned int)318,
-                               rc);
-  if (sub != (char *)0) printf_va_301("%s %u  Error rc=%d \n",
-                                      (char *)"test_strcasestr_s",
-                                      (unsigned int)323,rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                        (unsigned int)318,rc); /* printf_va_300 */
+  if (sub != (char *)0) printf("%s %u  Error rc=%d \n",
+                               (char *)"test_strcasestr_s",(unsigned int)323,
+                               rc); /* printf_va_301 */
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"it all");
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)1,& sub);
-  if (rc != 0) printf_va_302("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)334,
-                             rc);
-  if (sub != & str1_17[5]) printf_va_303("%s %u  Error rc=%d \n",
-                                         (char *)"test_strcasestr_s",
-                                         (unsigned int)339,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)334,rc); /* printf_va_302 */
+  if (sub != & str1_17[5]) printf("%s %u  Error rc=%d \n",
+                                  (char *)"test_strcasestr_s",
+                                  (unsigned int)339,rc); /* printf_va_303 */
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"it all");
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)2,& sub);
-  if (rc != 0) printf_va_304("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)350,
-                             rc);
-  if (sub != & str1_17[5]) printf_va_305("%s %u  Error rc=%d \n",
-                                         (char *)"test_strcasestr_s",
-                                         (unsigned int)355,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)350,rc); /* printf_va_304 */
+  if (sub != & str1_17[5]) printf("%s %u  Error rc=%d \n",
+                                  (char *)"test_strcasestr_s",
+                                  (unsigned int)355,rc); /* printf_va_305 */
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"it all");
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)5,& sub);
-  if (rc != 0) printf_va_306("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)366,
-                             rc);
-  if (sub != & str1_17[5]) printf_va_307("%s %u  Error rc=%d \n",
-                                         (char *)"test_strcasestr_s",
-                                         (unsigned int)371,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)366,rc); /* printf_va_306 */
+  if (sub != & str1_17[5]) printf("%s %u  Error rc=%d \n",
+                                  (char *)"test_strcasestr_s",
+                                  (unsigned int)371,rc); /* printf_va_307 */
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"1234");
   len1 = strlen((char const *)(str1_17));
   rc = strcasestr_s(str1_17,len1,(char const *)(str2_16),(unsigned int)128,
                     & sub);
-  if (rc != 409) printf_va_308("%s %u  Error rc=%d \n",
-                               (char *)"test_strcasestr_s",(unsigned int)383,
-                               rc);
-  if (sub != (char *)0) printf_va_309("%s %u  Error rc=%d \n",
-                                      (char *)"test_strcasestr_s",
-                                      (unsigned int)388,rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                        (unsigned int)383,rc); /* printf_va_308 */
+  if (sub != (char *)0) printf("%s %u  Error rc=%d \n",
+                               (char *)"test_strcasestr_s",(unsigned int)388,
+                               rc); /* printf_va_309 */
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"IT ALL");
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 0) printf_va_310("%s %u  Error rc=%d \n",
-                             (char *)"test_strcasestr_s",(unsigned int)399,
-                             rc);
-  if (sub != & str1_17[5]) printf_va_311("%s %u  Error rc=%d \n",
-                                         (char *)"test_strcasestr_s",
-                                         (unsigned int)404,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcasestr_s",
+                      (unsigned int)399,rc); /* printf_va_310 */
+  if (sub != & str1_17[5]) printf("%s %u  Error rc=%d \n",
+                                  (char *)"test_strcasestr_s",
+                                  (unsigned int)404,rc); /* printf_va_311 */
   strcpy(str1_17,"keep it all together");
   strcpy(str2_16,"EEP");
   rc = strcasestr_s(str1_17,(unsigned int)128,(char const *)(str2_16),
                     (unsigned int)128,& sub);
-  if (rc != 0) printf_va_312("%s %u  Error rc=%u \n",
-                             (char *)"test_strcasestr_s",(unsigned int)416,
-                             (unsigned int)rc);
-  if (sub != & str1_17[1]) printf_va_313("%s %u  Error rc=%u \n",
-                                         (char *)"test_strcasestr_s",
-                                         (unsigned int)421,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_strcasestr_s",
+                      (unsigned int)416,(unsigned int)rc); /* printf_va_312 */
+  if (sub != & str1_17[1]) printf("%s %u  Error rc=%u \n",
+                                  (char *)"test_strcasestr_s",
+                                  (unsigned int)421,(unsigned int)rc); /* printf_va_313 */
   std_sub = strcasestr((char const *)(str1_17),(char const *)(str2_16));
-  if ((int)sub != (int)std_sub) printf_va_314("%s %u  Error rc=%u \n",
-                                              (char *)"test_strcasestr_s",
-                                              (unsigned int)428,
-                                              (unsigned int)rc);
+  if ((int)sub != (int)std_sub) printf("%s %u  Error rc=%u \n",
+                                       (char *)"test_strcasestr_s",
+                                       (unsigned int)428,(unsigned int)rc); /* printf_va_314 */
   __retres = 0;
   return __retres;
 }
@@ -16582,123 +16438,112 @@ int test_strcmp_s(void)
   int std_ind;
   rc = strcmp_s((char const *)0,(unsigned int)128,(char const *)(str2_3),
                 & ind);
-  if (rc != 400) printf_va_315("%s %u  Error rc=%d \n",
-                               (char *)"test_strcmp_s",(unsigned int)28,rc);
-  if (ind != 0) printf_va_316("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcmp_s",(unsigned int)33,ind,
-                              rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                        (unsigned int)28,rc); /* printf_va_315 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcmp_s",(unsigned int)33,ind,rc); /* printf_va_316 */
   rc = strcmp_s((char const *)(str1_3),(unsigned int)128,(char const *)0,
                 & ind);
-  if (rc != 400) printf_va_317("%s %u  Error rc=%d \n",
-                               (char *)"test_strcmp_s",(unsigned int)41,rc);
-  if (ind != 0) printf_va_318("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcmp_s",(unsigned int)46,ind,
-                              rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                        (unsigned int)41,rc); /* printf_va_317 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcmp_s",(unsigned int)46,ind,rc); /* printf_va_318 */
   rc = strcmp_s((char const *)(str1_3),(unsigned int)128,
                 (char const *)(str2_3),(int *)0);
-  if (rc != 400) printf_va_319("%s %u  Error rc=%d \n",
-                               (char *)"test_strcmp_s",(unsigned int)54,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                        (unsigned int)54,rc); /* printf_va_319 */
   rc = strcmp_s((char const *)(str1_3),(unsigned int)0,
                 (char const *)(str2_3),& ind);
-  if (rc != 401) printf_va_320("%s %u  Error rc=%d \n",
-                               (char *)"test_strcmp_s",(unsigned int)62,rc);
-  if (ind != 0) printf_va_321("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcmp_s",(unsigned int)67,ind,
-                              rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                        (unsigned int)62,rc); /* printf_va_320 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcmp_s",(unsigned int)67,ind,rc); /* printf_va_321 */
   rc = strcmp_s((char const *)(str1_3),
                 (unsigned int)((4UL << 10) + (unsigned long)1),
                 (char const *)(str2_3),& ind);
-  if (rc != 403) printf_va_322("%s %u  Error rc=%d \n",
-                               (char *)"test_strcmp_s",(unsigned int)75,rc);
-  if (ind != 0) printf_va_323("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcmp_s",(unsigned int)80,ind,
-                              rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                        (unsigned int)75,rc); /* printf_va_322 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcmp_s",(unsigned int)80,ind,rc); /* printf_va_323 */
   str1_3[0] = (char)'\000';
   str2_3[0] = (char)'\000';
   rc = strcmp_s((char const *)(str1_3),(unsigned int)128,
                 (char const *)(str2_3),& ind);
-  if (rc != 0) printf_va_324("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
-                             (unsigned int)91,rc);
-  if (ind != 0) printf_va_325("%s %u  Error  ind=%d rc=%d \n",
-                              (char *)"test_strcmp_s",(unsigned int)96,ind,
-                              rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                      (unsigned int)91,rc); /* printf_va_324 */
+  if (ind != 0) printf("%s %u  Error  ind=%d rc=%d \n",
+                       (char *)"test_strcmp_s",(unsigned int)96,ind,rc); /* printf_va_325 */
   std_ind = strcmp((char const *)(str1_3),(char const *)(str2_3));
-  if (ind != std_ind) printf_va_326("%s %u  ind=%d  std_ind=%d  rc=%d \n",
-                                    (char *)"test_strcmp_s",
-                                    (unsigned int)102,ind,std_ind,rc);
+  if (ind != std_ind) printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
+                             (char *)"test_strcmp_s",(unsigned int)102,ind,
+                             std_ind,rc); /* printf_va_326 */
   strcpy(str1_3,"keep it simple");
   strcpy(str2_3,"keep it simple");
   rc = strcmp_s((char const *)(str1_3),(unsigned int)5,
                 (char const *)(str2_3),& ind);
-  if (rc != 0) printf_va_327("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
-                             (unsigned int)113,rc);
-  if (ind != 0) printf_va_328("%s %u  ind=%d  rc=%d \n",
-                              (char *)"test_strcmp_s",(unsigned int)118,ind,
-                              rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                      (unsigned int)113,rc); /* printf_va_327 */
+  if (ind != 0) printf("%s %u  ind=%d  rc=%d \n",(char *)"test_strcmp_s",
+                       (unsigned int)118,ind,rc); /* printf_va_328 */
   strcpy(str1_3,"Keep it simple");
   strcpy(str2_3,"keep it simple");
   rc = strcmp_s((char const *)(str1_3),(unsigned int)128,
                 (char const *)(str2_3),& ind);
-  if (rc != 0) printf_va_329("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
-                             (unsigned int)130,rc);
-  if (ind != -32) printf_va_330("%s %u  Error ind=%d  rc=%d \n",
-                                (char *)"test_strcmp_s",(unsigned int)135,
-                                ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                      (unsigned int)130,rc); /* printf_va_329 */
+  if (ind != -32) printf("%s %u  Error ind=%d  rc=%d \n",
+                         (char *)"test_strcmp_s",(unsigned int)135,ind,rc); /* printf_va_330 */
   std_ind = strcmp((char const *)(str1_3),(char const *)(str2_3));
-  if (ind != std_ind) printf_va_331("%s %u  ind=%d  std_ind=%d  rc=%d \n",
-                                    (char *)"test_strcmp_s",
-                                    (unsigned int)141,ind,std_ind,rc);
+  if (ind != std_ind) printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
+                             (char *)"test_strcmp_s",(unsigned int)141,ind,
+                             std_ind,rc); /* printf_va_331 */
   strcpy(str1_3,"keep it simple");
   strcpy(str2_3,"keeP it simple");
   rc = strcmp_s((char const *)(str1_3),(unsigned int)128,
                 (char const *)(str2_3),& ind);
-  if (rc != 0) printf_va_332("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
-                             (unsigned int)153,rc);
-  if (ind != 32) printf_va_333("%s %u  Error ind=%d  rc=%d \n",
-                               (char *)"test_strcmp_s",(unsigned int)158,ind,
-                               rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                      (unsigned int)153,rc); /* printf_va_332 */
+  if (ind != 32) printf("%s %u  Error ind=%d  rc=%d \n",
+                        (char *)"test_strcmp_s",(unsigned int)158,ind,rc); /* printf_va_333 */
   std_ind = strcmp((char const *)(str1_3),(char const *)(str2_3));
-  if (ind != std_ind) printf_va_334("%s %u  ind=%d  std_ind=%d  rc=%d \n",
-                                    (char *)"test_strcmp_s",
-                                    (unsigned int)164,ind,std_ind,rc);
+  if (ind != std_ind) printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
+                             (char *)"test_strcmp_s",(unsigned int)164,ind,
+                             std_ind,rc); /* printf_va_334 */
   strcpy(str1_3,"keep it simple");
   rc = strcmp_s((char const *)(str1_3),(unsigned int)128,
                 (char const *)(str1_3),& ind);
-  if (rc != 0) printf_va_335("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
-                             (unsigned int)174,rc);
-  if (ind != 0) printf_va_336("%s %u  Error ind=%d  rc=%d \n",
-                              (char *)"test_strcmp_s",(unsigned int)179,ind,
-                              rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                      (unsigned int)174,rc); /* printf_va_335 */
+  if (ind != 0) printf("%s %u  Error ind=%d  rc=%d \n",
+                       (char *)"test_strcmp_s",(unsigned int)179,ind,rc); /* printf_va_336 */
   std_ind = strcmp((char const *)(str1_3),(char const *)(str1_3));
-  if (ind != std_ind) printf_va_337("%s %u  ind=%d  std_ind=%d  rc=%d \n",
-                                    (char *)"test_strcmp_s",
-                                    (unsigned int)186,ind,std_ind,rc);
+  if (ind != std_ind) printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
+                             (char *)"test_strcmp_s",(unsigned int)186,ind,
+                             std_ind,rc); /* printf_va_337 */
   strcpy(str1_3,"keep it simplified");
   strcpy(str2_3,"keep it simple");
   rc = strcmp_s((char const *)(str1_3),(unsigned int)128,
                 (char const *)(str2_3),& ind);
-  if (rc != 0) printf_va_338("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
-                             (unsigned int)197,rc);
-  if (ind <= 0) printf_va_339("%s %u  Error ind=%d  rc=%d \n",
-                              (char *)"test_strcmp_s",(unsigned int)202,ind,
-                              rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                      (unsigned int)197,rc); /* printf_va_338 */
+  if (ind <= 0) printf("%s %u  Error ind=%d  rc=%d \n",
+                       (char *)"test_strcmp_s",(unsigned int)202,ind,rc); /* printf_va_339 */
   std_ind = strcmp((char const *)(str1_3),(char const *)(str2_3));
-  if (ind != std_ind) printf_va_340("%s %u  ind=%d  std_ind=%d  rc=%d \n",
-                                    (char *)"test_strcmp_s",
-                                    (unsigned int)209,ind,std_ind,rc);
+  if (ind != std_ind) printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
+                             (char *)"test_strcmp_s",(unsigned int)209,ind,
+                             std_ind,rc); /* printf_va_340 */
   strcpy(str1_3,"keep it simple");
   strcpy(str2_3,"keep it simplified");
   rc = strcmp_s((char const *)(str1_3),(unsigned int)128,
                 (char const *)(str2_3),& ind);
-  if (rc != 0) printf_va_341("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
-                             (unsigned int)220,rc);
-  if (ind >= 0) printf_va_342("%s %u  Error ind=%d  rc=%d \n",
-                              (char *)"test_strcmp_s",(unsigned int)225,ind,
-                              rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcmp_s",
+                      (unsigned int)220,rc); /* printf_va_341 */
+  if (ind >= 0) printf("%s %u  Error ind=%d  rc=%d \n",
+                       (char *)"test_strcmp_s",(unsigned int)225,ind,rc); /* printf_va_342 */
   std_ind = strcmp((char const *)(str1_3),(char const *)(str2_3));
-  if (ind != std_ind) printf_va_343("%s %u  ind=%d  std_ind=%d  rc=%d \n",
-                                    (char *)"test_strcmp_s",
-                                    (unsigned int)232,ind,std_ind,rc);
+  if (ind != std_ind) printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
+                             (char *)"test_strcmp_s",(unsigned int)232,ind,
+                             std_ind,rc); /* printf_va_343 */
   __retres = 0;
   return __retres;
 }
@@ -17994,183 +17839,181 @@ int test_strcspn_s(void)
   size_t tmp_2;
   unsigned int testno = (unsigned int)0;
   testno ++;
-  printf_va_344("Test #%d: NULL Scan String Check\n",(int)testno);
+  printf("Test #%d: NULL Scan String Check\n",(int)testno); /* printf_va_344 */
   rc = strcspn_s((char const *)0,(unsigned int)128,(char const *)(str2_5),
                  (unsigned int)128,& count);
-  if (rc != 400) printf_va_345("%s %u  Error rc=%d \n",
-                               (char *)"test_strcspn_s",(unsigned int)33,rc);
-  if (count != (rsize_t)0) printf_va_346("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)38,count,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                        (unsigned int)33,rc); /* printf_va_345 */
+  if (count != (rsize_t)0) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)38,
+                                  count,rc); /* printf_va_346 */
   testno ++;
-  printf_va_347("Test #%d: NULL Exclusion String Check: \n",(int)testno);
+  printf("Test #%d: NULL Exclusion String Check: \n",(int)testno); /* printf_va_347 */
   rc = strcspn_s((char const *)(str1_5),(unsigned int)128,(char const *)0,
                  (unsigned int)128,& count);
-  if (rc != 400) printf_va_348("%s %u  Error rc=%d \n",
-                               (char *)"test_strcspn_s",(unsigned int)48,rc);
-  if (count != (rsize_t)0) printf_va_349("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)53,count,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                        (unsigned int)48,rc); /* printf_va_348 */
+  if (count != (rsize_t)0) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)53,
+                                  count,rc); /* printf_va_349 */
   testno ++;
-  printf_va_350("Test #%d: NULL Count parameter Check: \n",(int)testno);
+  printf("Test #%d: NULL Count parameter Check: \n",(int)testno); /* printf_va_350 */
   rc = strcspn_s((char const *)(str1_5),(unsigned int)128,
                  (char const *)(str2_5),(unsigned int)128,(rsize_t *)0);
-  if (rc != 400) printf_va_351("%s %u  Error rc=%d \n",
-                               (char *)"test_strcspn_s",(unsigned int)63,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                        (unsigned int)63,rc); /* printf_va_351 */
   testno ++;
-  printf_va_352("Test #%d:Zero Length Scan String Check\n",(int)testno);
+  printf("Test #%d:Zero Length Scan String Check\n",(int)testno); /* printf_va_352 */
   rc = strcspn_s((char const *)(str1_5),(unsigned int)0,
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 401) printf_va_353("%s %u  Error rc=%d \n",
-                               (char *)"test_strcspn_s",(unsigned int)73,rc);
-  if (count != (rsize_t)0) printf_va_354("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)78,count,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                        (unsigned int)73,rc); /* printf_va_353 */
+  if (count != (rsize_t)0) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)78,
+                                  count,rc); /* printf_va_354 */
   testno ++;
-  printf_va_355("Test #%d:Zero Length Exclusion String Check\n",(int)testno);
+  printf("Test #%d:Zero Length Exclusion String Check\n",(int)testno); /* printf_va_355 */
   rc = strcspn_s((char const *)(str1_5),(unsigned int)128,
                  (char const *)(str2_5),(unsigned int)0,& count);
-  if (rc != 401) printf_va_356("%s %u  Error rc=%d \n",
-                               (char *)"test_strcspn_s",(unsigned int)88,rc);
-  if (count != (rsize_t)0) printf_va_357("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)93,count,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                        (unsigned int)88,rc); /* printf_va_356 */
+  if (count != (rsize_t)0) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)93,
+                                  count,rc); /* printf_va_357 */
   testno ++;
-  printf_va_358("Test #%d:Exceed Max Length Scan String Check\n",(int)testno);
+  printf("Test #%d:Exceed Max Length Scan String Check\n",(int)testno); /* printf_va_358 */
   rc = strcspn_s((char const *)(str1_5),
                  (unsigned int)((4UL << 10) + (unsigned long)1),
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 403) printf_va_359("%s %u  Error rc=%d \n",
-                               (char *)"test_strcspn_s",(unsigned int)103,rc);
-  if (count != (rsize_t)0) printf_va_360("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)108,count,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                        (unsigned int)103,rc); /* printf_va_359 */
+  if (count != (rsize_t)0) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)108,
+                                  count,rc); /* printf_va_360 */
   testno ++;
-  printf_va_361("Test #%d:Exceed Max Length Exclusion String Check\n",
-                (int)testno);
+  printf("Test #%d:Exceed Max Length Exclusion String Check\n",(int)testno); /* printf_va_361 */
   rc = strcspn_s((char const *)(str1_5),(unsigned int)(4UL << 10),
                  (char const *)(str2_5),
                  (unsigned int)((4UL << 10) + (unsigned long)1),& count);
-  if (rc != 403) printf_va_362("%s %u  Error rc=%d \n",
-                               (char *)"test_strcspn_s",(unsigned int)118,rc);
-  if (count != (rsize_t)0) printf_va_363("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)123,count,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                        (unsigned int)118,rc); /* printf_va_362 */
+  if (count != (rsize_t)0) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)123,
+                                  count,rc); /* printf_va_363 */
   testno ++;
-  printf_va_364("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_364 */
   str1_5[0] = (char)'\000';
   str2_5[0] = (char)'\000';
   rc = strcspn_s((char const *)(str1_5),(unsigned int)128,
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 0) printf_va_365("%s %u  Error rc=%d \n",
-                             (char *)"test_strcspn_s",(unsigned int)136,rc);
-  if (count != (rsize_t)0) printf_va_366("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)141,count,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                      (unsigned int)136,rc); /* printf_va_365 */
+  if (count != (rsize_t)0) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)141,
+                                  count,rc); /* printf_va_366 */
   tmp = strcspn((char const *)(str1_5),(char const *)(str2_5));
   std_count = (int)tmp;
-  if (count != (rsize_t)std_count) printf_va_367("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strcspn_s",
-                                                 (unsigned int)147,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strcspn_s",
+                                          (unsigned int)147,count,std_count,
+                                          rc); /* printf_va_367 */
   testno ++;
-  printf_va_368("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_368 */
   strcpy(str1_5,"keep it simple");
   strcpy(str2_5,"KEEP");
   rc = strcspn_s((char const *)(str1_5),(unsigned int)1,
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 0) printf_va_369("%s %u  Error rc=%d \n",
-                             (char *)"test_strcspn_s",(unsigned int)161,rc);
-  if (count != (rsize_t)1) printf_va_370("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)166,count,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                      (unsigned int)161,rc); /* printf_va_369 */
+  if (count != (rsize_t)1) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)166,
+                                  count,rc); /* printf_va_370 */
   testno ++;
-  printf_va_371("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_371 */
   strcpy(str1_5,"keep it simple");
   strcpy(str2_5,"KEEP");
   rc = strcspn_s((char const *)(str1_5),(unsigned int)2,
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 0) printf_va_372("%s %u  Error rc=%d \n",
-                             (char *)"test_strcspn_s",(unsigned int)180,rc);
-  if (count != (rsize_t)2) printf_va_373("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)185,count,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                      (unsigned int)180,rc); /* printf_va_372 */
+  if (count != (rsize_t)2) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)185,
+                                  count,rc); /* printf_va_373 */
   testno ++;
-  printf_va_374("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_374 */
   strcpy(str1_5,"keep it simple");
   strcpy(str2_5,"KEEP");
   rc = strcspn_s((char const *)(str1_5),(unsigned int)3,
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 0) printf_va_375("%s %u  Error rc=%d \n",
-                             (char *)"test_strcspn_s",(unsigned int)199,rc);
-  if (count != (rsize_t)3) printf_va_376("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)204,count,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                      (unsigned int)199,rc); /* printf_va_375 */
+  if (count != (rsize_t)3) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)204,
+                                  count,rc); /* printf_va_376 */
   testno ++;
-  printf_va_377("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_377 */
   strcpy(str1_5,"keep it simple");
   strcpy(str2_5,"KEEP");
   rc = strcspn_s((char const *)(str1_5),(unsigned int)6,
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 0) printf_va_378("%s %u  Error rc=%d \n",
-                             (char *)"test_strcspn_s",(unsigned int)219,rc);
-  if (count != (rsize_t)6) printf_va_379("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)224,count,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                      (unsigned int)219,rc); /* printf_va_378 */
+  if (count != (rsize_t)6) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)224,
+                                  count,rc); /* printf_va_379 */
   testno ++;
-  printf_va_380("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_380 */
   strcpy(str1_5,"keep it simple");
   strcpy(str2_5,"ABCDEF");
   rc = strcspn_s((char const *)(str1_5),(unsigned int)6,
                  (char const *)(str2_5),(unsigned int)2,& count);
-  if (rc != 0) printf_va_381("%s %u  Error rc=%d \n",
-                             (char *)"test_strcspn_s",(unsigned int)238,rc);
-  if (count != (rsize_t)6) printf_va_382("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strcspn_s",
-                                         (unsigned int)243,count,std_count,
-                                         rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                      (unsigned int)238,rc); /* printf_va_381 */
+  if (count != (rsize_t)6) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strcspn_s",(unsigned int)243,
+                                  count,std_count,rc); /* printf_va_382 */
   testno ++;
-  printf_va_383("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_383 */
   strcpy(str1_5,"keep it simple");
   strcpy(str2_5,"keep");
   rc = strcspn_s((char const *)(str1_5),(unsigned int)128,
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 0) printf_va_384("%s %u  Error rc=%d \n",
-                             (char *)"test_strcspn_s",(unsigned int)257,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                      (unsigned int)257,rc); /* printf_va_384 */
   tmp_0 = strcspn((char const *)(str1_5),(char const *)(str2_5));
   std_count = (int)tmp_0;
-  if (count != (rsize_t)std_count) printf_va_385("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strcspn_s",
-                                                 (unsigned int)263,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strcspn_s",
+                                          (unsigned int)263,count,std_count,
+                                          rc); /* printf_va_385 */
   testno ++;
-  printf_va_386("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_386 */
   strcpy(str1_5,"keep it simple");
   strcpy(str2_5,"notincluded");
   rc = strcspn_s((char const *)(str1_5),(unsigned int)128,
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 0) printf_va_387("%s %u  Error rc=%d \n",
-                             (char *)"test_strcspn_s",(unsigned int)277,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                      (unsigned int)277,rc); /* printf_va_387 */
   tmp_1 = strcspn((char const *)(str1_5),(char const *)(str2_5));
   std_count = (int)tmp_1;
-  if (count != (rsize_t)std_count) printf_va_388("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strcspn_s",
-                                                 (unsigned int)283,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strcspn_s",
+                                          (unsigned int)283,count,std_count,
+                                          rc); /* printf_va_388 */
   testno ++;
-  printf_va_389("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_389 */
   strcpy(str1_5,"keep it simple");
   strcpy(str2_5,"1234567890");
   rc = strcspn_s((char const *)(str1_5),(unsigned int)128,
                  (char const *)(str2_5),(unsigned int)128,& count);
-  if (rc != 0) printf_va_390("%s %u  Error rc=%d \n",
-                             (char *)"test_strcspn_s",(unsigned int)297,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strcspn_s",
+                      (unsigned int)297,rc); /* printf_va_390 */
   tmp_2 = strcspn((char const *)(str1_5),(char const *)(str2_5));
   std_count = (int)tmp_2;
-  if (count != (rsize_t)std_count) printf_va_391("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strcspn_s",
-                                                 (unsigned int)303,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strcspn_s",
+                                          (unsigned int)303,count,std_count,
+                                          rc); /* printf_va_391 */
   __retres = 0;
   return __retres;
 }
@@ -18469,84 +18312,72 @@ int test_strfirstchar_s(void)
   char *first;
   char str1_17[128];
   rc = strfirstchar_s((char *)0,(unsigned int)128,(char)'a',& first);
-  if (rc != 400) printf_va_392("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                               (char *)"test_strfirstchar_s",
-                               (unsigned int)27,(void *)(str1_17),
-                               (void *)first,rc);
-  if (first) printf_va_393("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                           (char *)"test_strfirstchar_s",(unsigned int)32,
-                           (void *)(str1_17),(void *)first,rc);
+  if (rc != 400) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                        (char *)"test_strfirstchar_s",(unsigned int)27,
+                        (void *)(str1_17),(void *)first,rc); /* printf_va_392 */
+  if (first) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                    (char *)"test_strfirstchar_s",(unsigned int)32,
+                    (void *)(str1_17),(void *)first,rc); /* printf_va_393 */
   rc = strfirstchar_s(str1_17,(unsigned int)128,(char)'a',(char **)0);
-  if (rc != 400) printf_va_394("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                               (char *)"test_strfirstchar_s",
-                               (unsigned int)40,(void *)(str1_17),
-                               (void *)first,rc);
+  if (rc != 400) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                        (char *)"test_strfirstchar_s",(unsigned int)40,
+                        (void *)(str1_17),(void *)first,rc); /* printf_va_394 */
   rc = strfirstchar_s(str1_17,(unsigned int)0,(char)'a',& first);
-  if (rc != 401) printf_va_395("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                               (char *)"test_strfirstchar_s",
-                               (unsigned int)48,(void *)(str1_17),
-                               (void *)first,rc);
-  if (first) printf_va_396("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                           (char *)"test_strfirstchar_s",(unsigned int)53,
-                           (void *)(str1_17),(void *)first,rc);
+  if (rc != 401) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                        (char *)"test_strfirstchar_s",(unsigned int)48,
+                        (void *)(str1_17),(void *)first,rc); /* printf_va_395 */
+  if (first) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                    (char *)"test_strfirstchar_s",(unsigned int)53,
+                    (void *)(str1_17),(void *)first,rc); /* printf_va_396 */
   rc = strfirstchar_s(str1_17,(unsigned int)((4UL << 10) + (unsigned long)1),
                       (char)'a',& first);
-  if (rc != 403) printf_va_397("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                               (char *)"test_strfirstchar_s",
-                               (unsigned int)61,(void *)(str1_17),
-                               (void *)first,rc);
-  if (first) printf_va_398("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                           (char *)"test_strfirstchar_s",(unsigned int)66,
-                           (void *)(str1_17),(void *)first,rc);
+  if (rc != 403) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                        (char *)"test_strfirstchar_s",(unsigned int)61,
+                        (void *)(str1_17),(void *)first,rc); /* printf_va_397 */
+  if (first) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                    (char *)"test_strfirstchar_s",(unsigned int)66,
+                    (void *)(str1_17),(void *)first,rc); /* printf_va_398 */
   str1_17[0] = (char)'\000';
   rc = strfirstchar_s(str1_17,(unsigned int)128,(char)'a',& first);
-  if (rc != 409) printf_va_399("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                               (char *)"test_strfirstchar_s",
-                               (unsigned int)76,(void *)(str1_17),
-                               (void *)first,rc);
-  if (first) printf_va_400("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                           (char *)"test_strfirstchar_s",(unsigned int)81,
-                           (void *)(str1_17),(void *)first,rc);
+  if (rc != 409) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                        (char *)"test_strfirstchar_s",(unsigned int)76,
+                        (void *)(str1_17),(void *)first,rc); /* printf_va_399 */
+  if (first) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                    (char *)"test_strfirstchar_s",(unsigned int)81,
+                    (void *)(str1_17),(void *)first,rc); /* printf_va_400 */
   strcpy(str1_17,"Keep it simple");
   rc = strfirstchar_s(str1_17,(unsigned int)128,(char)'z',& first);
-  if (rc != 409) printf_va_401("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                               (char *)"test_strfirstchar_s",
-                               (unsigned int)91,(void *)(str1_17),
-                               (void *)first,rc);
-  if (first) printf_va_402("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                           (char *)"test_strfirstchar_s",(unsigned int)96,
-                           (void *)(str1_17),(void *)first,rc);
+  if (rc != 409) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                        (char *)"test_strfirstchar_s",(unsigned int)91,
+                        (void *)(str1_17),(void *)first,rc); /* printf_va_401 */
+  if (first) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                    (char *)"test_strfirstchar_s",(unsigned int)96,
+                    (void *)(str1_17),(void *)first,rc); /* printf_va_402 */
   strcpy(str1_17,"kEEp it simple");
   rc = strfirstchar_s(str1_17,(unsigned int)128,(char)'E',& first);
-  if (rc != 0) printf_va_403("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstchar_s",(unsigned int)106,
-                             rc);
-  if (first != & str1_17[1]) printf_va_404("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                                           (char *)"test_strfirstchar_s",
-                                           (unsigned int)111,
-                                           (void *)(str1_17),(void *)first,
-                                           rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstchar_s",
+                      (unsigned int)106,rc); /* printf_va_403 */
+  if (first != & str1_17[1]) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                                    (char *)"test_strfirstchar_s",
+                                    (unsigned int)111,(void *)(str1_17),
+                                    (void *)first,rc); /* printf_va_404 */
   strcpy(str1_17,"keep it simpleZ");
   len = strlen((char const *)(str1_17));
   rc = strfirstchar_s(str1_17,len,(char)'Z',& first);
-  if (rc != 0) printf_va_405("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstchar_s",(unsigned int)122,
-                             rc);
-  if (first != & str1_17[14]) printf_va_406("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                                            (char *)"test_strfirstchar_s",
-                                            (unsigned int)127,
-                                            (void *)(str1_17),(void *)first,
-                                            rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstchar_s",
+                      (unsigned int)122,rc); /* printf_va_405 */
+  if (first != & str1_17[14]) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                                     (char *)"test_strfirstchar_s",
+                                     (unsigned int)127,(void *)(str1_17),
+                                     (void *)first,rc); /* printf_va_406 */
   strcpy(str1_17,"keep it simpleZZ");
   rc = strfirstchar_s(str1_17,(unsigned int)128,(char)'Z',& first);
-  if (rc != 0) printf_va_407("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstchar_s",(unsigned int)137,
-                             rc);
-  if (first != & str1_17[14]) printf_va_408("%s %u  Error  str1=%p  first=%p  rc=%d \n",
-                                            (char *)"test_strfirstchar_s",
-                                            (unsigned int)142,
-                                            (void *)(str1_17),(void *)first,
-                                            rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstchar_s",
+                      (unsigned int)137,rc); /* printf_va_407 */
+  if (first != & str1_17[14]) printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
+                                     (char *)"test_strfirstchar_s",
+                                     (unsigned int)142,(void *)(str1_17),
+                                     (void *)first,rc); /* printf_va_408 */
   __retres = 0;
   return __retres;
 }
@@ -19005,131 +18836,117 @@ int test_strfirstdiff_s(void)
   char str2_16[128];
   rc = strfirstdiff_s((char const *)0,(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 400) printf_va_409("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstdiff_s",
-                               (unsigned int)28,rc);
-  if (ind != (rsize_t)0) printf_va_410("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)33,ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstdiff_s",(unsigned int)28,rc); /* printf_va_409 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)33,ind,rc); /* printf_va_410 */
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)0,& ind);
-  if (rc != 400) printf_va_411("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstdiff_s",
-                               (unsigned int)41,rc);
-  if (ind != (rsize_t)0) printf_va_412("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)46,ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstdiff_s",(unsigned int)41,rc); /* printf_va_411 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)46,ind,rc); /* printf_va_412 */
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),(rsize_t *)0);
-  if (rc != 400) printf_va_413("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstdiff_s",
-                               (unsigned int)54,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstdiff_s",(unsigned int)54,rc); /* printf_va_413 */
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)0,
                       (char const *)(str2_16),& ind);
-  if (rc != 401) printf_va_414("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstdiff_s",
-                               (unsigned int)62,rc);
-  if (ind != (rsize_t)0) printf_va_415("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)67,ind,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstdiff_s",(unsigned int)62,rc); /* printf_va_414 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)67,ind,rc); /* printf_va_415 */
   rc = strfirstdiff_s((char const *)(str1_17),
                       (unsigned int)((4UL << 10) + (unsigned long)1),
                       (char const *)(str2_16),& ind);
-  if (rc != 403) printf_va_416("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstdiff_s",
-                               (unsigned int)75,rc);
-  if (ind != (rsize_t)0) printf_va_417("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)80,ind,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstdiff_s",(unsigned int)75,rc); /* printf_va_416 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)80,ind,rc); /* printf_va_417 */
   str1_17[0] = (char)'\000';
   str2_16[0] = (char)'\000';
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 408) printf_va_418("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstdiff_s",
-                               (unsigned int)91,rc);
-  if (ind != (rsize_t)0) printf_va_419("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)96,ind,rc);
+  if (rc != 408) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstdiff_s",(unsigned int)91,rc); /* printf_va_418 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)96,ind,rc); /* printf_va_419 */
   strcpy(str1_17,"Keep it simple");
   strcpy(str2_16,"keep it simple");
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_420("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstdiff_s",(unsigned int)107,
-                             rc);
-  if (ind != (rsize_t)0) printf_va_421("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)112,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstdiff_s",
+                      (unsigned int)107,rc); /* printf_va_420 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)112,ind,rc); /* printf_va_421 */
   strcpy(str1_17,"kEeP it simple");
   strcpy(str2_16,"keep it simple");
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_422("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstdiff_s",(unsigned int)123,
-                             rc);
-  if (ind != (rsize_t)1) printf_va_423("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)128,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstdiff_s",
+                      (unsigned int)123,rc); /* printf_va_422 */
+  if (ind != (rsize_t)1) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)128,ind,rc); /* printf_va_423 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keEp IT simple");
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_424("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstdiff_s",(unsigned int)139,
-                             rc);
-  if (ind != (rsize_t)2) printf_va_425("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)144,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstdiff_s",
+                      (unsigned int)139,rc); /* printf_va_424 */
+  if (ind != (rsize_t)2) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)144,ind,rc); /* printf_va_425 */
   strcpy(str1_17,"keep it simple");
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str1_17),& ind);
-  if (rc != 408) printf_va_426("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstdiff_s",
-                               (unsigned int)154,rc);
-  if (ind != (rsize_t)0) printf_va_427("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)159,ind,rc);
+  if (rc != 408) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstdiff_s",(unsigned int)154,rc); /* printf_va_426 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)159,ind,rc); /* printf_va_427 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keep it simple");
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)1,
                       (char const *)(str2_16),& ind);
-  if (rc != 408) printf_va_428("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstdiff_s",
-                               (unsigned int)170,rc);
-  if (ind != (rsize_t)0) printf_va_429("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)175,ind,rc);
+  if (rc != 408) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstdiff_s",(unsigned int)170,rc); /* printf_va_428 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)175,ind,rc); /* printf_va_429 */
   strcpy(str1_17,"keep it simplE");
   strcpy(str2_16,"keep it simple");
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)13,
                       (char const *)(str2_16),& ind);
-  if (rc != 408) printf_va_430("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstdiff_s",
-                               (unsigned int)186,rc);
-  if (ind != (rsize_t)0) printf_va_431("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstdiff_s",
-                                       (unsigned int)191,ind,rc);
+  if (rc != 408) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstdiff_s",(unsigned int)186,rc); /* printf_va_430 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstdiff_s",
+                                (unsigned int)191,ind,rc); /* printf_va_431 */
   strcpy(str1_17,"keep it simplE");
   strcpy(str2_16,"keep it simple");
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)14,
                       (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_432("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstdiff_s",(unsigned int)202,
-                             rc);
-  if (ind != (rsize_t)13) printf_va_433("%s %u  Error ind=%zu  rc=%d \n",
-                                        (char *)"test_strfirstdiff_s",
-                                        (unsigned int)207,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstdiff_s",
+                      (unsigned int)202,rc); /* printf_va_432 */
+  if (ind != (rsize_t)13) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                 (char *)"test_strfirstdiff_s",
+                                 (unsigned int)207,ind,rc); /* printf_va_433 */
   strcpy(str1_17,"keep it simplE");
   strcpy(str2_16,"keep it simple");
   rc = strfirstdiff_s((char const *)(str1_17),(unsigned int)55,
                       (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_434("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstdiff_s",(unsigned int)218,
-                             rc);
-  if (ind != (rsize_t)13) printf_va_435("%s %u  Error ind=%zu  rc=%d \n",
-                                        (char *)"test_strfirstdiff_s",
-                                        (unsigned int)223,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstdiff_s",
+                      (unsigned int)218,rc); /* printf_va_434 */
+  if (ind != (rsize_t)13) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                 (char *)"test_strfirstdiff_s",
+                                 (unsigned int)223,ind,rc); /* printf_va_435 */
   __retres = 0;
   return __retres;
 }
@@ -19625,141 +19442,129 @@ int test_strfirstsame_s(void)
   char str2_16[128];
   rc = strfirstsame_s((char const *)0,(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 400) printf_va_436("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)28,rc);
-  if (ind != (rsize_t)0) printf_va_437("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)33,ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)28,rc); /* printf_va_436 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)33,ind,rc); /* printf_va_437 */
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)0,& ind);
-  if (rc != 400) printf_va_438("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)41,rc);
-  if (ind != (rsize_t)0) printf_va_439("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)46,ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)41,rc); /* printf_va_438 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)46,ind,rc); /* printf_va_439 */
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),(rsize_t *)0);
-  if (rc != 400) printf_va_440("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)54,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)54,rc); /* printf_va_440 */
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)0,
                       (char const *)(str2_16),& ind);
-  if (rc != 401) printf_va_441("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)62,rc);
-  if (ind != (rsize_t)0) printf_va_442("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)67,ind,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)62,rc); /* printf_va_441 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)67,ind,rc); /* printf_va_442 */
   rc = strfirstsame_s((char const *)(str1_17),
                       (unsigned int)((4UL << 10) + (unsigned long)1),
                       (char const *)(str2_16),& ind);
-  if (rc != 403) printf_va_443("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)75,rc);
-  if (ind != (rsize_t)0) printf_va_444("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)80,ind,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)75,rc); /* printf_va_443 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)80,ind,rc); /* printf_va_444 */
   str1_17[0] = (char)'\000';
   str2_16[0] = (char)'\000';
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 409) printf_va_445("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)91,rc);
-  if (ind != (rsize_t)0) printf_va_446("%s %u  Error  ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)96,ind,rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)91,rc); /* printf_va_445 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)96,ind,rc); /* printf_va_446 */
   strcpy(str1_17,"kEEP it simple");
   strcpy(str2_16,"keep it simple");
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_447("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstsame_s",(unsigned int)107,
-                             rc);
-  if (ind != (rsize_t)0) printf_va_448("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)112,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstsame_s",
+                      (unsigned int)107,rc); /* printf_va_447 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)112,ind,rc); /* printf_va_448 */
   strcpy(str1_17,"Keep it simple");
   strcpy(str2_16,"keep it simple");
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_449("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstsame_s",(unsigned int)123,
-                             rc);
-  if (ind != (rsize_t)1) printf_va_450("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)128,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstsame_s",
+                      (unsigned int)123,rc); /* printf_va_449 */
+  if (ind != (rsize_t)1) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)128,ind,rc); /* printf_va_450 */
   strcpy(str1_17,"KEEP it simple");
   strcpy(str2_16,"keep it simple");
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_451("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstsame_s",(unsigned int)139,
-                             rc);
-  if (ind != (rsize_t)4) printf_va_452("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)144,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstsame_s",
+                      (unsigned int)139,rc); /* printf_va_451 */
+  if (ind != (rsize_t)4) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)144,ind,rc); /* printf_va_452 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"KEEP_IT_SIMPLe");
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)13,
                       (char const *)(str2_16),& ind);
-  if (rc != 409) printf_va_453("%s %u  Error rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)155,rc);
-  if (ind != (rsize_t)0) printf_va_454("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)160,ind,rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)155,rc); /* printf_va_453 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)160,ind,rc); /* printf_va_454 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"KEEP_IT_SIMPLe");
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)14,
                       (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_455("%s %u  Error rc=%d \n",
-                             (char *)"test_strfirstsame_s",(unsigned int)171,
-                             rc);
-  if (ind != (rsize_t)13) printf_va_456("%s %u  Error ind=%zu  rc=%d \n",
-                                        (char *)"test_strfirstsame_s",
-                                        (unsigned int)176,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strfirstsame_s",
+                      (unsigned int)171,rc); /* printf_va_455 */
+  if (ind != (rsize_t)13) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                 (char *)"test_strfirstsame_s",
+                                 (unsigned int)176,ind,rc); /* printf_va_456 */
   strcpy(str1_17,"keep it simple");
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str1_17),& ind);
-  if (rc != 0) printf_va_457("%s %u  Error ind=%zu  rc=%d \n",
-                             (char *)"test_strfirstsame_s",(unsigned int)187,
-                             ind,rc);
-  if (ind != (rsize_t)0) printf_va_458("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)192,ind,rc);
+  if (rc != 0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                      (char *)"test_strfirstsame_s",(unsigned int)187,ind,rc); /* printf_va_457 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)192,ind,rc); /* printf_va_458 */
   strcpy(str1_17,"KEEP it simple");
   strcpy(str2_16,"keep it simple");
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)1,
                       (char const *)(str2_16),& ind);
-  if (rc != 409) printf_va_459("%s %u  Error ind=%zu  rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)203,ind,rc);
-  if (ind != (rsize_t)0) printf_va_460("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)208,ind,rc);
+  if (rc != 409) printf("%s %u  Error ind=%zu  rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)203,ind,
+                        rc); /* printf_va_459 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)208,ind,rc); /* printf_va_460 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"KEEP_IT_SIMPLE");
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)5,
                       (char const *)(str2_16),& ind);
-  if (rc != 409) printf_va_461("%s %u  Error ind=%zu  rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)219,ind,rc);
-  if (ind != (rsize_t)0) printf_va_462("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)224,ind,rc);
+  if (rc != 409) printf("%s %u  Error ind=%zu  rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)219,ind,
+                        rc); /* printf_va_461 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)224,ind,rc); /* printf_va_462 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"KEEP_IT_SIMPLE");
   rc = strfirstsame_s((char const *)(str1_17),(unsigned int)128,
                       (char const *)(str2_16),& ind);
-  if (rc != 409) printf_va_463("%s %u  Error ind=%zu  rc=%d \n",
-                               (char *)"test_strfirstsame_s",
-                               (unsigned int)235,ind,rc);
-  if (ind != (rsize_t)0) printf_va_464("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strfirstsame_s",
-                                       (unsigned int)240,ind,rc);
+  if (rc != 409) printf("%s %u  Error ind=%zu  rc=%d \n",
+                        (char *)"test_strfirstsame_s",(unsigned int)235,ind,
+                        rc); /* printf_va_463 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strfirstsame_s",
+                                (unsigned int)240,ind,rc); /* printf_va_464 */
   __retres = 0;
   return __retres;
 }
@@ -19948,65 +19753,65 @@ int test_strisalphanumeric_s(void)
   char str[128];
   len = (unsigned int)5;
   rc = strisalphanumeric_s((char const *)0,len);
-  if ((int)rc != 0) printf_va_465("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)28,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)28,(unsigned int)((int)rc)); /* printf_va_465 */
   len = (unsigned int)0;
   rc = strisalphanumeric_s("test",len);
-  if ((int)rc != 0) printf_va_466("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)37,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)37,(unsigned int)((int)rc)); /* printf_va_466 */
   len = (unsigned int)99999;
   rc = strisalphanumeric_s("test",len);
-  if ((int)rc != 0) printf_va_467("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)47,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)47,(unsigned int)((int)rc)); /* printf_va_467 */
   rc = strisalphanumeric_s("",(unsigned int)128);
-  if ((int)rc != 0) printf_va_468("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)56,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)56,(unsigned int)((int)rc)); /* printf_va_468 */
   strcpy(str,"123456789");
   len = (unsigned int)4;
   rc = strisalphanumeric_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_469("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)67,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)67,(unsigned int)((int)rc)); /* printf_va_469 */
   strcpy(str,"N");
   rc = strisalphanumeric_s((char const *)(str),(unsigned int)1);
-  if ((int)rc != 1) printf_va_470("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)77,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)77,(unsigned int)((int)rc)); /* printf_va_470 */
   strcpy(str,"N");
   len = strlen((char const *)(str));
   rc = strisalphanumeric_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_471("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)88,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)88,(unsigned int)((int)rc)); /* printf_va_471 */
   strcpy(str,"NowISTHETimE4us");
   len = strlen((char const *)(str));
   rc = strisalphanumeric_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_472("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)99,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)99,(unsigned int)((int)rc)); /* printf_va_472 */
   strcpy(str,"qq21ego");
   len = strlen((char const *)(str));
   rc = strisalphanumeric_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_473("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)110,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)110,(unsigned int)((int)rc)); /* printf_va_473 */
   strcpy(str,"1234");
   str[2] = (char)132;
   len = strlen((char const *)(str));
   rc = strisalphanumeric_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_474("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)123,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)123,(unsigned int)((int)rc)); /* printf_va_474 */
   strcpy(str,"!@#$%^&*(){}[]:;\"\'?/.>,<");
   len = strlen((char const *)(str));
   rc = strisalphanumeric_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_475("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisalphanumeric_s",
-                                  (unsigned int)134,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisalphanumeric_s",
+                           (unsigned int)134,(unsigned int)((int)rc)); /* printf_va_475 */
   __retres = 0;
   return __retres;
 }
@@ -20179,58 +19984,58 @@ int test_strisascii_s(void)
   char str[128];
   len = (unsigned int)5;
   rc = strisascii_s((char const *)0,len);
-  if ((int)rc != 0) printf_va_476("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)27,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)27,
+                           (unsigned int)((int)rc)); /* printf_va_476 */
   len = (unsigned int)0;
   rc = strisascii_s("test",len);
-  if ((int)rc != 0) printf_va_477("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)36,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)36,
+                           (unsigned int)((int)rc)); /* printf_va_477 */
   len = (unsigned int)99999;
   rc = strisascii_s("test",len);
-  if ((int)rc != 0) printf_va_478("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)45,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)45,
+                           (unsigned int)((int)rc)); /* printf_va_478 */
   rc = strisascii_s("",(unsigned int)2);
-  if ((int)rc != 1) printf_va_479("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)54,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)54,
+                           (unsigned int)((int)rc)); /* printf_va_479 */
   strcpy(str,"ABCDEFGHIJK");
   rc = strisascii_s((char const *)(str),(unsigned int)2);
-  if ((int)rc != 1) printf_va_480("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)64,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)64,
+                           (unsigned int)((int)rc)); /* printf_va_480 */
   strcpy(str,"N");
   len = strlen((char const *)(str));
   rc = strisascii_s((char const *)(str),(unsigned int)1);
-  if ((int)rc != 1) printf_va_481("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)75,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)75,
+                           (unsigned int)((int)rc)); /* printf_va_481 */
   strcpy(str,"N");
   len = strlen((char const *)(str));
   rc = strisascii_s((char const *)(str),(unsigned int)2);
-  if ((int)rc != 1) printf_va_482("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)86,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)86,
+                           (unsigned int)((int)rc)); /* printf_va_482 */
   strcpy(str,"NowISTHETimE");
   len = strlen((char const *)(str));
   rc = strisascii_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_483("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)97,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)97,
+                           (unsigned int)((int)rc)); /* printf_va_483 */
   strcpy(str,"qq21ego");
   rc = strisascii_s((char const *)(str),(unsigned int)33);
-  if ((int)rc != 1) printf_va_484("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)107,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)107,
+                           (unsigned int)((int)rc)); /* printf_va_484 */
   strcpy(str,"1234");
   str[2] = (char)132;
   len = strlen((char const *)(str));
   rc = strisascii_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_485("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisascii_s",
-                                  (unsigned int)120,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisascii_s",(unsigned int)120,
+                           (unsigned int)((int)rc)); /* printf_va_485 */
   __retres = 0;
   return __retres;
 }
@@ -20387,54 +20192,54 @@ int test_strisdigit_s(void)
   char str[128];
   len = (unsigned int)5;
   rc = strisdigit_s((char const *)0,len);
-  if ((int)rc != 0) printf_va_486("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisdigit_s",
-                                  (unsigned int)26,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisdigit_s",(unsigned int)26,
+                           (unsigned int)((int)rc)); /* printf_va_486 */
   len = (unsigned int)0;
   rc = strisdigit_s("1234",len);
-  if ((int)rc != 0) printf_va_487("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisdigit_s",
-                                  (unsigned int)35,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisdigit_s",(unsigned int)35,
+                           (unsigned int)((int)rc)); /* printf_va_487 */
   len = (unsigned int)99999;
   rc = strisdigit_s("1234",len);
-  if ((int)rc != 0) printf_va_488("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisdigit_s",
-                                  (unsigned int)44,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisdigit_s",(unsigned int)44,
+                           (unsigned int)((int)rc)); /* printf_va_488 */
   len = (unsigned int)9;
   rc = strisdigit_s("",len);
-  if ((int)rc != 0) printf_va_489("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisdigit_s",
-                                  (unsigned int)53,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisdigit_s",(unsigned int)53,
+                           (unsigned int)((int)rc)); /* printf_va_489 */
   strcpy(str,"123456789");
   len = (unsigned int)4;
   rc = strisdigit_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_490("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisdigit_s",
-                                  (unsigned int)64,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisdigit_s",(unsigned int)64,
+                           (unsigned int)((int)rc)); /* printf_va_490 */
   strcpy(str,"1");
   len = strlen((char const *)(str));
   rc = strisdigit_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_491("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisdigit_s",
-                                  (unsigned int)75,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisdigit_s",(unsigned int)75,
+                           (unsigned int)((int)rc)); /* printf_va_491 */
   strcpy(str,"12");
   len = strlen((char const *)(str));
   rc = strisdigit_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_492("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisdigit_s",
-                                  (unsigned int)86,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisdigit_s",(unsigned int)86,
+                           (unsigned int)((int)rc)); /* printf_va_492 */
   strcpy(str,"1abcd");
   len = strlen((char const *)(str));
   rc = strisdigit_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_493("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisdigit_s",
-                                  (unsigned int)97,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisdigit_s",(unsigned int)97,
+                           (unsigned int)((int)rc)); /* printf_va_493 */
   strcpy(str,"abcd");
   len = strlen((char const *)(str));
   rc = strisdigit_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_494("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisdigit_s",
-                                  (unsigned int)108,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisdigit_s",(unsigned int)108,
+                           (unsigned int)((int)rc)); /* printf_va_494 */
   __retres = 0;
   return __retres;
 }
@@ -20623,65 +20428,65 @@ int test_strishex_s(void)
   char str[128];
   len = (unsigned int)5;
   rc = strishex_s((char const *)0,len);
-  if ((int)rc != 0) printf_va_495("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",(unsigned int)26,
-                                  (unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)26,
+                           (unsigned int)((int)rc)); /* printf_va_495 */
   str[0] = (char)'\000';
   rc = strishex_s((char const *)(str),(unsigned int)5);
-  if ((int)rc != 0) printf_va_496("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",(unsigned int)35,
-                                  (unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)35,
+                           (unsigned int)((int)rc)); /* printf_va_496 */
   len = (unsigned int)0;
   rc = strishex_s("1234",len);
-  if ((int)rc != 0) printf_va_497("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",(unsigned int)44,
-                                  (unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)44,
+                           (unsigned int)((int)rc)); /* printf_va_497 */
   len = (unsigned int)99999;
   rc = strishex_s("1234",len);
-  if ((int)rc != 0) printf_va_498("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",(unsigned int)53,
-                                  (unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)53,
+                           (unsigned int)((int)rc)); /* printf_va_498 */
   len = (unsigned int)9;
   rc = strishex_s("",len);
-  if ((int)rc != 0) printf_va_499("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",(unsigned int)62,
-                                  (unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)62,
+                           (unsigned int)((int)rc)); /* printf_va_499 */
   strcpy(str,"123456789");
   len = (unsigned int)6;
   rc = strishex_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_500("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",(unsigned int)73,
-                                  (unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)73,
+                           (unsigned int)((int)rc)); /* printf_va_500 */
   strcpy(str,"1");
   len = strlen((char const *)(str));
   rc = strishex_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_501("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",(unsigned int)84,
-                                  (unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)84,
+                           (unsigned int)((int)rc)); /* printf_va_501 */
   strcpy(str,"12");
   len = strlen((char const *)(str));
   rc = strishex_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_502("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",(unsigned int)95,
-                                  (unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)95,
+                           (unsigned int)((int)rc)); /* printf_va_502 */
   strcpy(str,"1Af");
   len = strlen((char const *)(str));
   rc = strishex_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_503("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",
-                                  (unsigned int)106,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)106,
+                           (unsigned int)((int)rc)); /* printf_va_503 */
   strcpy(str,"FF");
   len = strlen((char const *)(str));
   rc = strishex_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_504("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",
-                                  (unsigned int)117,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)117,
+                           (unsigned int)((int)rc)); /* printf_va_504 */
   strcpy(str,"1abzd");
   len = strlen((char const *)(str));
   rc = strishex_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_505("%s %u   Error rc=%u \n",
-                                  (char *)"test_strishex_s",
-                                  (unsigned int)129,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strishex_s",(unsigned int)129,
+                           (unsigned int)((int)rc)); /* printf_va_505 */
   __retres = 0;
   return __retres;
 }
@@ -20822,48 +20627,48 @@ int test_strislowercase_s(void)
   char str[128];
   len = (unsigned int)5;
   rc = strislowercase_s((char const *)0,len);
-  if ((int)rc != 0) printf_va_506("%s %u   Error rc=%u \n",
-                                  (char *)"test_strislowercase_s",
-                                  (unsigned int)26,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strislowercase_s",(unsigned int)26,
+                           (unsigned int)((int)rc)); /* printf_va_506 */
   len = (unsigned int)99999;
   rc = strislowercase_s("test",len);
-  if ((int)rc != 0) printf_va_507("%s %u   Error rc=%u \n",
-                                  (char *)"test_strislowercase_s",
-                                  (unsigned int)35,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strislowercase_s",(unsigned int)35,
+                           (unsigned int)((int)rc)); /* printf_va_507 */
   len = (unsigned int)0;
   rc = strislowercase_s("test",len);
-  if ((int)rc != 0) printf_va_508("%s %u   Error rc=%u \n",
-                                  (char *)"test_strislowercase_s",
-                                  (unsigned int)44,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strislowercase_s",(unsigned int)44,
+                           (unsigned int)((int)rc)); /* printf_va_508 */
   str[0] = (char)'\000';
   rc = strislowercase_s((char const *)(str),(unsigned int)5);
-  if ((int)rc != 0) printf_va_509("%s %u   Error rc=%u \n",
-                                  (char *)"test_strislowercase_s",
-                                  (unsigned int)53,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strislowercase_s",(unsigned int)53,
+                           (unsigned int)((int)rc)); /* printf_va_509 */
   strcpy(str,"qqweqeqeqeq");
   len = (unsigned int)3;
   rc = strislowercase_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_510("%s %u   Error rc=%u \n",
-                                  (char *)"test_strislowercase_s",
-                                  (unsigned int)64,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strislowercase_s",(unsigned int)64,
+                           (unsigned int)((int)rc)); /* printf_va_510 */
   strcpy(str,"qqweqeqeqeq");
   len = strlen((char const *)(str));
   rc = strislowercase_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_511("%s %u   Error rc=%u \n",
-                                  (char *)"test_strislowercase_s",
-                                  (unsigned int)75,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strislowercase_s",(unsigned int)75,
+                           (unsigned int)((int)rc)); /* printf_va_511 */
   strcpy(str,"qqWe go");
   len = strlen((char const *)(str));
   rc = strislowercase_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_512("%s %u   Error rc=%u \n",
-                                  (char *)"test_strislowercase_s",
-                                  (unsigned int)86,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strislowercase_s",(unsigned int)86,
+                           (unsigned int)((int)rc)); /* printf_va_512 */
   strcpy(str,"1234");
   len = strlen((char const *)(str));
   rc = strislowercase_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_513("%s %u   Error rc=%u \n",
-                                  (char *)"test_strislowercase_s",
-                                  (unsigned int)97,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strislowercase_s",(unsigned int)97,
+                           (unsigned int)((int)rc)); /* printf_va_513 */
   __retres = 0;
   return __retres;
 }
@@ -21020,54 +20825,54 @@ int test_strismixed_s(void)
   char str[128];
   len = (unsigned int)5;
   rc = strismixedcase_s((char const *)0,len);
-  if ((int)rc != 0) printf_va_514("%s %u   Error rc=%u \n",
-                                  (char *)"test_strismixed_s",
-                                  (unsigned int)26,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strismixed_s",(unsigned int)26,
+                           (unsigned int)((int)rc)); /* printf_va_514 */
   len = (unsigned int)0;
   rc = strismixedcase_s("test",len);
-  if ((int)rc != 0) printf_va_515("%s %u   Error rc=%u \n",
-                                  (char *)"test_strismixed_s",
-                                  (unsigned int)35,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strismixed_s",(unsigned int)35,
+                           (unsigned int)((int)rc)); /* printf_va_515 */
   len = (unsigned int)((4UL << 10) + (unsigned long)1);
   rc = strismixedcase_s("test",len);
-  if ((int)rc != 0) printf_va_516("%s %u   Error rc=%u \n",
-                                  (char *)"test_strismixed_s",
-                                  (unsigned int)44,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strismixed_s",(unsigned int)44,
+                           (unsigned int)((int)rc)); /* printf_va_516 */
   len = (unsigned int)9;
   rc = strismixedcase_s("",len);
-  if ((int)rc != 0) printf_va_517("%s %u   Error rc=%u \n",
-                                  (char *)"test_strismixed_s",
-                                  (unsigned int)53,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strismixed_s",(unsigned int)53,
+                           (unsigned int)((int)rc)); /* printf_va_517 */
   strcpy(str,"AaBbCcDdEeFf");
   len = (unsigned int)5;
   rc = strismixedcase_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_518("%s %u   Error rc=%u \n",
-                                  (char *)"test_strismixed_s",
-                                  (unsigned int)64,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strismixed_s",(unsigned int)64,
+                           (unsigned int)((int)rc)); /* printf_va_518 */
   strcpy(str,"N");
   len = strlen((char const *)(str));
   rc = strismixedcase_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_519("%s %u   Error rc=%u \n",
-                                  (char *)"test_strismixed_s",
-                                  (unsigned int)75,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strismixed_s",(unsigned int)75,
+                           (unsigned int)((int)rc)); /* printf_va_519 */
   strcpy(str,"NowISTHETimE");
   len = strlen((char const *)(str));
   rc = strismixedcase_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_520("%s %u   Error rc=%u \n",
-                                  (char *)"test_strismixed_s",
-                                  (unsigned int)86,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strismixed_s",(unsigned int)86,
+                           (unsigned int)((int)rc)); /* printf_va_520 */
   strcpy(str,"qq21ego");
   len = strlen((char const *)(str));
   rc = strismixedcase_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_521("%s %u   Error rc=%u \n",
-                                  (char *)"test_strismixed_s",
-                                  (unsigned int)97,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strismixed_s",(unsigned int)97,
+                           (unsigned int)((int)rc)); /* printf_va_521 */
   strcpy(str,"1234");
   len = strlen((char const *)(str));
   rc = strismixedcase_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_522("%s %u   Error rc=%u \n",
-                                  (char *)"test_strismixed_s",
-                                  (unsigned int)108,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strismixed_s",(unsigned int)108,
+                           (unsigned int)((int)rc)); /* printf_va_522 */
   __retres = 0;
   return __retres;
 }
@@ -21255,61 +21060,61 @@ int test_strispassword_s(void)
   uint32_t len;
   char str[64];
   rc = strispassword_s((char const *)0,(unsigned int)64);
-  if ((int)rc != 0) printf_va_523("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)25,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)25,
+                           (unsigned int)((int)rc)); /* printf_va_523 */
   rc = strispassword_s("",(unsigned int)64);
-  if ((int)rc != 0) printf_va_524("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)33,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)33,
+                           (unsigned int)((int)rc)); /* printf_va_524 */
   rc = strispassword_s("Test4You&",(unsigned int)0);
-  if ((int)rc != 0) printf_va_525("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)41,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)41,
+                           (unsigned int)((int)rc)); /* printf_va_525 */
   rc = strispassword_s("Test4You&",(unsigned int)999);
-  if ((int)rc != 0) printf_va_526("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)49,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)49,
+                           (unsigned int)((int)rc)); /* printf_va_526 */
   rc = strispassword_s("",(unsigned int)9);
-  if ((int)rc != 0) printf_va_527("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)57,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)57,
+                           (unsigned int)((int)rc)); /* printf_va_527 */
   strcpy(str,"Test4You*123");
   len = (unsigned int)8;
   rc = strispassword_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_528("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)68,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)68,
+                           (unsigned int)((int)rc)); /* printf_va_528 */
   strcpy(str,"Test4You*");
   len = strlen((char const *)(str));
   rc = strispassword_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_529("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)79,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)79,
+                           (unsigned int)((int)rc)); /* printf_va_529 */
   strcpy(str,"Test4You*Test4You*Test4You*");
   len = strlen((char const *)(str));
   rc = strispassword_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_530("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)90,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)90,
+                           (unsigned int)((int)rc)); /* printf_va_530 */
   strcpy(str,"Eest!22/");
   len = strlen((char const *)(str));
   rc = strispassword_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_531("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)101,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)101,
+                           (unsigned int)((int)rc)); /* printf_va_531 */
   strcpy(str,"pa$$W0rD");
   len = strlen((char const *)(str));
   rc = strispassword_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_532("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)112,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)112,
+                           (unsigned int)((int)rc)); /* printf_va_532 */
   strcpy(str,"Test");
   len = strlen((char const *)(str));
   rc = strispassword_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_533("%s %u   Error rc=%u \n",
-                                  (char *)"test_strispassword_s",
-                                  (unsigned int)123,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strispassword_s",(unsigned int)123,
+                           (unsigned int)((int)rc)); /* printf_va_533 */
   __retres = 0;
   return __retres;
 }
@@ -21466,54 +21271,54 @@ int test_strisuppercase_s(void)
   char str[128];
   len = (unsigned int)5;
   rc = strisuppercase_s((char const *)0,len);
-  if ((int)rc != 0) printf_va_534("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisuppercase_s",
-                                  (unsigned int)26,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisuppercase_s",(unsigned int)26,
+                           (unsigned int)((int)rc)); /* printf_va_534 */
   len = (unsigned int)99999;
   rc = strisuppercase_s("test",len);
-  if ((int)rc != 0) printf_va_535("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisuppercase_s",
-                                  (unsigned int)35,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisuppercase_s",(unsigned int)35,
+                           (unsigned int)((int)rc)); /* printf_va_535 */
   len = (unsigned int)0;
   rc = strisuppercase_s("test",len);
-  if ((int)rc != 0) printf_va_536("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisuppercase_s",
-                                  (unsigned int)44,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisuppercase_s",(unsigned int)44,
+                           (unsigned int)((int)rc)); /* printf_va_536 */
   str[0] = (char)'\000';
   rc = strisuppercase_s((char const *)(str),(unsigned int)5);
-  if ((int)rc != 0) printf_va_537("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisuppercase_s",
-                                  (unsigned int)53,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisuppercase_s",(unsigned int)53,
+                           (unsigned int)((int)rc)); /* printf_va_537 */
   strcpy(str,"ABCDEFGHIGHIJ");
   len = (unsigned int)7;
   rc = strisuppercase_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_538("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisuppercase_s",
-                                  (unsigned int)64,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisuppercase_s",(unsigned int)64,
+                           (unsigned int)((int)rc)); /* printf_va_538 */
   strcpy(str,"ABCDEFGHIGHIJ");
   len = strlen((char const *)(str));
   rc = strisuppercase_s((char const *)(str),len);
-  if ((int)rc != 1) printf_va_539("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisuppercase_s",
-                                  (unsigned int)75,(unsigned int)((int)rc));
+  if ((int)rc != 1) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisuppercase_s",(unsigned int)75,
+                           (unsigned int)((int)rc)); /* printf_va_539 */
   strcpy(str,"qqWe go");
   len = strlen((char const *)(str));
   rc = strisuppercase_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_540("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisuppercase_s",
-                                  (unsigned int)86,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisuppercase_s",(unsigned int)86,
+                           (unsigned int)((int)rc)); /* printf_va_540 */
   strcpy(str,"1234");
   len = strlen((char const *)(str));
   rc = strisuppercase_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_541("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisuppercase_s",
-                                  (unsigned int)97,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisuppercase_s",(unsigned int)97,
+                           (unsigned int)((int)rc)); /* printf_va_541 */
   strcpy(str,"!@#$%^&*()");
   len = strlen((char const *)(str));
   rc = strisuppercase_s((char const *)(str),len);
-  if ((int)rc != 0) printf_va_542("%s %u   Error rc=%u \n",
-                                  (char *)"test_strisuppercase_s",
-                                  (unsigned int)108,(unsigned int)((int)rc));
+  if ((int)rc != 0) printf("%s %u   Error rc=%u \n",
+                           (char *)"test_strisuppercase_s",(unsigned int)108,
+                           (unsigned int)((int)rc)); /* printf_va_542 */
   __retres = 0;
   return __retres;
 }
@@ -21845,83 +21650,79 @@ int test_strlastchar_s(void)
   char *last;
   char str1_17[128];
   rc = strlastchar_s((char *)0,(unsigned int)128,(char)'a',& last);
-  if (rc != 400) printf_va_543("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                               (char *)"test_strlastchar_s",(unsigned int)27,
-                               (void *)(str1_17),(void *)last,rc);
-  if (last) printf_va_544("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                          (char *)"test_strlastchar_s",(unsigned int)32,
-                          (void *)(str1_17),(void *)last,rc);
+  if (rc != 400) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                        (char *)"test_strlastchar_s",(unsigned int)27,
+                        (void *)(str1_17),(void *)last,rc); /* printf_va_543 */
+  if (last) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                   (char *)"test_strlastchar_s",(unsigned int)32,
+                   (void *)(str1_17),(void *)last,rc); /* printf_va_544 */
   rc = strlastchar_s(str1_17,(unsigned int)128,(char)'a',(char **)0);
-  if (rc != 400) printf_va_545("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                               (char *)"test_strlastchar_s",(unsigned int)40,
-                               (void *)(str1_17),(void *)last,rc);
+  if (rc != 400) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                        (char *)"test_strlastchar_s",(unsigned int)40,
+                        (void *)(str1_17),(void *)last,rc); /* printf_va_545 */
   rc = strlastchar_s(str1_17,(unsigned int)0,(char)'a',& last);
-  if (rc != 401) printf_va_546("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                               (char *)"test_strlastchar_s",(unsigned int)48,
-                               (void *)(str1_17),(void *)last,rc);
-  if (last) printf_va_547("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                          (char *)"test_strlastchar_s",(unsigned int)53,
-                          (void *)(str1_17),(void *)last,rc);
+  if (rc != 401) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                        (char *)"test_strlastchar_s",(unsigned int)48,
+                        (void *)(str1_17),(void *)last,rc); /* printf_va_546 */
+  if (last) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                   (char *)"test_strlastchar_s",(unsigned int)53,
+                   (void *)(str1_17),(void *)last,rc); /* printf_va_547 */
   rc = strlastchar_s(str1_17,(unsigned int)((4UL << 10) + (unsigned long)1),
                      (char)'a',& last);
-  if (rc != 403) printf_va_548("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                               (char *)"test_strlastchar_s",(unsigned int)61,
-                               (void *)(str1_17),(void *)last,rc);
-  if (last) printf_va_549("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                          (char *)"test_strlastchar_s",(unsigned int)66,
-                          (void *)(str1_17),(void *)last,rc);
+  if (rc != 403) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                        (char *)"test_strlastchar_s",(unsigned int)61,
+                        (void *)(str1_17),(void *)last,rc); /* printf_va_548 */
+  if (last) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                   (char *)"test_strlastchar_s",(unsigned int)66,
+                   (void *)(str1_17),(void *)last,rc); /* printf_va_549 */
   str1_17[0] = (char)'\000';
   rc = strlastchar_s(str1_17,(unsigned int)128,(char)'a',& last);
-  if (rc != 409) printf_va_550("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                               (char *)"test_strlastchar_s",(unsigned int)76,
-                               (void *)(str1_17),(void *)last,rc);
-  if (last) printf_va_551("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                          (char *)"test_strlastchar_s",(unsigned int)81,
-                          (void *)(str1_17),(void *)last,rc);
+  if (rc != 409) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                        (char *)"test_strlastchar_s",(unsigned int)76,
+                        (void *)(str1_17),(void *)last,rc); /* printf_va_550 */
+  if (last) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                   (char *)"test_strlastchar_s",(unsigned int)81,
+                   (void *)(str1_17),(void *)last,rc); /* printf_va_551 */
   strcpy(str1_17,"Keep it simple");
   rc = strlastchar_s(str1_17,(unsigned int)5,(char)'z',& last);
-  if (rc != 409) printf_va_552("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                               (char *)"test_strlastchar_s",(unsigned int)91,
-                               (void *)(str1_17),(void *)last,rc);
-  if (last) printf_va_553("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                          (char *)"test_strlastchar_s",(unsigned int)96,
-                          (void *)(str1_17),(void *)last,rc);
+  if (rc != 409) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                        (char *)"test_strlastchar_s",(unsigned int)91,
+                        (void *)(str1_17),(void *)last,rc); /* printf_va_552 */
+  if (last) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                   (char *)"test_strlastchar_s",(unsigned int)96,
+                   (void *)(str1_17),(void *)last,rc); /* printf_va_553 */
   strcpy(str1_17,"Keep it simplezz");
   rc = strlastchar_s(str1_17,(unsigned int)128,(char)'z',& last);
-  if (rc != 0) printf_va_554("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                             (char *)"test_strlastchar_s",(unsigned int)106,
-                             (void *)(str1_17),(void *)last,rc);
-  if (last != & str1_17[15]) printf_va_555("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                                           (char *)"test_strlastchar_s",
-                                           (unsigned int)111,
-                                           (void *)(str1_17),(void *)last,rc);
+  if (rc != 0) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                      (char *)"test_strlastchar_s",(unsigned int)106,
+                      (void *)(str1_17),(void *)last,rc); /* printf_va_554 */
+  if (last != & str1_17[15]) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                                    (char *)"test_strlastchar_s",
+                                    (unsigned int)111,(void *)(str1_17),
+                                    (void *)last,rc); /* printf_va_555 */
   strcpy(str1_17,"Keep it simple");
   rc = strlastchar_s(str1_17,(unsigned int)128,(char)'K',& last);
-  if (rc != 0) printf_va_556("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastchar_s",(unsigned int)121,
-                             rc);
-  if (last != str1_17) printf_va_557("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                                     (char *)"test_strlastchar_s",
-                                     (unsigned int)126,(void *)(str1_17),
-                                     (void *)last,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastchar_s",
+                      (unsigned int)121,rc); /* printf_va_556 */
+  if (last != str1_17) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                              (char *)"test_strlastchar_s",(unsigned int)126,
+                              (void *)(str1_17),(void *)last,rc); /* printf_va_557 */
   strcpy(str1_17,"kEEp it simple");
   rc = strlastchar_s(str1_17,(unsigned int)128,(char)'E',& last);
-  if (rc != 0) printf_va_558("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastchar_s",(unsigned int)136,
-                             rc);
-  if (last != & str1_17[2]) printf_va_559("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                                          (char *)"test_strlastchar_s",
-                                          (unsigned int)141,
-                                          (void *)(str1_17),(void *)last,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastchar_s",
+                      (unsigned int)136,rc); /* printf_va_558 */
+  if (last != & str1_17[2]) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                                   (char *)"test_strlastchar_s",
+                                   (unsigned int)141,(void *)(str1_17),
+                                   (void *)last,rc); /* printf_va_559 */
   strcpy(str1_17,"kEep it Simple");
   rc = strlastchar_s(str1_17,(unsigned int)128,(char)'S',& last);
-  if (rc != 0) printf_va_560("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastchar_s",(unsigned int)151,
-                             rc);
-  if (last != & str1_17[8]) printf_va_561("%s %u  Error  str1=%p  last=%p  rc=%d \n",
-                                          (char *)"test_strlastchar_s",
-                                          (unsigned int)156,
-                                          (void *)(str1_17),(void *)last,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastchar_s",
+                      (unsigned int)151,rc); /* printf_va_560 */
+  if (last != & str1_17[8]) printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
+                                   (char *)"test_strlastchar_s",
+                                   (unsigned int)156,(void *)(str1_17),
+                                   (void *)last,rc); /* printf_va_561 */
   __retres = 0;
   return __retres;
 }
@@ -22314,111 +22115,99 @@ int test_strlastdiff_s(void)
   char str2_16[128];
   rc = strlastdiff_s((char const *)0,(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 400) printf_va_562("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastdiff_s",(unsigned int)29,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_563("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastdiff_s",
-                                       (unsigned int)34,ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                        (unsigned int)29,rc); /* printf_va_562 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastdiff_s",
+                                (unsigned int)34,ind,rc); /* printf_va_563 */
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)0,& ind);
-  if (rc != 400) printf_va_564("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastdiff_s",(unsigned int)42,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_565("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastdiff_s",
-                                       (unsigned int)47,ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                        (unsigned int)42,rc); /* printf_va_564 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastdiff_s",
+                                (unsigned int)47,ind,rc); /* printf_va_565 */
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),(rsize_t *)0);
-  if (rc != 400) printf_va_566("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastdiff_s",(unsigned int)55,
-                               rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                        (unsigned int)55,rc); /* printf_va_566 */
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)0,
                      (char const *)(str2_16),& ind);
-  if (rc != 401) printf_va_567("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastdiff_s",(unsigned int)63,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_568("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastdiff_s",
-                                       (unsigned int)68,ind,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                        (unsigned int)63,rc); /* printf_va_567 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastdiff_s",
+                                (unsigned int)68,ind,rc); /* printf_va_568 */
   rc = strlastdiff_s((char const *)(str1_17),
                      (unsigned int)((4UL << 10) + (unsigned long)1),
                      (char const *)(str2_16),& ind);
-  if (rc != 403) printf_va_569("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastdiff_s",(unsigned int)76,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_570("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastdiff_s",
-                                       (unsigned int)81,ind,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                        (unsigned int)76,rc); /* printf_va_569 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastdiff_s",
+                                (unsigned int)81,ind,rc); /* printf_va_570 */
   str1_17[0] = (char)'\000';
   str2_16[0] = (char)'\000';
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 408) printf_va_571("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastdiff_s",(unsigned int)92,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_572("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastdiff_s",
-                                       (unsigned int)97,ind,rc);
+  if (rc != 408) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                        (unsigned int)92,rc); /* printf_va_571 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastdiff_s",
+                                (unsigned int)97,ind,rc); /* printf_va_572 */
   strcpy(str1_17,"Keep iT simple");
   strcpy(str2_16,"keep it simple");
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_573("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastdiff_s",(unsigned int)108,
-                             rc);
-  if (ind != (rsize_t)6) printf_va_574("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastdiff_s",
-                                       (unsigned int)113,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                      (unsigned int)108,rc); /* printf_va_573 */
+  if (ind != (rsize_t)6) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastdiff_s",
+                                (unsigned int)113,ind,rc); /* printf_va_574 */
   strcpy(str1_17,"kEep it simple");
   strcpy(str2_16,"keep it simple");
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_575("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastdiff_s",(unsigned int)124,
-                             rc);
-  if (ind != (rsize_t)1) printf_va_576("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastdiff_s",
-                                       (unsigned int)129,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                      (unsigned int)124,rc); /* printf_va_575 */
+  if (ind != (rsize_t)1) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastdiff_s",
+                                (unsigned int)129,ind,rc); /* printf_va_576 */
   strcpy(str1_17,"keep it siMple");
   strcpy(str2_16,"keEp it Simple");
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_577("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastdiff_s",(unsigned int)140,
-                             rc);
-  if (ind != (rsize_t)10) printf_va_578("%s %u  Error ind=%zu  rc=%d \n",
-                                        (char *)"test_strlastdiff_s",
-                                        (unsigned int)145,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                      (unsigned int)140,rc); /* printf_va_577 */
+  if (ind != (rsize_t)10) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                 (char *)"test_strlastdiff_s",
+                                 (unsigned int)145,ind,rc); /* printf_va_578 */
   strcpy(str1_17,"keep it simple");
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str1_17),& ind);
-  if (rc != 408) printf_va_579("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastdiff_s",
-                               (unsigned int)155,rc);
-  if (ind != (rsize_t)0) printf_va_580("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastdiff_s",
-                                       (unsigned int)160,ind,rc);
+  if (rc != 408) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                        (unsigned int)155,rc); /* printf_va_579 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastdiff_s",
+                                (unsigned int)160,ind,rc); /* printf_va_580 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keep it simple");
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)1,
                      (char const *)(str2_16),& ind);
-  if (rc != 408) printf_va_581("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastdiff_s",
-                               (unsigned int)171,rc);
-  if (ind != (rsize_t)0) printf_va_582("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastdiff_s",
-                                       (unsigned int)176,ind,rc);
+  if (rc != 408) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                        (unsigned int)171,rc); /* printf_va_581 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastdiff_s",
+                                (unsigned int)176,ind,rc); /* printf_va_582 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keep it simplE");
   rc = strlastdiff_s((char const *)(str1_17),(unsigned int)25,
                      (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_583("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastdiff_s",(unsigned int)187,
-                             rc);
-  if (ind != (rsize_t)13) printf_va_584("%s %u  Error ind=%zu  rc=%d \n",
-                                        (char *)"test_strlastdiff_s",
-                                        (unsigned int)192,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastdiff_s",
+                      (unsigned int)187,rc); /* printf_va_583 */
+  if (ind != (rsize_t)13) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                 (char *)"test_strlastdiff_s",
+                                 (unsigned int)192,ind,rc); /* printf_va_584 */
   __retres = 0;
   return __retres;
 }
@@ -22915,141 +22704,129 @@ int test_strlastsame_s(void)
   char str2_16[128];
   rc = strlastsame_s((char const *)0,(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 400) printf_va_585("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastsame_s",(unsigned int)28,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_586("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)33,ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                        (unsigned int)28,rc); /* printf_va_585 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)33,ind,rc); /* printf_va_586 */
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)0,& ind);
-  if (rc != 400) printf_va_587("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastsame_s",(unsigned int)41,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_588("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)46,ind,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                        (unsigned int)41,rc); /* printf_va_587 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)46,ind,rc); /* printf_va_588 */
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),(rsize_t *)0);
-  if (rc != 400) printf_va_589("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastsame_s",(unsigned int)54,
-                               rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                        (unsigned int)54,rc); /* printf_va_589 */
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)0,
                      (char const *)(str2_16),& ind);
-  if (rc != 401) printf_va_590("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastsame_s",(unsigned int)62,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_591("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)67,ind,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                        (unsigned int)62,rc); /* printf_va_590 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)67,ind,rc); /* printf_va_591 */
   rc = strlastsame_s((char const *)(str1_17),
                      (unsigned int)((4UL << 10) + (unsigned long)1),
                      (char const *)(str2_16),& ind);
-  if (rc != 403) printf_va_592("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastsame_s",(unsigned int)75,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_593("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)80,ind,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                        (unsigned int)75,rc); /* printf_va_592 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)80,ind,rc); /* printf_va_593 */
   str1_17[0] = (char)'\000';
   str2_16[0] = (char)'\000';
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 409) printf_va_594("%s %u  Error rc=%d \n",
-                               (char *)"test_strlastsame_s",(unsigned int)91,
-                               rc);
-  if (ind != (rsize_t)0) printf_va_595("%s %u  Error  ind=%zu rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)96,ind,rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                        (unsigned int)91,rc); /* printf_va_594 */
+  if (ind != (rsize_t)0) printf("%s %u  Error  ind=%zu rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)96,ind,rc); /* printf_va_595 */
   strcpy(str1_17,"Keep it simple");
   strcpy(str2_16,"keep_IT_SIMPLISTIC");
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_596("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastsame_s",(unsigned int)107,
-                             rc);
-  if (ind != (rsize_t)3) printf_va_597("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)112,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                      (unsigned int)107,rc); /* printf_va_596 */
+  if (ind != (rsize_t)3) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)112,ind,rc); /* printf_va_597 */
   strcpy(str1_17,"kEEP_IT_SIMPLE");
   strcpy(str2_16,"keep it simplistic");
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_598("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastsame_s",(unsigned int)123,
-                             rc);
-  if (ind != (rsize_t)0) printf_va_599("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)128,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                      (unsigned int)123,rc); /* printf_va_598 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)128,ind,rc); /* printf_va_599 */
   strcpy(str1_17,"kkEEP_IT_SIMPLE");
   strcpy(str2_16,"kkeep it simplistic");
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_600("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastsame_s",(unsigned int)139,
-                             rc);
-  if (ind != (rsize_t)1) printf_va_601("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)144,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                      (unsigned int)139,rc); /* printf_va_600 */
+  if (ind != (rsize_t)1) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)144,ind,rc); /* printf_va_601 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keeP_IT_SIMPLe");
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_602("%s %u  Error rc=%d \n",
-                             (char *)"test_strlastsame_s",(unsigned int)155,
-                             rc);
-  if (ind != (rsize_t)13) printf_va_603("%s %u  Error ind=%zu  rc=%d \n",
-                                        (char *)"test_strlastsame_s",
-                                        (unsigned int)160,ind,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strlastsame_s",
+                      (unsigned int)155,rc); /* printf_va_602 */
+  if (ind != (rsize_t)13) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                 (char *)"test_strlastsame_s",
+                                 (unsigned int)160,ind,rc); /* printf_va_603 */
   strcpy(str1_17,"keep it simple");
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str1_17),& ind);
-  if (rc != 0) printf_va_604("%s %u  Error ind=%zu  rc=%d \n",
-                             (char *)"test_strlastsame_s",(unsigned int)171,
-                             ind,rc);
-  if (ind != (rsize_t)13) printf_va_605("%s %u  Error ind=%zu  rc=%d \n",
-                                        (char *)"test_strlastsame_s",
-                                        (unsigned int)176,ind,rc);
+  if (rc != 0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                      (char *)"test_strlastsame_s",(unsigned int)171,ind,rc); /* printf_va_604 */
+  if (ind != (rsize_t)13) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                 (char *)"test_strlastsame_s",
+                                 (unsigned int)176,ind,rc); /* printf_va_605 */
   strcpy(str1_17,"KEEP it simple");
   strcpy(str2_16,"keep it simple");
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)1,
                      (char const *)(str2_16),& ind);
-  if (rc != 409) printf_va_606("%s %u  Error ind=%zu  rc=%d \n",
-                               (char *)"test_strlastsame_s",
-                               (unsigned int)187,ind,rc);
-  if (ind != (rsize_t)0) printf_va_607("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)192,ind,rc);
+  if (rc != 409) printf("%s %u  Error ind=%zu  rc=%d \n",
+                        (char *)"test_strlastsame_s",(unsigned int)187,ind,
+                        rc); /* printf_va_606 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)192,ind,rc); /* printf_va_607 */
   strcpy(str1_17,"KEEP it simple");
   strcpy(str2_16,"Keep it simple");
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)1,
                      (char const *)(str2_16),& ind);
-  if (rc != 0) printf_va_608("%s %u  Error ind=%zu  rc=%d \n",
-                             (char *)"test_strlastsame_s",(unsigned int)203,
-                             ind,rc);
-  if (ind != (rsize_t)0) printf_va_609("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)208,ind,rc);
+  if (rc != 0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                      (char *)"test_strlastsame_s",(unsigned int)203,ind,rc); /* printf_va_608 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)208,ind,rc); /* printf_va_609 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"KEEP_IT_SIMPLE");
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)5,
                      (char const *)(str2_16),& ind);
-  if (rc != 409) printf_va_610("%s %u  Error ind=%zu  rc=%d \n",
-                               (char *)"test_strlastsame_s",
-                               (unsigned int)219,ind,rc);
-  if (ind != (rsize_t)0) printf_va_611("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)224,ind,rc);
+  if (rc != 409) printf("%s %u  Error ind=%zu  rc=%d \n",
+                        (char *)"test_strlastsame_s",(unsigned int)219,ind,
+                        rc); /* printf_va_610 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)224,ind,rc); /* printf_va_611 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"KEEP_IT_SIMPLE");
   rc = strlastsame_s((char const *)(str1_17),(unsigned int)128,
                      (char const *)(str2_16),& ind);
-  if (rc != 409) printf_va_612("%s %u  Error ind=%zu  rc=%d \n",
-                               (char *)"test_strlastsame_s",
-                               (unsigned int)235,ind,rc);
-  if (ind != (rsize_t)0) printf_va_613("%s %u  Error ind=%zu  rc=%d \n",
-                                       (char *)"test_strlastsame_s",
-                                       (unsigned int)240,ind,rc);
+  if (rc != 409) printf("%s %u  Error ind=%zu  rc=%d \n",
+                        (char *)"test_strlastsame_s",(unsigned int)235,ind,
+                        rc); /* printf_va_612 */
+  if (ind != (rsize_t)0) printf("%s %u  Error ind=%zu  rc=%d \n",
+                                (char *)"test_strlastsame_s",
+                                (unsigned int)240,ind,rc); /* printf_va_613 */
   __retres = 0;
   return __retres;
 }
@@ -23457,132 +23234,119 @@ int test_strljustify_s(void)
   char str[128];
   len = (unsigned int)5;
   rc = strljustify_s((char *)0,len);
-  if (rc != 400) printf_va_614("%s %u   Error rc=%u \n",
-                               (char *)"test_strljustify_s",(unsigned int)27,
-                               (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strljustify_s",(unsigned int)27,
+                        (unsigned int)rc); /* printf_va_614 */
   len = (unsigned int)0;
   rc = strljustify_s((char *)"test",len);
-  if (rc != 401) printf_va_615("%s %u   Error rc=%u \n",
-                               (char *)"test_strljustify_s",(unsigned int)36,
-                               (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strljustify_s",(unsigned int)36,
+                        (unsigned int)rc); /* printf_va_615 */
   len = (unsigned int)99999;
   rc = strljustify_s((char *)"test",len);
-  if (rc != 403) printf_va_616("%s %u   Error rc=%u \n",
-                               (char *)"test_strljustify_s",(unsigned int)45,
-                               (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strljustify_s",(unsigned int)45,
+                        (unsigned int)rc); /* printf_va_616 */
   rc = strljustify_s((char *)" ",(unsigned int)12);
-  if (rc != 0) printf_va_617("%s %u   Error rc=%u \n",
-                             (char *)"test_strljustify_s",(unsigned int)54,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strljustify_s",
+                      (unsigned int)54,(unsigned int)rc); /* printf_va_617 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"ABCDEFGHIJK");
   len = (unsigned int)2;
   rc = strljustify_s(str,len);
-  if (rc != 407) printf_va_618("%s %u   Error rc=%u \n",
-                               (char *)"test_strljustify_s",(unsigned int)68,
-                               (unsigned int)rc);
-  if ((int)str[0] != '\000') printf_va_619("%s %u   Error -%s- \n",
-                                           (char *)"test_strljustify_s",
-                                           (unsigned int)73,str);
+  if (rc != 407) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strljustify_s",(unsigned int)68,
+                        (unsigned int)rc); /* printf_va_618 */
+  if ((int)str[0] != '\000') printf("%s %u   Error -%s- \n",
+                                    (char *)"test_strljustify_s",
+                                    (unsigned int)73,str); /* printf_va_619 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"      ABCDEFGHIJK");
   len = (unsigned int)5;
   rc = strljustify_s(str,len);
-  if (rc != 407) printf_va_620("%s %u   Error rc=%u \n",
-                               (char *)"test_strljustify_s",(unsigned int)86,
-                               (unsigned int)rc);
-  if ((int)str[0] != '\000') printf_va_621("%s %u   Error -%s- \n",
-                                           (char *)"test_strljustify_s",
-                                           (unsigned int)91,str);
+  if (rc != 407) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strljustify_s",(unsigned int)86,
+                        (unsigned int)rc); /* printf_va_620 */
+  if ((int)str[0] != '\000') printf("%s %u   Error -%s- \n",
+                                    (char *)"test_strljustify_s",
+                                    (unsigned int)91,str); /* printf_va_621 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"A");
   len = (unsigned int)1;
   rc = strljustify_s(str,len);
-  if (rc != 0) printf_va_622("%s %u   Error rc=%u \n",
-                             (char *)"test_strljustify_s",(unsigned int)104,
-                             (unsigned int)rc);
-  if ((int)str[0] != '\000') printf_va_623("%s %u   Error -%s- \n",
-                                           (char *)"test_strljustify_s",
-                                           (unsigned int)109,str);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strljustify_s",
+                      (unsigned int)104,(unsigned int)rc); /* printf_va_622 */
+  if ((int)str[0] != '\000') printf("%s %u   Error -%s- \n",
+                                    (char *)"test_strljustify_s",
+                                    (unsigned int)109,str); /* printf_va_623 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"ABC");
   len = (unsigned int)2;
   rc = strljustify_s(str,len);
-  if (rc != 407) printf_va_624("%s %u   Error rc=%u \n",
-                               (char *)"test_strljustify_s",
-                               (unsigned int)122,(unsigned int)rc);
-  if ((int)str[0] != '\000') printf_va_625("%s %u   Error -%s- \n",
-                                           (char *)"test_strljustify_s",
-                                           (unsigned int)127,str);
+  if (rc != 407) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strljustify_s",(unsigned int)122,
+                        (unsigned int)rc); /* printf_va_624 */
+  if ((int)str[0] != '\000') printf("%s %u   Error -%s- \n",
+                                    (char *)"test_strljustify_s",
+                                    (unsigned int)127,str); /* printf_va_625 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"ABC");
   len = (unsigned int)5;
   rc = strljustify_s(str,len);
-  if (rc != 0) printf_va_626("%s %u   Error rc=%u \n",
-                             (char *)"test_strljustify_s",(unsigned int)140,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strljustify_s",
+                      (unsigned int)140,(unsigned int)rc); /* printf_va_626 */
   ind = strcmp((char const *)(str),"ABC");
-  if (ind != 0) printf_va_627("%s %u   Error -%s- \n",
-                              (char *)"test_strljustify_s",(unsigned int)146,
-                              str);
+  if (ind != 0) printf("%s %u   Error -%s- \n",(char *)"test_strljustify_s",
+                       (unsigned int)146,str); /* printf_va_627 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"   B ");
   len = strlen((char const *)(str));
   rc = strljustify_s(str,len);
-  if (rc != 0) printf_va_628("%s %u   Error rc=%u \n",
-                             (char *)"test_strljustify_s",(unsigned int)158,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strljustify_s",
+                      (unsigned int)158,(unsigned int)rc); /* printf_va_628 */
   ind = strcmp((char const *)(str),"B ");
-  if (ind != 0) printf_va_629("%s %u   Error -%s-  ind=%d \n",
-                              (char *)"test_strljustify_s",(unsigned int)164,
-                              str,ind);
+  if (ind != 0) printf("%s %u   Error -%s-  ind=%d \n",
+                       (char *)"test_strljustify_s",(unsigned int)164,str,
+                       ind); /* printf_va_629 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"   B ");
   len = strlen((char const *)(str));
   rc = strljustify_s(str,len);
-  if (rc != 0) printf_va_630("%s %u   Error rc=%u \n",
-                             (char *)"test_strljustify_s",(unsigned int)176,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strljustify_s",
+                      (unsigned int)176,(unsigned int)rc); /* printf_va_630 */
   ind = strcmp((char const *)(str),"B ");
-  if (ind != 0) printf_va_631("%s %u   Error -%s- \n",
-                              (char *)"test_strljustify_s",(unsigned int)182,
-                              str);
+  if (ind != 0) printf("%s %u   Error -%s- \n",(char *)"test_strljustify_s",
+                       (unsigned int)182,str); /* printf_va_631 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"   C ");
   len = strlen((char const *)(str));
   rc = strljustify_s(str,len);
-  if (rc != 0) printf_va_632("%s %u   Error rc=%u \n",
-                             (char *)"test_strljustify_s",(unsigned int)194,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strljustify_s",
+                      (unsigned int)194,(unsigned int)rc); /* printf_va_632 */
   ind = strcmp((char const *)(str),"C ");
-  if (ind != 0) printf_va_633("%s %u   Error -%s- \n",
-                              (char *)"test_strljustify_s",(unsigned int)200,
-                              str);
+  if (ind != 0) printf("%s %u   Error -%s- \n",(char *)"test_strljustify_s",
+                       (unsigned int)200,str); /* printf_va_633 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"   NowISTHETimE       ");
   len = strlen((char const *)(str));
   rc = strljustify_s(str,len);
-  if (rc != 0) printf_va_634("%s %u   Error rc=%u \n",
-                             (char *)"test_strljustify_s",(unsigned int)212,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strljustify_s",
+                      (unsigned int)212,(unsigned int)rc); /* printf_va_634 */
   ind = strcmp((char const *)(str),"NowISTHETimE       ");
-  if (ind != 0) printf_va_635("%s %u   Error -%s- \n",
-                              (char *)"test_strljustify_s",(unsigned int)218,
-                              str);
+  if (ind != 0) printf("%s %u   Error -%s- \n",(char *)"test_strljustify_s",
+                       (unsigned int)218,str); /* printf_va_635 */
   strzero_s(str,(unsigned int)128);
   strcpy(str," qq21ego ");
   len = strlen((char const *)(str));
   rc = strljustify_s(str,len);
-  if (rc != 0) printf_va_636("%s %u   Error rc=%u \n",
-                             (char *)"test_strljustify_s",(unsigned int)230,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strljustify_s",
+                      (unsigned int)230,(unsigned int)rc); /* printf_va_636 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"   1234   ");
   len = strlen((char const *)(str));
   rc = strljustify_s(str,len);
-  if (rc != 0) printf_va_637("%s %u   Error rc=%u \n",
-                             (char *)"test_strljustify_s",(unsigned int)242,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strljustify_s",
+                      (unsigned int)242,(unsigned int)rc); /* printf_va_637 */
   __retres = 0;
   return __retres;
 }
@@ -23951,58 +23715,55 @@ int test_strnlen_s(void)
   rsize_t max_len;
   max_len = (unsigned int)3;
   len = strnlen_s((char const *)0,max_len);
-  if (len != (rsize_t)0) printf_va_638("%s %u   Len=%zu \n",
-                                       (char *)"test_strnlen_s",
-                                       (unsigned int)25,len);
+  if (len != (rsize_t)0) printf("%s %u   Len=%zu \n",
+                                (char *)"test_strnlen_s",(unsigned int)25,
+                                len); /* printf_va_638 */
   max_len = (unsigned int)0;
   len = strnlen_s("test",max_len);
-  if (len != (rsize_t)0) printf_va_639("%s %u   Len=%zu \n",
-                                       (char *)"test_strnlen_s",
-                                       (unsigned int)34,len);
+  if (len != (rsize_t)0) printf("%s %u   Len=%zu \n",
+                                (char *)"test_strnlen_s",(unsigned int)34,
+                                len); /* printf_va_639 */
   max_len = (unsigned int)((4UL << 10) + (unsigned long)1);
   len = strnlen_s("test",max_len);
-  if (len != (rsize_t)0) printf_va_640("%s %u   Len=%zu \n",
-                                       (char *)"test_strnlen_s",
-                                       (unsigned int)43,len);
+  if (len != (rsize_t)0) printf("%s %u   Len=%zu \n",
+                                (char *)"test_strnlen_s",(unsigned int)43,
+                                len); /* printf_va_640 */
   std_len = strlen("");
   max_len = (unsigned int)(4UL << 10);
   len = strnlen_s("",max_len);
-  if (std_len != len) printf_va_641("%s %u   std_len=%zu  len=%zu  \n",
-                                    (char *)"test_strnlen_s",
-                                    (unsigned int)55,std_len,len);
+  if (std_len != len) printf("%s %u   std_len=%zu  len=%zu  \n",
+                             (char *)"test_strnlen_s",(unsigned int)55,
+                             std_len,len); /* printf_va_641 */
   std_len = strlen("t");
   max_len = (unsigned int)(4UL << 10);
   len = strnlen_s("t",max_len);
-  if (std_len != len) printf_va_642("%s %u   std_len=%zu  len=%zu  \n",
-                                    (char *)"test_strnlen_s",
-                                    (unsigned int)67,std_len,len);
+  if (std_len != len) printf("%s %u   std_len=%zu  len=%zu  \n",
+                             (char *)"test_strnlen_s",(unsigned int)67,
+                             std_len,len); /* printf_va_642 */
   std_len = strlen("to");
   max_len = (unsigned int)(4UL << 10);
   len = strnlen_s("to",max_len);
-  if (std_len != len) printf_va_643("%s %u   std_len=%zu  len=%zu  \n",
-                                    (char *)"test_strnlen_s",
-                                    (unsigned int)79,std_len,len);
+  if (std_len != len) printf("%s %u   std_len=%zu  len=%zu  \n",
+                             (char *)"test_strnlen_s",(unsigned int)79,
+                             std_len,len); /* printf_va_643 */
   std_len = strlen("testing");
   max_len = (unsigned int)(4UL << 10);
   len = strnlen_s("testing",max_len);
-  if (std_len != len) printf_va_644("%s %u   std_len=%zu  len=%zu  \n",
-                                    (char *)"test_strnlen_s",
-                                    (unsigned int)91,std_len,len);
+  if (std_len != len) printf("%s %u   std_len=%zu  len=%zu  \n",
+                             (char *)"test_strnlen_s",(unsigned int)91,
+                             std_len,len); /* printf_va_644 */
   max_len = (unsigned int)1;
   len = strnlen_s("testing",max_len);
-  if (len != max_len) printf_va_645("%s %u   len=%zu  \n",
-                                    (char *)"test_strnlen_s",
-                                    (unsigned int)101,len);
+  if (len != max_len) printf("%s %u   len=%zu  \n",(char *)"test_strnlen_s",
+                             (unsigned int)101,len); /* printf_va_645 */
   max_len = (unsigned int)2;
   len = strnlen_s("testing",max_len);
-  if (len != max_len) printf_va_646("%s %u   len=%zu  \n",
-                                    (char *)"test_strnlen_s",
-                                    (unsigned int)111,len);
+  if (len != max_len) printf("%s %u   len=%zu  \n",(char *)"test_strnlen_s",
+                             (unsigned int)111,len); /* printf_va_646 */
   max_len = (unsigned int)3;
   len = strnlen_s("testing",max_len);
-  if (len != max_len) printf_va_647("%s %u   len=%zu  \n",
-                                    (char *)"test_strnlen_s",
-                                    (unsigned int)121,len);
+  if (len != max_len) printf("%s %u   len=%zu  \n",(char *)"test_strnlen_s",
+                             (unsigned int)121,len); /* printf_va_647 */
   __retres = 0;
   return __retres;
 }
@@ -24248,83 +24009,83 @@ int test_strnterminate_s(void)
   strcpy(dest_0,"");
   max_len = (unsigned int)3;
   len = strnterminate_s((char *)0,max_len);
-  if (len != (rsize_t)0) printf_va_648("%s %u   Len=%zu \n",
-                                       (char *)"test_strnterminate_s",
-                                       (unsigned int)29,len);
+  if (len != (rsize_t)0) printf("%s %u   Len=%zu \n",
+                                (char *)"test_strnterminate_s",
+                                (unsigned int)29,len); /* printf_va_648 */
   strcpy(dest_0,"test");
   max_len = (unsigned int)0;
   len = strnterminate_s(dest_0,max_len);
-  if (len != (rsize_t)0) printf_va_649("%s %u   Len=%zu \n",
-                                       (char *)"test_strnterminate_s",
-                                       (unsigned int)39,len);
+  if (len != (rsize_t)0) printf("%s %u   Len=%zu \n",
+                                (char *)"test_strnterminate_s",
+                                (unsigned int)39,len); /* printf_va_649 */
   strcpy(dest_0,"test");
   max_len = (unsigned int)((4UL << 10) + (unsigned long)1);
   len = strnterminate_s(dest_0,max_len);
-  if (len != (rsize_t)0) printf_va_650("%s %u   Len=%zu \n",
-                                       (char *)"test_strnterminate_s",
-                                       (unsigned int)49,len);
+  if (len != (rsize_t)0) printf("%s %u   Len=%zu \n",
+                                (char *)"test_strnterminate_s",
+                                (unsigned int)49,len); /* printf_va_650 */
   strcpy(dest_0,"ff");
   std_len = strlen((char const *)(dest_0));
   max_len = (unsigned int)(4UL << 10);
   len = strnterminate_s(dest_0,max_len);
-  if (std_len != len) printf_va_651("%s %u   std_len=%zu  len=%zu  \n",
-                                    (char *)"test_strnterminate_s",
-                                    (unsigned int)62,std_len,len);
+  if (std_len != len) printf("%s %u   std_len=%zu  len=%zu  \n",
+                             (char *)"test_strnterminate_s",(unsigned int)62,
+                             std_len,len); /* printf_va_651 */
   strcpy(dest_0,"ff");
   len = strnterminate_s(dest_0,(unsigned int)1);
-  if (len != (rsize_t)0) printf_va_652("%s %u   std_len=%zu  len=%zu  \n",
-                                       (char *)"test_strnterminate_s",
-                                       (unsigned int)72,std_len,len);
+  if (len != (rsize_t)0) printf("%s %u   std_len=%zu  len=%zu  \n",
+                                (char *)"test_strnterminate_s",
+                                (unsigned int)72,std_len,len); /* printf_va_652 */
   strcpy(dest_0,"f");
   max_len = (unsigned int)(4UL << 10);
   len = strnterminate_s(dest_0,max_len);
-  if (len != (rsize_t)1) printf_va_653("%s %u   std_len=%zu  len=%zu  \n",
-                                       (char *)"test_strnterminate_s",
-                                       (unsigned int)83,std_len,len);
+  if (len != (rsize_t)1) printf("%s %u   std_len=%zu  len=%zu  \n",
+                                (char *)"test_strnterminate_s",
+                                (unsigned int)83,std_len,len); /* printf_va_653 */
   strcpy(dest_0,"f");
   max_len = (unsigned int)(4UL << 10);
   len = strnterminate_s(dest_0,max_len);
-  if (len != (rsize_t)1) printf_va_654("%s %u   std_len=%zu  len=%zu  \n",
-                                       (char *)"test_strnterminate_s",
-                                       (unsigned int)94,std_len,len);
+  if (len != (rsize_t)1) printf("%s %u   std_len=%zu  len=%zu  \n",
+                                (char *)"test_strnterminate_s",
+                                (unsigned int)94,std_len,len); /* printf_va_654 */
   strcpy(dest_0,"ff");
   max_len = (unsigned int)(4UL << 10);
   len = strnterminate_s(dest_0,max_len);
-  if (len != (rsize_t)2) printf_va_655("%s %u   std_len=%zu  len=%zu  \n",
-                                       (char *)"test_strnterminate_s",
-                                       (unsigned int)105,std_len,len);
+  if (len != (rsize_t)2) printf("%s %u   std_len=%zu  len=%zu  \n",
+                                (char *)"test_strnterminate_s",
+                                (unsigned int)105,std_len,len); /* printf_va_655 */
   strcpy(dest_0,"test");
   max_len = (unsigned int)(4UL << 10);
   len = strnterminate_s(dest_0,max_len);
-  if (len != (rsize_t)4) printf_va_656("%s %u   std_len=%zu  len=%zu  \n",
-                                       (char *)"test_strnterminate_s",
-                                       (unsigned int)116,std_len,len);
+  if (len != (rsize_t)4) printf("%s %u   std_len=%zu  len=%zu  \n",
+                                (char *)"test_strnterminate_s",
+                                (unsigned int)116,std_len,len); /* printf_va_656 */
   strcpy(dest_0,"testing");
   max_len = (unsigned int)1;
   len = strnterminate_s(dest_0,max_len);
-  if (len != (rsize_t)0) printf_va_657("%s %u   len=%zu  \n",
-                                       (char *)"test_strnterminate_s",
-                                       (unsigned int)127,len);
+  if (len != (rsize_t)0) printf("%s %u   len=%zu  \n",
+                                (char *)"test_strnterminate_s",
+                                (unsigned int)127,len); /* printf_va_657 */
   strcpy(dest_0,"testing");
   max_len = (unsigned int)2;
   len = strnterminate_s(dest_0,max_len);
-  if (len != max_len - (rsize_t)1) printf_va_658("%s %u   len=%zu  \n",
-                                                 (char *)"test_strnterminate_s",
-                                                 (unsigned int)138,len);
+  if (len != max_len - (rsize_t)1) printf("%s %u   len=%zu  \n",
+                                          (char *)"test_strnterminate_s",
+                                          (unsigned int)138,len); /* printf_va_658 */
   strcpy(dest_0,"testing");
   max_len = (unsigned int)3;
   len = strnterminate_s(dest_0,max_len);
-  if (len != max_len - (rsize_t)1) printf_va_659("%s %u   len=%zu  \n",
-                                                 (char *)"test_strnterminate_s",
-                                                 (unsigned int)149,len);
+  if (len != max_len - (rsize_t)1) printf("%s %u   len=%zu  \n",
+                                          (char *)"test_strnterminate_s",
+                                          (unsigned int)149,len); /* printf_va_659 */
   strcpy(dest_0,"testing");
   max_len = (unsigned int)33;
   len = strnterminate_s(dest_0,max_len);
   tmp = strlen((char const *)(dest_0));
   ;
-  if (len != tmp) printf_va_660("%s %u   len=%zu  \n",
-                                (char *)"test_strnterminate_s",
-                                (unsigned int)160,len);
+  if (len != tmp) printf("%s %u   len=%zu  \n",
+                         (char *)"test_strnterminate_s",(unsigned int)160,
+                         len); /* printf_va_660 */
   strcpy(dest_0,"012345678901234567890");
   len = (unsigned int)21;
   while (len) {
@@ -24332,9 +24093,9 @@ int test_strnterminate_s(void)
     len = strnterminate_s(dest_0,len);
     tmp_0 = strlen((char const *)(dest_0));
     ;
-    if (len != tmp_0) printf_va_661("%s %u   len=%zu  \n",
-                                    (char *)"test_strnterminate_s",
-                                    (unsigned int)173,len);
+    if (len != tmp_0) printf("%s %u   len=%zu  \n",
+                             (char *)"test_strnterminate_s",
+                             (unsigned int)173,len); /* printf_va_661 */
   }
   __retres = 0;
   return __retres;
@@ -24898,149 +24659,141 @@ int test_strpbrk_s(void)
   char *std_first;
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)128,
                  (char **)0);
-  if (rc != 400) printf_va_662("%s %u  Error rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)28,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                        (unsigned int)28,rc); /* printf_va_662 */
   rc = strpbrk_s((char *)0,(unsigned int)128,str2_8,(unsigned int)128,
                  & first);
-  if (rc != 400) printf_va_663("%s %u  Error rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)36,rc);
-  if (first) printf_va_664("%s %u  Error  first=%p  rc=%d \n",
-                           (char *)"test_strpbrk_s",(unsigned int)41,
-                           (void *)first,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                        (unsigned int)36,rc); /* printf_va_663 */
+  if (first) printf("%s %u  Error  first=%p  rc=%d \n",
+                    (char *)"test_strpbrk_s",(unsigned int)41,(void *)first,
+                    rc); /* printf_va_664 */
   rc = strpbrk_s(str1_8,(unsigned int)128,(char *)0,(unsigned int)128,
                  & first);
-  if (rc != 400) printf_va_665("%s %u  Error rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)49,rc);
-  if (first) printf_va_666("%s %u  Error  first=%p  rc=%d \n",
-                           (char *)"test_strpbrk_s",(unsigned int)54,
-                           (void *)first,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                        (unsigned int)49,rc); /* printf_va_665 */
+  if (first) printf("%s %u  Error  first=%p  rc=%d \n",
+                    (char *)"test_strpbrk_s",(unsigned int)54,(void *)first,
+                    rc); /* printf_va_666 */
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)128,
                  (char **)0);
-  if (rc != 400) printf_va_667("%s %u  Error rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)62,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                        (unsigned int)62,rc); /* printf_va_667 */
   rc = strpbrk_s(str1_8,(unsigned int)0,str2_8,(unsigned int)128,& first);
-  if (rc != 401) printf_va_668("%s %u  Error rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)70,rc);
-  if (first) printf_va_669("%s %u  Error  first=%p  rc=%d \n",
-                           (char *)"test_strpbrk_s",(unsigned int)75,
-                           (void *)first,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                        (unsigned int)70,rc); /* printf_va_668 */
+  if (first) printf("%s %u  Error  first=%p  rc=%d \n",
+                    (char *)"test_strpbrk_s",(unsigned int)75,(void *)first,
+                    rc); /* printf_va_669 */
   rc = strpbrk_s(str1_8,(unsigned int)((4UL << 10) + (unsigned long)1),
                  str2_8,(unsigned int)128,& first);
-  if (rc != 403) printf_va_670("%s %u  Error rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)83,rc);
-  if (first) printf_va_671("%s %u  Error  first=%p  rc=%d \n",
-                           (char *)"test_strpbrk_s",(unsigned int)88,
-                           (void *)first,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                        (unsigned int)83,rc); /* printf_va_670 */
+  if (first) printf("%s %u  Error  first=%p  rc=%d \n",
+                    (char *)"test_strpbrk_s",(unsigned int)88,(void *)first,
+                    rc); /* printf_va_671 */
   rc = strpbrk_s(str1_8,(unsigned int)(4UL << 10),str2_8,
                  (unsigned int)((4UL << 10) + (unsigned long)1),& first);
-  if (rc != 403) printf_va_672("%s %u  Error rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)96,rc);
-  if (first) printf_va_673("%s %u  Error  first=%p  rc=%d \n",
-                           (char *)"test_strpbrk_s",(unsigned int)101,
-                           (void *)first,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                        (unsigned int)96,rc); /* printf_va_672 */
+  if (first) printf("%s %u  Error  first=%p  rc=%d \n",
+                    (char *)"test_strpbrk_s",(unsigned int)101,(void *)first,
+                    rc); /* printf_va_673 */
   str1_8[0] = (char)'\000';
   str2_8[0] = (char)'\000';
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)128,& first);
-  if (rc != 409) printf_va_674("%s %u  Error  first=%p  rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)113,
-                               (void *)first,rc);
-  if (first) printf_va_675("%s %u  Error  first=%p  rc=%d \n",
-                           (char *)"test_strpbrk_s",(unsigned int)118,
-                           (void *)first,rc);
+  if (rc != 409) printf("%s %u  Error  first=%p  rc=%d \n",
+                        (char *)"test_strpbrk_s",(unsigned int)113,
+                        (void *)first,rc); /* printf_va_674 */
+  if (first) printf("%s %u  Error  first=%p  rc=%d \n",
+                    (char *)"test_strpbrk_s",(unsigned int)118,(void *)first,
+                    rc); /* printf_va_675 */
   std_first = strpbrk((char const *)(str1_8),(char const *)(str2_8));
-  if (first != std_first) printf_va_676("%s %u  first=%p  std_first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)124,(void *)first,
-                                        (void *)std_first,rc);
+  if (first != std_first) printf("%s %u  first=%p  std_first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)124,
+                                 (void *)first,(void *)std_first,rc); /* printf_va_676 */
   strcpy(str1_8,"keep it simple");
   strcpy(str2_8,"1234");
   rc = strpbrk_s(str1_8,(unsigned int)2,str2_8,(unsigned int)128,& first);
-  if (rc != 409) printf_va_677("%s %u  Error  first=%p  rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)135,
-                               (void *)first,rc);
+  if (rc != 409) printf("%s %u  Error  first=%p  rc=%d \n",
+                        (char *)"test_strpbrk_s",(unsigned int)135,
+                        (void *)first,rc); /* printf_va_677 */
   std_first = strpbrk((char const *)(str1_8),(char const *)(str2_8));
-  if (first != std_first) printf_va_678("%s %u  first=%p  std_first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)141,(void *)first,
-                                        (void *)std_first,rc);
+  if (first != std_first) printf("%s %u  first=%p  std_first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)141,
+                                 (void *)first,(void *)std_first,rc); /* printf_va_678 */
   strcpy(str1_8,"keep it simple");
   strcpy(str2_8,"ke");
   rc = strpbrk_s(str1_8,(unsigned int)2,str2_8,(unsigned int)128,& first);
-  if (rc != 0) printf_va_679("%s %u  Error  first=%p  rc=%d \n",
-                             (char *)"test_strpbrk_s",(unsigned int)152,
-                             (void *)first,rc);
+  if (rc != 0) printf("%s %u  Error  first=%p  rc=%d \n",
+                      (char *)"test_strpbrk_s",(unsigned int)152,
+                      (void *)first,rc); /* printf_va_679 */
   std_first = strpbrk((char const *)(str1_8),(char const *)(str2_8));
-  if (first != std_first) printf_va_680("%s %u  first=%p  std_first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)158,(void *)first,
-                                        (void *)std_first,rc);
+  if (first != std_first) printf("%s %u  first=%p  std_first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)158,
+                                 (void *)first,(void *)std_first,rc); /* printf_va_680 */
   strcpy(str1_8,"keep it simplez");
   strcpy(str2_8,"z");
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)128,& first);
-  if (rc != 0) printf_va_681("%s %u  Error  first=%p  rc=%d \n",
-                             (char *)"test_strpbrk_s",(unsigned int)169,
-                             (void *)first,rc);
+  if (rc != 0) printf("%s %u  Error  first=%p  rc=%d \n",
+                      (char *)"test_strpbrk_s",(unsigned int)169,
+                      (void *)first,rc); /* printf_va_681 */
   std_first = strpbrk((char const *)(str1_8),(char const *)(str2_8));
-  if (first != std_first) printf_va_682("%s %u  first=%p  std_first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)175,(void *)first,
-                                        (void *)std_first,rc);
+  if (first != std_first) printf("%s %u  first=%p  std_first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)175,
+                                 (void *)first,(void *)std_first,rc); /* printf_va_682 */
   strcpy(str1_8,"keep it simple");
   strcpy(str2_8,"123456");
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)2,& first);
-  if (rc != 409) printf_va_683("%s %u  Error rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)186,rc);
-  if (first != (char *)0) printf_va_684("%s %u  Error  first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)191,(void *)first,rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                        (unsigned int)186,rc); /* printf_va_683 */
+  if (first != (char *)0) printf("%s %u  Error  first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)191,
+                                 (void *)first,rc); /* printf_va_684 */
   strcpy(str1_8,"keep it simple");
   strcpy(str2_8,"");
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)1,& first);
-  if (rc != 409) printf_va_685("%s %u  Error rc=%d \n",
-                               (char *)"test_strpbrk_s",(unsigned int)202,rc);
-  if (first != (char *)0) printf_va_686("%s %u  Error  first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)207,(void *)first,rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                        (unsigned int)202,rc); /* printf_va_685 */
+  if (first != (char *)0) printf("%s %u  Error  first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)207,
+                                 (void *)first,rc); /* printf_va_686 */
   strcpy(str1_8,"keep it simple");
   strcpy(str2_8,"k");
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)1,& first);
-  if (rc != 0) printf_va_687("%s %u  Error rc=%d \n",
-                             (char *)"test_strpbrk_s",(unsigned int)218,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                      (unsigned int)218,rc); /* printf_va_687 */
   std_first = strpbrk((char const *)(str1_8),(char const *)(str2_8));
-  if (first != std_first) printf_va_688("%s %u  first=%p  std_first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)224,(void *)first,
-                                        (void *)std_first,rc);
+  if (first != std_first) printf("%s %u  first=%p  std_first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)224,
+                                 (void *)first,(void *)std_first,rc); /* printf_va_688 */
   strcpy(str1_8,"keep it simple");
   strcpy(str2_8,"ke");
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)2,& first);
-  if (rc != 0) printf_va_689("%s %u  Error rc=%d \n",
-                             (char *)"test_strpbrk_s",(unsigned int)235,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                      (unsigned int)235,rc); /* printf_va_689 */
   std_first = strpbrk((char const *)(str1_8),(char const *)(str2_8));
-  if (first != std_first) printf_va_690("%s %u  first=%p  std_first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)241,(void *)first,
-                                        (void *)std_first,rc);
+  if (first != std_first) printf("%s %u  first=%p  std_first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)241,
+                                 (void *)first,(void *)std_first,rc); /* printf_va_690 */
   strcpy(str1_8,"keep it simple");
   strcpy(str2_8,"hip");
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)128,& first);
-  if (rc != 0) printf_va_691("%s %u  Error rc=%d \n",
-                             (char *)"test_strpbrk_s",(unsigned int)252,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                      (unsigned int)252,rc); /* printf_va_691 */
   std_first = strpbrk((char const *)(str1_8),(char const *)(str2_8));
-  if (first != std_first) printf_va_692("%s %u  first=%p  std_first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)258,(void *)first,
-                                        (void *)std_first,rc);
+  if (first != std_first) printf("%s %u  first=%p  std_first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)258,
+                                 (void *)first,(void *)std_first,rc); /* printf_va_692 */
   strcpy(str1_8,"keep it simply");
   strcpy(str2_8,"123y");
   rc = strpbrk_s(str1_8,(unsigned int)128,str2_8,(unsigned int)128,& first);
-  if (rc != 0) printf_va_693("%s %u  Error rc=%d \n",
-                             (char *)"test_strpbrk_s",(unsigned int)269,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strpbrk_s",
+                      (unsigned int)269,rc); /* printf_va_693 */
   std_first = strpbrk((char const *)(str1_8),(char const *)(str2_8));
-  if (first != std_first) printf_va_694("%s %u  first=%p  std_first=%p  rc=%d \n",
-                                        (char *)"test_strpbrk_s",
-                                        (unsigned int)275,(void *)first,
-                                        (void *)std_first,rc);
+  if (first != std_first) printf("%s %u  first=%p  std_first=%p  rc=%d \n",
+                                 (char *)"test_strpbrk_s",(unsigned int)275,
+                                 (void *)first,(void *)std_first,rc); /* printf_va_694 */
   __retres = 0;
   return __retres;
 }
@@ -25261,81 +25014,72 @@ int test_strprefix_s(void)
   char str1_17[128];
   char str2_16[128];
   rc = strprefix_s((char const *)0,(unsigned int)128,(char const *)(str2_16));
-  if (rc != 400) printf_va_695("%s %u  Error rc=%d \n",
-                               (char *)"test_strprefix_s",(unsigned int)28,
-                               rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                        (unsigned int)28,rc); /* printf_va_695 */
   rc = strprefix_s((char const *)(str1_17),(unsigned int)128,(char const *)0);
-  if (rc != 400) printf_va_696("%s %u  Error rc=%d \n",
-                               (char *)"test_strprefix_s",(unsigned int)36,
-                               rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                        (unsigned int)36,rc); /* printf_va_696 */
   rc = strprefix_s((char const *)(str1_17),(unsigned int)0,
                    (char const *)(str2_16));
-  if (rc != 401) printf_va_697("%s %u  Error rc=%d \n",
-                               (char *)"test_strprefix_s",(unsigned int)44,
-                               rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                        (unsigned int)44,rc); /* printf_va_697 */
   rc = strprefix_s((char const *)(str1_17),
                    (unsigned int)((4UL << 10) + (unsigned long)1),
                    (char const *)(str2_16));
-  if (rc != 403) printf_va_698("%s %u  Error rc=%d \n",
-                               (char *)"test_strprefix_s",(unsigned int)52,
-                               rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                        (unsigned int)52,rc); /* printf_va_698 */
   str1_17[0] = (char)'\000';
   str2_16[0] = (char)'\000';
   rc = strprefix_s((char const *)(str1_17),(unsigned int)128,
                    (char const *)(str2_16));
-  if (rc != 409) printf_va_699("%s %u  Error rc=%d \n",
-                               (char *)"test_strprefix_s",(unsigned int)63,
-                               rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                        (unsigned int)63,rc); /* printf_va_699 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keep");
   rc = strprefix_s((char const *)(str1_17),(unsigned int)55,
                    (char const *)(str2_16));
-  if (rc != 0) printf_va_700("%s %u  Error rc=%d \n",
-                             (char *)"test_strprefix_s",(unsigned int)74,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                      (unsigned int)74,rc); /* printf_va_700 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"kerp");
   rc = strprefix_s((char const *)(str1_17),(unsigned int)55,
                    (char const *)(str2_16));
-  if (rc != 409) printf_va_701("%s %u  Error rc=%d \n",
-                               (char *)"test_strprefix_s",(unsigned int)85,
-                               rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                        (unsigned int)85,rc); /* printf_va_701 */
   strcpy(str1_17,"ke");
   strcpy(str2_16,"kerp");
   rc = strprefix_s((char const *)(str1_17),(unsigned int)2,
                    (char const *)(str2_16));
-  if (rc != 0) printf_va_702("%s %u  Error rc=%d \n",
-                             (char *)"test_strprefix_s",(unsigned int)96,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                      (unsigned int)96,rc); /* printf_va_702 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keep");
   rc = strprefix_s((char const *)(str1_17),(unsigned int)4,
                    (char const *)(str2_16));
-  if (rc != 0) printf_va_703("%s %u  Error rc=%d \n",
-                             (char *)"test_strprefix_s",(unsigned int)107,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                      (unsigned int)107,rc); /* printf_va_703 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keeeep");
   rc = strprefix_s((char const *)(str1_17),(unsigned int)4,
                    (char const *)(str2_16));
-  if (rc != 409) printf_va_704("%s %u  Error rc=%d \n",
-                               (char *)"test_strprefix_s",(unsigned int)118,
-                               rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                        (unsigned int)118,rc); /* printf_va_704 */
   strcpy(str1_17,"keep it simple");
   rc = strprefix_s((char const *)(str1_17),(unsigned int)4,"");
-  if (rc != 409) printf_va_705("%s %u  Error rc=%d \n",
-                               (char *)"test_strprefix_s",(unsigned int)128,
-                               rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                        (unsigned int)128,rc); /* printf_va_705 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keep it sipmle and very long");
   len = strlen((char const *)(str1_17));
   rc = strprefix_s((char const *)(str1_17),len,(char const *)(str2_16));
-  if (rc != 409) printf_va_706("%s %u  Error rc=%d \n",
-                               (char *)"test_strprefix_s",(unsigned int)141,
-                               rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                        (unsigned int)141,rc); /* printf_va_706 */
   strcpy(str1_17,"keep it simple");
   strcpy(str2_16,"keep it simple");
   len = strlen((char const *)(str1_17));
   rc = strprefix_s((char const *)(str1_17),len,(char const *)(str2_16));
-  if (rc != 0) printf_va_707("%s %u  Error rc=%d \n",
-                             (char *)"test_strprefix_s",(unsigned int)154,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strprefix_s",
+                      (unsigned int)154,rc); /* printf_va_707 */
   __retres = 0;
   return __retres;
 }
@@ -25733,128 +25477,115 @@ int test_strremovews_s(void)
   char str[128];
   len = (unsigned int)5;
   rc = strremovews_s((char *)0,len);
-  if (rc != 400) printf_va_708("%s %u   Error rc=%u \n",
-                               (char *)"test_strremovews_s",(unsigned int)28,
-                               (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strremovews_s",(unsigned int)28,
+                        (unsigned int)rc); /* printf_va_708 */
   len = (unsigned int)0;
   rc = strremovews_s((char *)"test",len);
-  if (rc != 401) printf_va_709("%s %u   Error rc=%u \n",
-                               (char *)"test_strremovews_s",(unsigned int)37,
-                               (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strremovews_s",(unsigned int)37,
+                        (unsigned int)rc); /* printf_va_709 */
   len = (unsigned int)99999;
   rc = strremovews_s((char *)"test",len);
-  if (rc != 403) printf_va_710("%s %u   Error rc=%u \n",
-                               (char *)"test_strremovews_s",(unsigned int)46,
-                               (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strremovews_s",(unsigned int)46,
+                        (unsigned int)rc); /* printf_va_710 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"ABCDEFGHIJK");
   len = (unsigned int)1;
   rc = strremovews_s(str,len);
-  if (rc != 0) printf_va_711("%s %u   Error rc=%u \n",
-                             (char *)"test_strremovews_s",(unsigned int)57,
-                             (unsigned int)rc);
-  if ((int)str[0] != '\000') printf_va_712("%s %u   Error -%s- \n",
-                                           (char *)"test_strremovews_s",
-                                           (unsigned int)62,str);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strremovews_s",
+                      (unsigned int)57,(unsigned int)rc); /* printf_va_711 */
+  if ((int)str[0] != '\000') printf("%s %u   Error -%s- \n",
+                                    (char *)"test_strremovews_s",
+                                    (unsigned int)62,str); /* printf_va_712 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"ABCDEFGHIJK");
   len = (unsigned int)2;
   rc = strremovews_s(str,len);
-  if (rc != 407) printf_va_713("%s %u   Error rc=%u --%s--\n",
-                               (char *)"test_strremovews_s",(unsigned int)74,
-                               (unsigned int)rc,str);
+  if (rc != 407) printf("%s %u   Error rc=%u --%s--\n",
+                        (char *)"test_strremovews_s",(unsigned int)74,
+                        (unsigned int)rc,str); /* printf_va_713 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"      ABCDEFGHIJK");
   len = (unsigned int)3;
   rc = strremovews_s(str,len);
-  if (rc != 407) printf_va_714("%s %u   Error rc=%u --%s--\n",
-                               (char *)"test_strremovews_s",(unsigned int)86,
-                               (unsigned int)rc,str);
-  if ((int)str[0] != '\000') printf_va_715("%s %u   Error rc=%u --%s--\n",
-                                           (char *)"test_strremovews_s",
-                                           (unsigned int)91,(unsigned int)rc,
-                                           str);
+  if (rc != 407) printf("%s %u   Error rc=%u --%s--\n",
+                        (char *)"test_strremovews_s",(unsigned int)86,
+                        (unsigned int)rc,str); /* printf_va_714 */
+  if ((int)str[0] != '\000') printf("%s %u   Error rc=%u --%s--\n",
+                                    (char *)"test_strremovews_s",
+                                    (unsigned int)91,(unsigned int)rc,str); /* printf_va_715 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"      ABCDEFGHIJK");
   len = (unsigned int)9;
   rc = strremovews_s(str,len);
-  if (rc != 407) printf_va_716("%s %u   Error rc=%u --%s--\n",
-                               (char *)"test_strremovews_s",
-                               (unsigned int)103,(unsigned int)rc,str);
+  if (rc != 407) printf("%s %u   Error rc=%u --%s--\n",
+                        (char *)"test_strremovews_s",(unsigned int)103,
+                        (unsigned int)rc,str); /* printf_va_716 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"A");
   len = (unsigned int)1;
   rc = strremovews_s(str,len);
-  if (rc != 0) printf_va_717("%s %u   Error rc=%u \n",
-                             (char *)"test_strremovews_s",(unsigned int)116,
-                             (unsigned int)rc);
-  if ((int)str[0] != '\000') printf_va_718("%s %u   Error -%s- \n",
-                                           (char *)"test_strremovews_s",
-                                           (unsigned int)121,str);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strremovews_s",
+                      (unsigned int)116,(unsigned int)rc); /* printf_va_717 */
+  if ((int)str[0] != '\000') printf("%s %u   Error -%s- \n",
+                                    (char *)"test_strremovews_s",
+                                    (unsigned int)121,str); /* printf_va_718 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"ABC");
   len = (unsigned int)8;
   rc = strremovews_s(str,len);
-  if (rc != 0) printf_va_719("%s %u   Error rc=%u \n",
-                             (char *)"test_strremovews_s",(unsigned int)133,
-                             (unsigned int)rc);
-  if ((int)str[0] != 'A') printf_va_720("%s %u   Error -%s- \n",
-                                        (char *)"test_strremovews_s",
-                                        (unsigned int)138,str);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strremovews_s",
+                      (unsigned int)133,(unsigned int)rc); /* printf_va_719 */
+  if ((int)str[0] != 'A') printf("%s %u   Error -%s- \n",
+                                 (char *)"test_strremovews_s",
+                                 (unsigned int)138,str); /* printf_va_720 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"   B");
   len = strlen((char const *)(str));
   rc = strremovews_s(str,len);
-  if (rc != 0) printf_va_721("%s %u   Error rc=%u \n",
-                             (char *)"test_strremovews_s",(unsigned int)150,
-                             (unsigned int)rc);
-  if ((int)str[0] != 'B') printf_va_722("%s %u   Error -%s- \n",
-                                        (char *)"test_strremovews_s",
-                                        (unsigned int)155,str);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strremovews_s",
+                      (unsigned int)150,(unsigned int)rc); /* printf_va_721 */
+  if ((int)str[0] != 'B') printf("%s %u   Error -%s- \n",
+                                 (char *)"test_strremovews_s",
+                                 (unsigned int)155,str); /* printf_va_722 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"  C       ");
   len = strlen((char const *)(str));
   rc = strremovews_s(str,len);
-  if (rc != 0) printf_va_723("%s %u   Error rc=%u \n",
-                             (char *)"test_strremovews_s",(unsigned int)167,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strremovews_s",
+                      (unsigned int)167,(unsigned int)rc); /* printf_va_723 */
   ind = strcmp((char const *)(str),"C");
-  if (ind != 0) printf_va_724("%s %u   Error -%s- \n",
-                              (char *)"test_strremovews_s",(unsigned int)173,
-                              str);
+  if (ind != 0) printf("%s %u   Error -%s- \n",(char *)"test_strremovews_s",
+                       (unsigned int)173,str); /* printf_va_724 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"   NowISTHETimE 1 2   ");
   len = strlen((char const *)(str));
   rc = strremovews_s(str,len);
-  if (rc != 0) printf_va_725("%s %u   Error rc=%u \n",
-                             (char *)"test_strremovews_s",(unsigned int)185,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strremovews_s",
+                      (unsigned int)185,(unsigned int)rc); /* printf_va_725 */
   ind = strcmp((char const *)(str),"NowISTHETimE 1 2");
-  if (ind != 0) printf_va_726("%s %u   Error -%s- \n",
-                              (char *)"test_strremovews_s",(unsigned int)191,
-                              str);
+  if (ind != 0) printf("%s %u   Error -%s- \n",(char *)"test_strremovews_s",
+                       (unsigned int)191,str); /* printf_va_726 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"  q q21ego");
   len = strlen((char const *)(str));
   rc = strremovews_s(str,len);
-  if (rc != 0) printf_va_727("%s %u   Error rc=%u \n",
-                             (char *)"test_strremovews_s",(unsigned int)203,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strremovews_s",
+                      (unsigned int)203,(unsigned int)rc); /* printf_va_727 */
   ind = strcmp((char const *)(str),"q q21ego");
-  if (ind != 0) printf_va_728("%s %u   Error -%s- \n",
-                              (char *)"test_strremovews_s",(unsigned int)209,
-                              str);
+  if (ind != 0) printf("%s %u   Error -%s- \n",(char *)"test_strremovews_s",
+                       (unsigned int)209,str); /* printf_va_728 */
   strzero_s(str,(unsigned int)128);
   strcpy(str,"  1 2 3 4   ");
   len = strlen((char const *)(str));
   rc = strremovews_s(str,len);
-  if (rc != 0) printf_va_729("%s %u   Error rc=%u \n",
-                             (char *)"test_strremovews_s",(unsigned int)221,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strremovews_s",
+                      (unsigned int)221,(unsigned int)rc); /* printf_va_729 */
   ind = strcmp((char const *)(str),"1 2 3 4");
-  if (ind != 0) printf_va_730("%s %u   Error -%s- \n",
-                              (char *)"test_strremovews_s",(unsigned int)227,
-                              str);
+  if (ind != 0) printf("%s %u   Error -%s- \n",(char *)"test_strremovews_s",
+                       (unsigned int)227,str); /* printf_va_730 */
   __retres = 0;
   return __retres;
 }
@@ -26419,164 +26150,160 @@ int test_strspn_s(void)
   int32_t std_count = 0;
   rc = strspn_s((char const *)0,(unsigned int)128,(char const *)(str2_9),
                 (unsigned int)128,& count);
-  if (rc != 400) printf_va_731("%s %u  Error rc=%d \n",
-                               (char *)"test_strspn_s",(unsigned int)29,rc);
-  if (count != (rsize_t)0) printf_va_732("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)34,count,std_count,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                        (unsigned int)29,rc); /* printf_va_731 */
+  if (count != (rsize_t)0) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)34,
+                                  count,std_count,rc); /* printf_va_732 */
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,(char const *)0,
                 (unsigned int)128,& count);
-  if (rc != 400) printf_va_733("%s %u  Error rc=%d \n",
-                               (char *)"test_strspn_s",(unsigned int)42,rc);
-  if (count != (rsize_t)0) printf_va_734("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)47,count,std_count,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                        (unsigned int)42,rc); /* printf_va_733 */
+  if (count != (rsize_t)0) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)47,
+                                  count,std_count,rc); /* printf_va_734 */
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,
                 (char const *)(str2_9),(unsigned int)128,(rsize_t *)0);
-  if (rc != 400) printf_va_735("%s %u  Error rc=%d \n",
-                               (char *)"test_strspn_s",(unsigned int)55,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                        (unsigned int)55,rc); /* printf_va_735 */
   rc = strspn_s((char const *)(str1_9),(unsigned int)0,
                 (char const *)(str2_9),(unsigned int)128,& count);
-  if (rc != 401) printf_va_736("%s %u  Error rc=%d \n",
-                               (char *)"test_strspn_s",(unsigned int)63,rc);
-  if (count != (rsize_t)0) printf_va_737("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)68,count,std_count,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                        (unsigned int)63,rc); /* printf_va_736 */
+  if (count != (rsize_t)0) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)68,
+                                  count,std_count,rc); /* printf_va_737 */
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,
                 (char const *)(str2_9),(unsigned int)0,& count);
-  if (rc != 401) printf_va_738("%s %u  Error rc=%d \n",
-                               (char *)"test_strspn_s",(unsigned int)76,rc);
-  if (count != (rsize_t)0) printf_va_739("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)81,count,std_count,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                        (unsigned int)76,rc); /* printf_va_738 */
+  if (count != (rsize_t)0) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)81,
+                                  count,std_count,rc); /* printf_va_739 */
   rc = strspn_s((char const *)(str1_9),
                 (unsigned int)((4UL << 10) + (unsigned long)1),
                 (char const *)(str2_9),(unsigned int)128,& count);
-  if (rc != 403) printf_va_740("%s %u  Error rc=%d \n",
-                               (char *)"test_strspn_s",(unsigned int)89,rc);
-  if (count != (rsize_t)0) printf_va_741("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)94,count,std_count,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                        (unsigned int)89,rc); /* printf_va_740 */
+  if (count != (rsize_t)0) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)94,
+                                  count,std_count,rc); /* printf_va_741 */
   rc = strspn_s((char const *)(str1_9),(unsigned int)(4UL << 10),
                 (char const *)(str2_9),
                 (unsigned int)((4UL << 10) + (unsigned long)1),& count);
-  if (rc != 403) printf_va_742("%s %u  Error rc=%d \n",
-                               (char *)"test_strspn_s",(unsigned int)102,rc);
-  if (count != (rsize_t)0) printf_va_743("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)107,count,std_count,
-                                         rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                        (unsigned int)102,rc); /* printf_va_742 */
+  if (count != (rsize_t)0) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)107,
+                                  count,std_count,rc); /* printf_va_743 */
   str1_9[0] = (char)'\000';
   str2_9[0] = (char)'\000';
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,
                 (char const *)(str2_9),(unsigned int)128,& count);
-  if (rc != 0) printf_va_744("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)118,rc);
-  if (count != (rsize_t)0) printf_va_745("%s %u  Error  count=%zu rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)123,count,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)118,rc); /* printf_va_744 */
+  if (count != (rsize_t)0) printf("%s %u  Error  count=%zu rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)123,
+                                  count,rc); /* printf_va_745 */
   strcpy(str1_9,"keep it simple");
   strcpy(str2_9,"keep");
   rc = strspn_s((char const *)(str1_9),(unsigned int)1,
                 (char const *)(str2_9),(unsigned int)128,& count);
-  if (rc != 0) printf_va_746("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)134,rc);
-  if (count != (rsize_t)1) printf_va_747("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)139,count,std_count,
-                                         rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)134,rc); /* printf_va_746 */
+  if (count != (rsize_t)1) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)139,
+                                  count,std_count,rc); /* printf_va_747 */
   strcpy(str1_9,"keep it simple");
   strcpy(str2_9,"keep");
   rc = strspn_s((char const *)(str1_9),(unsigned int)2,
                 (char const *)(str2_9),(unsigned int)128,& count);
-  if (rc != 0) printf_va_748("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)150,rc);
-  if (count != (rsize_t)2) printf_va_749("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)155,count,std_count,
-                                         rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)150,rc); /* printf_va_748 */
+  if (count != (rsize_t)2) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)155,
+                                  count,std_count,rc); /* printf_va_749 */
   strcpy(str1_9,"keep it simple");
   strcpy(str2_9,"keep");
   rc = strspn_s((char const *)(str1_9),(unsigned int)3,
                 (char const *)(str2_9),(unsigned int)12,& count);
-  if (rc != 0) printf_va_750("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)166,rc);
-  if (count != (rsize_t)3) printf_va_751("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                         (char *)"test_strspn_s",
-                                         (unsigned int)171,count,std_count,
-                                         rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)166,rc); /* printf_va_750 */
+  if (count != (rsize_t)3) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                  (char *)"test_strspn_s",(unsigned int)171,
+                                  count,std_count,rc); /* printf_va_751 */
   strcpy(str1_9,"keep it simple");
   strcpy(str2_9,"k");
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,
                 (char const *)(str2_9),(unsigned int)1,& count);
-  if (rc != 0) printf_va_752("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)182,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)182,rc); /* printf_va_752 */
   tmp = strspn((char const *)(str1_9),(char const *)(str2_9));
   std_count = (int)tmp;
-  if (count != (rsize_t)std_count) printf_va_753("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strspn_s",
-                                                 (unsigned int)188,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strspn_s",
+                                          (unsigned int)188,count,std_count,
+                                          rc); /* printf_va_753 */
   strcpy(str1_9,"keep it simple");
   strcpy(str2_9,"ke");
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,
                 (char const *)(str2_9),(unsigned int)2,& count);
-  if (rc != 0) printf_va_754("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)199,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)199,rc); /* printf_va_754 */
   tmp_0 = strspn((char const *)(str1_9),(char const *)(str2_9));
   std_count = (int)tmp_0;
-  if (count != (rsize_t)std_count) printf_va_755("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strspn_s",
-                                                 (unsigned int)205,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strspn_s",
+                                          (unsigned int)205,count,std_count,
+                                          rc); /* printf_va_755 */
   strcpy(str1_9,"keep it simple");
   strcpy(str2_9,"keep");
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,
                 (char const *)(str2_9),(unsigned int)128,& count);
-  if (rc != 0) printf_va_756("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)217,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)217,rc); /* printf_va_756 */
   tmp_1 = strspn((char const *)(str1_9),(char const *)(str2_9));
   std_count = (int)tmp_1;
-  if (count != (rsize_t)std_count) printf_va_757("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strspn_s",
-                                                 (unsigned int)223,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strspn_s",
+                                          (unsigned int)223,count,std_count,
+                                          rc); /* printf_va_757 */
   strcpy(str1_9,"keep it simple");
   strcpy(str2_9,"keep");
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,
                 (char const *)(str2_9),(unsigned int)128,& count);
-  if (rc != 0) printf_va_758("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)234,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)234,rc); /* printf_va_758 */
   tmp_2 = strspn((char const *)(str1_9),(char const *)(str2_9));
   std_count = (int)tmp_2;
-  if (count != (rsize_t)std_count) printf_va_759("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strspn_s",
-                                                 (unsigned int)240,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strspn_s",
+                                          (unsigned int)240,count,std_count,
+                                          rc); /* printf_va_759 */
   strcpy(str1_9,"keep it simple");
   strcpy(str2_9,"notincluded");
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,
                 (char const *)(str2_9),(unsigned int)128,& count);
-  if (rc != 0) printf_va_760("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)251,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)251,rc); /* printf_va_760 */
   tmp_3 = strspn((char const *)(str1_9),(char const *)(str2_9));
   std_count = (int)tmp_3;
-  if (count != (rsize_t)std_count) printf_va_761("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strspn_s",
-                                                 (unsigned int)257,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strspn_s",
+                                          (unsigned int)257,count,std_count,
+                                          rc); /* printf_va_761 */
   strcpy(str1_9,"keep it simple");
   strcpy(str2_9,"1234567890");
   rc = strspn_s((char const *)(str1_9),(unsigned int)128,
                 (char const *)(str2_9),(unsigned int)128,& count);
-  if (rc != 0) printf_va_762("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
-                             (unsigned int)268,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strspn_s",
+                      (unsigned int)268,rc); /* printf_va_762 */
   tmp_4 = strspn((char const *)(str1_9),(char const *)(str2_9));
   std_count = (int)tmp_4;
-  if (count != (rsize_t)std_count) printf_va_763("%s %u  count=%zu  std_count=%d  rc=%d \n",
-                                                 (char *)"test_strspn_s",
-                                                 (unsigned int)274,count,
-                                                 std_count,rc);
+  if (count != (rsize_t)std_count) printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
+                                          (char *)"test_strspn_s",
+                                          (unsigned int)274,count,std_count,
+                                          rc); /* printf_va_763 */
   __retres = 0;
   return __retres;
 }
@@ -27173,155 +26900,150 @@ int test_strstr_s(void)
   rsize_t len2;
   rc = strstr_s((char *)0,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 400) printf_va_764("%s %u  Error rc=%d \n",
-                               (char *)"test_strstr_s",(unsigned int)31,rc);
-  if (sub) printf_va_765("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                         (unsigned int)36,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                        (unsigned int)31,rc); /* printf_va_764 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                  (unsigned int)36,rc); /* printf_va_765 */
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)0,(unsigned int)128,
                 & sub);
-  if (rc != 400) printf_va_766("%s %u  Error rc=%d \n",
-                               (char *)"test_strstr_s",(unsigned int)44,rc);
-  if (sub) printf_va_767("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                         (unsigned int)49,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                        (unsigned int)44,rc); /* printf_va_766 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                  (unsigned int)49,rc); /* printf_va_767 */
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)128,(char **)0);
-  if (rc != 400) printf_va_768("%s %u  Error rc=%d \n",
-                               (char *)"test_strstr_s",(unsigned int)57,rc);
+  if (rc != 400) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                        (unsigned int)57,rc); /* printf_va_768 */
   rc = strstr_s(str1_10,(unsigned int)0,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 401) printf_va_769("%s %u  Error rc=%d \n",
-                               (char *)"test_strstr_s",(unsigned int)65,rc);
-  if (sub) printf_va_770("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                         (unsigned int)70,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                        (unsigned int)65,rc); /* printf_va_769 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                  (unsigned int)70,rc); /* printf_va_770 */
   rc = strstr_s(str1_10,(unsigned int)((4UL << 10) + (unsigned long)1),
                 (char const *)(str2_10),(unsigned int)128,& sub);
-  if (rc != 403) printf_va_771("%s %u  Error rc=%d \n",
-                               (char *)"test_strstr_s",(unsigned int)78,rc);
-  if (sub) printf_va_772("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                         (unsigned int)83,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                        (unsigned int)78,rc); /* printf_va_771 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                  (unsigned int)83,rc); /* printf_va_772 */
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)0,& sub);
-  if (rc != 401) printf_va_773("%s %u  Error rc=%d \n",
-                               (char *)"test_strstr_s",(unsigned int)91,rc);
-  if (sub) printf_va_774("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                         (unsigned int)96,rc);
+  if (rc != 401) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                        (unsigned int)91,rc); /* printf_va_773 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                  (unsigned int)96,rc); /* printf_va_774 */
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)((4UL << 10) + (unsigned long)1),& sub);
-  if (rc != 403) printf_va_775("%s %u  Error rc=%d \n",
-                               (char *)"test_strstr_s",(unsigned int)104,rc);
-  if (sub) printf_va_776("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                         (unsigned int)109,rc);
+  if (rc != 403) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                        (unsigned int)104,rc); /* printf_va_775 */
+  if (sub) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                  (unsigned int)109,rc); /* printf_va_776 */
   str1_10[0] = (char)'\000';
   str2_10[0] = (char)'\000';
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 0) printf_va_777("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)120,rc);
-  if (sub != str1_10) printf_va_778("%s %u  Error rc=%d \n",
-                                    (char *)"test_strstr_s",
-                                    (unsigned int)125,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)120,rc); /* printf_va_777 */
+  if (sub != str1_10) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                             (unsigned int)125,rc); /* printf_va_778 */
   strcpy(str1_10,"keep it all together");
   str2_10[0] = (char)'\000';
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 0) printf_va_779("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)136,rc);
-  if (sub != str1_10) printf_va_780("%s %u  Error rc=%d \n",
-                                    (char *)"test_strstr_s",
-                                    (unsigned int)141,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)136,rc); /* printf_va_779 */
+  if (sub != str1_10) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                             (unsigned int)141,rc); /* printf_va_780 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"kee");
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 0) printf_va_781("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)153,rc);
-  if (sub != str1_10) printf_va_782("%s %u  Error rc=%d \n",
-                                    (char *)"test_strstr_s",
-                                    (unsigned int)158,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)153,rc); /* printf_va_781 */
+  if (sub != str1_10) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                             (unsigned int)158,rc); /* printf_va_782 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"eep it");
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 0) printf_va_783("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)170,rc);
-  if (sub != & str1_10[1]) printf_va_784("%s %u  Error rc=%d \n",
-                                         (char *)"test_strstr_s",
-                                         (unsigned int)175,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)170,rc); /* printf_va_783 */
+  if (sub != & str1_10[1]) printf("%s %u  Error rc=%d \n",
+                                  (char *)"test_strstr_s",(unsigned int)175,
+                                  rc); /* printf_va_784 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"ethe");
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 0) printf_va_785("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)187,rc);
-  if (sub != & str1_10[15]) printf_va_786("%s %u  Error rc=%d \n",
-                                          (char *)"test_strstr_s",
-                                          (unsigned int)192,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)187,rc); /* printf_va_785 */
+  if (sub != & str1_10[15]) printf("%s %u  Error rc=%d \n",
+                                   (char *)"test_strstr_s",(unsigned int)192,
+                                   rc); /* printf_va_786 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"he");
   len1 = strlen((char const *)(str1_10));
   len2 = strlen((char const *)(str2_10));
   rc = strstr_s(str1_10,len1,(char const *)(str2_10),len2,& sub);
-  if (rc != 0) printf_va_787("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)206,rc);
-  if (sub != & str1_10[17]) printf_va_788("%s %u  Error rc=%d  sub=%s \n",
-                                          (char *)"test_strstr_s",
-                                          (unsigned int)211,rc,sub);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)206,rc); /* printf_va_787 */
+  if (sub != & str1_10[17]) printf("%s %u  Error rc=%d  sub=%s \n",
+                                   (char *)"test_strstr_s",(unsigned int)211,
+                                   rc,sub); /* printf_va_788 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"er");
   len1 = strlen((char const *)(str1_10));
   len2 = strlen((char const *)(str2_10));
   rc = strstr_s(str1_10,len1,(char const *)(str2_10),len2,& sub);
-  if (rc != 0) printf_va_789("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)225,rc);
-  if (sub != & str1_10[18]) printf_va_790("%s %u  Error rc=%d  sub=%s \n",
-                                          (char *)"test_strstr_s",
-                                          (unsigned int)230,rc,sub);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)225,rc); /* printf_va_789 */
+  if (sub != & str1_10[18]) printf("%s %u  Error rc=%d  sub=%s \n",
+                                   (char *)"test_strstr_s",(unsigned int)230,
+                                   rc,sub); /* printf_va_790 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"it all");
   rc = strstr_s(str1_10,(unsigned int)3,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 409) printf_va_791("%s %u  Error rc=%d \n",
-                               (char *)"test_strstr_s",(unsigned int)241,rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                        (unsigned int)241,rc); /* printf_va_791 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"it all");
   rc = strstr_s(str1_10,(unsigned int)333,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 0) printf_va_792("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)252,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)252,rc); /* printf_va_792 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"it all");
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)5,& sub);
-  if (rc != 0) printf_va_793("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)263,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)263,rc); /* printf_va_793 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"1234");
   len1 = strlen((char const *)(str1_10));
   rc = strstr_s(str1_10,len1,(char const *)(str2_10),(unsigned int)128,& sub);
-  if (rc != 409) printf_va_794("%s %u  Error rc=%d \n",
-                               (char *)"test_strstr_s",(unsigned int)276,rc);
-  if (sub != (char *)0) printf_va_795("%s %u  Error rc=%d \n",
-                                      (char *)"test_strstr_s",
-                                      (unsigned int)281,rc);
+  if (rc != 409) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                        (unsigned int)276,rc); /* printf_va_794 */
+  if (sub != (char *)0) printf("%s %u  Error rc=%d \n",
+                               (char *)"test_strstr_s",(unsigned int)281,rc); /* printf_va_795 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"it all");
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)2,& sub);
-  if (rc != 0) printf_va_796("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
-                             (unsigned int)292,rc);
+  if (rc != 0) printf("%s %u  Error rc=%d \n",(char *)"test_strstr_s",
+                      (unsigned int)292,rc); /* printf_va_796 */
   strcpy(str1_10,"keep it all together");
   strcpy(str2_10,"eep");
   rc = strstr_s(str1_10,(unsigned int)128,(char const *)(str2_10),
                 (unsigned int)128,& sub);
-  if (rc != 0) printf_va_797("%s %u  Error rc=%u \n",(char *)"test_strstr_s",
-                             (unsigned int)303,(unsigned int)rc);
-  if (sub != & str1_10[1]) printf_va_798("%s %u  Error rc=%u \n",
-                                         (char *)"test_strstr_s",
-                                         (unsigned int)308,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_strstr_s",
+                      (unsigned int)303,(unsigned int)rc); /* printf_va_797 */
+  if (sub != & str1_10[1]) printf("%s %u  Error rc=%u \n",
+                                  (char *)"test_strstr_s",(unsigned int)308,
+                                  (unsigned int)rc); /* printf_va_798 */
   std_sub = strstr((char const *)(str1_10),(char const *)(str2_10));
-  if (sub != std_sub) printf_va_799("%s %u  Error rc=%u \n",
-                                    (char *)"test_strstr_s",
-                                    (unsigned int)315,(unsigned int)rc);
+  if (sub != std_sub) printf("%s %u  Error rc=%u \n",(char *)"test_strstr_s",
+                             (unsigned int)315,(unsigned int)rc); /* printf_va_799 */
   __retres = 0;
   return __retres;
 }
@@ -27596,82 +27318,81 @@ int test_strtok_s(void)
   int tmp_1;
   int tmp_2;
   p2tok = strtok_s(str1_17,(rsize_t *)0,(char const *)(str2_16),& p2str);
-  if (p2tok != (char *)0) printf_va_800("%s %u   Error rc=%u \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)31,(unsigned int)rc);
+  if (p2tok != (char *)0) printf("%s %u   Error rc=%u \n",
+                                 (char *)"test_strtok_s",(unsigned int)31,
+                                 (unsigned int)rc); /* printf_va_800 */
   len = (unsigned int)0;
   p2tok = strtok_s(str1_17,& len,(char const *)(str2_16),& p2str);
-  if (p2tok != (char *)0) printf_va_801("%s %u   Error rc=%u \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)41,(unsigned int)rc);
+  if (p2tok != (char *)0) printf("%s %u   Error rc=%u \n",
+                                 (char *)"test_strtok_s",(unsigned int)41,
+                                 (unsigned int)rc); /* printf_va_801 */
   len = (unsigned int)((4UL << 10) + (unsigned long)1);
   p2tok = strtok_s(str1_17,& len,(char const *)(str2_16),& p2str);
-  if (p2tok != (char *)0) printf_va_802("%s %u   Error rc=%u \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)51,(unsigned int)rc);
+  if (p2tok != (char *)0) printf("%s %u   Error rc=%u \n",
+                                 (char *)"test_strtok_s",(unsigned int)51,
+                                 (unsigned int)rc); /* printf_va_802 */
   len = (unsigned int)0;
   p2tok = strtok_s(str1_17,& len,(char const *)0,& p2str);
-  if (p2tok != (char *)0) printf_va_803("%s %u   Error rc=%u \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)61,(unsigned int)rc);
+  if (p2tok != (char *)0) printf("%s %u   Error rc=%u \n",
+                                 (char *)"test_strtok_s",(unsigned int)61,
+                                 (unsigned int)rc); /* printf_va_803 */
   p2tok = strtok_s(str1_17,& len,(char const *)(str2_16),(char **)0);
-  if (p2tok != (char *)0) printf_va_804("%s %u   Error rc=%u \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)70,(unsigned int)rc);
+  if (p2tok != (char *)0) printf("%s %u   Error rc=%u \n",
+                                 (char *)"test_strtok_s",(unsigned int)70,
+                                 (unsigned int)rc); /* printf_va_804 */
   strcpy(str1_17,"aaaaaaaa");
   len = strlen((char const *)(str1_17));
   strcpy(str2_16,"fedcba");
   p2tok = strtok_s(str1_17,& len,(char const *)(str2_16),& p2str);
-  if (p2tok != (char *)0) printf_va_805("%s %u token -%s-  remaining -%s-  \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)85,p2tok,p2str);
+  if (p2tok != (char *)0) printf("%s %u token -%s-  remaining -%s-  \n",
+                                 (char *)"test_strtok_s",(unsigned int)85,
+                                 p2tok,p2str); /* printf_va_805 */
   strcpy(str1_17,"jklmnopqrst");
   tmp = strlen((char const *)(str1_17));
   len = tmp - (size_t)2;
   strcpy(str2_16,"fedcba");
   p2tok = strtok_s(str1_17,& len,(char const *)(str2_16),& p2str);
-  if (p2tok != (char *)0) printf_va_806("%s %u token -%s-  remaining -%s-  \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)99,p2tok,p2str);
-  if (p2tok != (char *)0) printf_va_807("token -%s-  -%s- \n",p2tok,p2str);
+  if (p2tok != (char *)0) printf("%s %u token -%s-  remaining -%s-  \n",
+                                 (char *)"test_strtok_s",(unsigned int)99,
+                                 p2tok,p2str); /* printf_va_806 */
+  if (p2tok != (char *)0) printf("token -%s-  -%s- \n",p2tok,p2str); /* printf_va_807 */
   strcpy(str1_17,"aaamnopqrst");
   len = strlen((char const *)(str1_17));
   strcpy(str2_16,"fedcba");
   p2tok = strtok_s(str1_17,& len,(char const *)(str2_16),& p2str);
-  if (p2tok == (char *)0) printf_va_808("%s %u token -%s-  remaining -%s-  \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)117,p2tok,p2str);
+  if (p2tok == (char *)0) printf("%s %u token -%s-  remaining -%s-  \n",
+                                 (char *)"test_strtok_s",(unsigned int)117,
+                                 p2tok,p2str); /* printf_va_808 */
   strcpy(str1_17,"aaamnopqrstfedcba");
   len = strlen((char const *)(str1_17));
   strcpy(str2_16,"fedcba");
   p2tok = strtok_s(str1_17,& len,(char const *)(str2_16),& p2str);
-  if (p2tok == (char *)0) printf_va_809("%s %u token -%s-  remaining -%s-  \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)132,p2tok,p2str);
+  if (p2tok == (char *)0) printf("%s %u token -%s-  remaining -%s-  \n",
+                                 (char *)"test_strtok_s",(unsigned int)132,
+                                 p2tok,p2str); /* printf_va_809 */
   tmp_0 = strcmp((char const *)p2tok,"mnopqrst");
-  if (tmp_0) printf_va_810("%s %u token -%s-  remaining -%s-  \n",
-                           (char *)"test_strtok_s",(unsigned int)137,p2tok,
-                           p2str);
+  if (tmp_0) printf("%s %u token -%s-  remaining -%s-  \n",
+                    (char *)"test_strtok_s",(unsigned int)137,p2tok,p2str); /* printf_va_810 */
   p2tok = strtok_s(p2str,& len,(char const *)(str2_16),& p2str);
-  if (p2tok != (char *)0) printf_va_811("%s %u token -%s-  remaining -%s-  \n",
-                                        (char *)"test_strtok_s",
-                                        (unsigned int)148,p2tok,p2str);
+  if (p2tok != (char *)0) printf("%s %u token -%s-  remaining -%s-  \n",
+                                 (char *)"test_strtok_s",(unsigned int)148,
+                                 p2tok,p2str); /* printf_va_811 */
   strcpy(str1_17,"?a?\?\?b,,,#c");
   len = strlen((char const *)(str1_17));
   strcpy(str2_16,"?");
   p2tok = strtok_s(str1_17,& len,(char const *)(str2_16),& p2str);
   tmp_1 = strcmp((char const *)p2tok,"a");
-  if (tmp_1) printf_va_812("%s %u token -%s-  -%s- len=%d \n",
-                           (char *)"test_strtok_s",(unsigned int)167,p2tok,
-                           p2str,(int)len);
+  if (tmp_1) printf("%s %u token -%s-  -%s- len=%d \n",
+                    (char *)"test_strtok_s",(unsigned int)167,p2tok,p2str,
+                    (int)len); /* printf_va_812 */
   strcpy(str1_17,"?a?\?\?b,,,#c");
   len = strlen((char const *)(str1_17));
   strcpy(str2_16,",");
   p2tok = strtok_s((char *)0,& len,(char const *)(str2_16),& p2str);
   tmp_2 = strcmp((char const *)p2tok,"?\?b");
-  if (tmp_2) printf_va_813("%s %u token -%s-  -%s- len=%d \n",
-                           (char *)"test_strtok_s",(unsigned int)184,p2tok,
-                           p2str,(int)len);
+  if (tmp_2) printf("%s %u token -%s-  -%s- len=%d \n",
+                    (char *)"test_strtok_s",(unsigned int)184,p2tok,p2str,
+                    (int)len); /* printf_va_813 */
   __retres = 0;
   return __retres;
 }
@@ -27918,74 +27639,69 @@ int test_strtolowercase_s(void)
   int tmp_3;
   len = (unsigned int)5;
   rc = strtolowercase_s((char *)0,len);
-  if (rc != 400) printf_va_814("%s %u   Error rc=%u \n",
-                               (char *)"test_strtolowercase_s",
-                               (unsigned int)26,(unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strtolowercase_s",(unsigned int)26,
+                        (unsigned int)rc); /* printf_va_814 */
   len = (unsigned int)0;
   rc = strtolowercase_s((char *)"test",len);
-  if (rc != 401) printf_va_815("%s %u   Error rc=%u \n",
-                               (char *)"test_strtolowercase_s",
-                               (unsigned int)35,(unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strtolowercase_s",(unsigned int)35,
+                        (unsigned int)rc); /* printf_va_815 */
   len = (unsigned int)99999;
   rc = strtolowercase_s((char *)"test",len);
-  if (rc != 403) printf_va_816("%s %u   Error rc=%u \n",
-                               (char *)"test_strtolowercase_s",
-                               (unsigned int)44,(unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strtolowercase_s",(unsigned int)44,
+                        (unsigned int)rc); /* printf_va_816 */
   strcpy(str,"N");
   len = strlen((char const *)(str));
   rc = strtolowercase_s(str,len);
-  if (rc != 0) printf_va_817("%s %u   Error rc=%u \n",
-                             (char *)"test_strtolowercase_s",
-                             (unsigned int)55,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtolowercase_s",(unsigned int)55,
+                      (unsigned int)rc); /* printf_va_817 */
   tmp = strcmp((char const *)(str),"n");
-  if (tmp) printf_va_818("%s %u   Error -%s- \n",
-                         (char *)"test_strtolowercase_s",(unsigned int)60,
-                         str);
+  if (tmp) printf("%s %u   Error -%s- \n",(char *)"test_strtolowercase_s",
+                  (unsigned int)60,str); /* printf_va_818 */
   strcpy(str,"n");
   len = strlen((char const *)(str));
   rc = strtolowercase_s(str,len);
-  if (rc != 0) printf_va_819("%s %u   Error rc=%u \n",
-                             (char *)"test_strtolowercase_s",
-                             (unsigned int)71,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtolowercase_s",(unsigned int)71,
+                      (unsigned int)rc); /* printf_va_819 */
   tmp_0 = strcmp((char const *)(str),"n");
-  if (tmp_0) printf_va_820("%s %u   Error -%s- \n",
-                           (char *)"test_strtolowercase_s",(unsigned int)76,
-                           str);
+  if (tmp_0) printf("%s %u   Error -%s- \n",(char *)"test_strtolowercase_s",
+                    (unsigned int)76,str); /* printf_va_820 */
   strcpy(str,"NOWISTHETIM3");
   rc = strtolowercase_s(str,(unsigned int)25);
-  if (rc != 0) printf_va_821("%s %u   Error rc=%u \n",
-                             (char *)"test_strtolowercase_s",
-                             (unsigned int)86,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtolowercase_s",(unsigned int)86,
+                      (unsigned int)rc); /* printf_va_821 */
   tmp_1 = strcmp((char const *)(str),"nowisthetim3");
-  if (tmp_1) printf_va_822("%s %u   Error -%s- \n",
-                           (char *)"test_strtolowercase_s",(unsigned int)91,
-                           str);
+  if (tmp_1) printf("%s %u   Error -%s- \n",(char *)"test_strtolowercase_s",
+                    (unsigned int)91,str); /* printf_va_822 */
   strcpy(str,"NOWISTHETIME");
   len = strlen((char const *)(str));
   rc = strtolowercase_s(str,len);
-  if (rc != 0) printf_va_823("%s %u   Error rc=%u \n",
-                             (char *)"test_strtolowercase_s",
-                             (unsigned int)102,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtolowercase_s",(unsigned int)102,
+                      (unsigned int)rc); /* printf_va_823 */
   tmp_2 = strcmp((char const *)(str),"nowisthetime");
-  if (tmp_2) printf_va_824("%s %u   Error -%s- \n",
-                           (char *)"test_strtolowercase_s",(unsigned int)107,
-                           str);
+  if (tmp_2) printf("%s %u   Error -%s- \n",(char *)"test_strtolowercase_s",
+                    (unsigned int)107,str); /* printf_va_824 */
   strcpy(str,"qqeRo");
   len = strlen((char const *)(str));
   rc = strtolowercase_s(str,len);
-  if (rc != 0) printf_va_825("%s %u   Error rc=%u \n",
-                             (char *)"test_strtolowercase_s",
-                             (unsigned int)118,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtolowercase_s",(unsigned int)118,
+                      (unsigned int)rc); /* printf_va_825 */
   tmp_3 = strcmp((char const *)(str),"qqero");
-  if (tmp_3) printf_va_826("%s %u   Error -%s- \n",
-                           (char *)"test_strtolowercase_s",(unsigned int)123,
-                           str);
+  if (tmp_3) printf("%s %u   Error -%s- \n",(char *)"test_strtolowercase_s",
+                    (unsigned int)123,str); /* printf_va_826 */
   strcpy(str,"1234");
   len = strlen((char const *)(str));
   rc = strtolowercase_s(str,(unsigned int)4);
-  if (rc != 0) printf_va_827("%s %u   Error rc=%u \n",
-                             (char *)"test_strtolowercase_s",
-                             (unsigned int)134,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtolowercase_s",(unsigned int)134,
+                      (unsigned int)rc); /* printf_va_827 */
   __retres = 0;
   return __retres;
 }
@@ -28214,70 +27930,66 @@ int test_strtouppercase_s(void)
   int tmp_2;
   len = (unsigned int)5;
   rc = strtouppercase_s((char *)0,len);
-  if (rc != 400) printf_va_828("%s %u   Error rc=%u \n",
-                               (char *)"test_strtouppercase_s",
-                               (unsigned int)27,(unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strtouppercase_s",(unsigned int)27,
+                        (unsigned int)rc); /* printf_va_828 */
   len = (unsigned int)0;
   rc = strtouppercase_s((char *)"test",len);
-  if (rc != 401) printf_va_829("%s %u   Error rc=%u \n",
-                               (char *)"test_strtouppercase_s",
-                               (unsigned int)37,(unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strtouppercase_s",(unsigned int)37,
+                        (unsigned int)rc); /* printf_va_829 */
   len = (unsigned int)5;
   rc = strtouppercase_s((char *)"",len);
-  if (rc != 0) printf_va_830("%s %u   Error rc=%u \n",
-                             (char *)"test_strtouppercase_s",
-                             (unsigned int)48,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtouppercase_s",(unsigned int)48,
+                      (unsigned int)rc); /* printf_va_830 */
   len = (unsigned int)99999;
   rc = strtouppercase_s((char *)"test",len);
-  if (rc != 403) printf_va_831("%s %u   Error rc=%u \n",
-                               (char *)"test_strtouppercase_s",
-                               (unsigned int)60,(unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",
+                        (char *)"test_strtouppercase_s",(unsigned int)60,
+                        (unsigned int)rc); /* printf_va_831 */
   strcpy(str,"n");
   len = strlen((char const *)(str));
   rc = strtouppercase_s(str,len);
-  if (rc != 0) printf_va_832("%s %u   Error rc=%u \n",
-                             (char *)"test_strtouppercase_s",
-                             (unsigned int)72,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtouppercase_s",(unsigned int)72,
+                      (unsigned int)rc); /* printf_va_832 */
   tmp = strcmp((char const *)(str),"N");
-  if (tmp) printf_va_833("%s %u   Error -%s- \n",
-                         (char *)"test_strtouppercase_s",(unsigned int)78,
-                         str);
+  if (tmp) printf("%s %u   Error -%s- \n",(char *)"test_strtouppercase_s",
+                  (unsigned int)78,str); /* printf_va_833 */
   strcpy(str,"N");
   len = strlen((char const *)(str));
   rc = strtouppercase_s(str,len);
-  if (rc != 0) printf_va_834("%s %u   Error rc=%u \n",
-                             (char *)"test_strtouppercase_s",
-                             (unsigned int)90,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtouppercase_s",(unsigned int)90,
+                      (unsigned int)rc); /* printf_va_834 */
   tmp_0 = strcmp((char const *)(str),"N");
-  if (tmp_0) printf_va_835("%s %u   Error -%s- \n",
-                           (char *)"test_strtouppercase_s",(unsigned int)96,
-                           str);
+  if (tmp_0) printf("%s %u   Error -%s- \n",(char *)"test_strtouppercase_s",
+                    (unsigned int)96,str); /* printf_va_835 */
   strcpy(str,"nowisthetime");
   len = strlen((char const *)(str));
   rc = strtouppercase_s(str,len);
-  if (rc != 0) printf_va_836("%s %u   Error rc=%u \n",
-                             (char *)"test_strtouppercase_s",
-                             (unsigned int)108,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtouppercase_s",(unsigned int)108,
+                      (unsigned int)rc); /* printf_va_836 */
   tmp_1 = strcmp((char const *)(str),"NOWISTHETIME");
-  if (tmp_1) printf_va_837("%s %u   Error -%s- \n",
-                           (char *)"test_strtouppercase_s",(unsigned int)114,
-                           str);
+  if (tmp_1) printf("%s %u   Error -%s- \n",(char *)"test_strtouppercase_s",
+                    (unsigned int)114,str); /* printf_va_837 */
   strcpy(str,"qqeRo");
   len = strlen((char const *)(str));
   rc = strtouppercase_s(str,len);
-  if (rc != 0) printf_va_838("%s %u   Error rc=%u \n",
-                             (char *)"test_strtouppercase_s",
-                             (unsigned int)126,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtouppercase_s",(unsigned int)126,
+                      (unsigned int)rc); /* printf_va_838 */
   tmp_2 = strcmp((char const *)(str),"QQERO");
-  if (tmp_2) printf_va_839("%s %u   Error -%s- \n",
-                           (char *)"test_strtouppercase_s",(unsigned int)132,
-                           str);
+  if (tmp_2) printf("%s %u   Error -%s- \n",(char *)"test_strtouppercase_s",
+                    (unsigned int)132,str); /* printf_va_839 */
   strcpy(str,"1234");
   len = strlen((char const *)(str));
   rc = strtouppercase_s(str,(unsigned int)22);
-  if (rc != 0) printf_va_840("%s %u   Error rc=%u \n",
-                             (char *)"test_strtouppercase_s",
-                             (unsigned int)144,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",
+                      (char *)"test_strtouppercase_s",(unsigned int)144,
+                      (unsigned int)rc); /* printf_va_840 */
   __retres = 0;
   return __retres;
 }
@@ -28500,79 +28212,67 @@ int test_strzero_s(void)
   uint32_t i;
   int tmp;
   rc = strzero_s((char *)0,(unsigned int)5);
-  if (rc != 400) printf_va_841("%s %u   Error rc=%u \n",
-                               (char *)"test_strzero_s",(unsigned int)27,
-                               (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_strzero_s",
+                        (unsigned int)27,(unsigned int)rc); /* printf_va_841 */
   rc = strzero_s(str1_17,(unsigned int)0);
-  if (rc != 401) printf_va_842("%s %u   Error rc=%u \n",
-                               (char *)"test_strzero_s",(unsigned int)35,
-                               (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_strzero_s",
+                        (unsigned int)35,(unsigned int)rc); /* printf_va_842 */
   rc = strzero_s(str1_17,(unsigned int)((4UL << 10) + (unsigned long)1));
-  if (rc != 403) printf_va_843("%s %u   Error rc=%u \n",
-                               (char *)"test_strzero_s",(unsigned int)43,
-                               (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_strzero_s",
+                        (unsigned int)43,(unsigned int)rc); /* printf_va_843 */
   max_len = (unsigned int)1;
   rc = strzero_s(str1_17,max_len);
-  if (rc != 0) printf_va_844("%s %u   Error rc=%u \n",
-                             (char *)"test_strzero_s",(unsigned int)52,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strzero_s",
+                      (unsigned int)52,(unsigned int)rc); /* printf_va_844 */
   i = (unsigned int)0;
   while (i < max_len) {
-    if ((int)str1_17[i] != '\000') printf_va_845("%s %u   Error rc=%u \n",
-                                                 (char *)"test_strzero_s",
-                                                 (unsigned int)58,
-                                                 (unsigned int)rc);
+    if ((int)str1_17[i] != '\000') printf("%s %u   Error rc=%u \n",
+                                          (char *)"test_strzero_s",
+                                          (unsigned int)58,(unsigned int)rc); /* printf_va_845 */
     i += (uint32_t)1;
   }
   max_len = (unsigned int)2;
   rc = strzero_s(str1_17,max_len);
-  if (rc != 0) printf_va_846("%s %u   Error rc=%u \n",
-                             (char *)"test_strzero_s",(unsigned int)68,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strzero_s",
+                      (unsigned int)68,(unsigned int)rc); /* printf_va_846 */
   i = (unsigned int)0;
   while (i < max_len) {
-    if ((int)str1_17[i] != '\000') printf_va_847("%s %u   Error rc=%u \n",
-                                                 (char *)"test_strzero_s",
-                                                 (unsigned int)74,
-                                                 (unsigned int)rc);
+    if ((int)str1_17[i] != '\000') printf("%s %u   Error rc=%u \n",
+                                          (char *)"test_strzero_s",
+                                          (unsigned int)74,(unsigned int)rc); /* printf_va_847 */
     i += (uint32_t)1;
   }
   max_len = (unsigned int)3;
   rc = strzero_s(str1_17,max_len);
-  if (rc != 0) printf_va_848("%s %u   Error rc=%u \n",
-                             (char *)"test_strzero_s",(unsigned int)84,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strzero_s",
+                      (unsigned int)84,(unsigned int)rc); /* printf_va_848 */
   i = (unsigned int)0;
   while (i < max_len) {
-    if ((int)str1_17[i] != '\000') printf_va_849("%s %u   Error rc=%u \n",
-                                                 (char *)"test_strzero_s",
-                                                 (unsigned int)90,
-                                                 (unsigned int)rc);
+    if ((int)str1_17[i] != '\000') printf("%s %u   Error rc=%u \n",
+                                          (char *)"test_strzero_s",
+                                          (unsigned int)90,(unsigned int)rc); /* printf_va_849 */
     i += (uint32_t)1;
   }
   max_len = (unsigned int)128;
   rc = strzero_s(str1_17,max_len);
-  if (rc != 0) printf_va_850("%s %u   Error rc=%u \n",
-                             (char *)"test_strzero_s",(unsigned int)100,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strzero_s",
+                      (unsigned int)100,(unsigned int)rc); /* printf_va_850 */
   i = (unsigned int)0;
   while (i < max_len) {
-    if ((int)str1_17[i] != '\000') printf_va_851("%s %u   Error rc=%u \n",
-                                                 (char *)"test_strzero_s",
-                                                 (unsigned int)106,
-                                                 (unsigned int)rc);
+    if ((int)str1_17[i] != '\000') printf("%s %u   Error rc=%u \n",
+                                          (char *)"test_strzero_s",
+                                          (unsigned int)106,(unsigned int)rc); /* printf_va_851 */
     i += (uint32_t)1;
   }
   strcpy(str1_17,"Now is the time for all data to be zeroed");
   max_len = strlen("Now is the ");
   rc = strzero_s(str1_17,max_len);
-  if (rc != 0) printf_va_852("%s %u   Error rc=%u \n",
-                             (char *)"test_strzero_s",(unsigned int)118,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_strzero_s",
+                      (unsigned int)118,(unsigned int)rc); /* printf_va_852 */
   tmp = strcmp((char const *)(& str1_17[max_len]),
                "time for all data to be zeroed");
-  if (tmp) printf_va_853("%s %u ERROR  --%s-- \n",(char *)"test_strzero_s",
-                         (unsigned int)123,& str1_17[max_len]);
+  if (tmp) printf("%s %u ERROR  --%s-- \n",(char *)"test_strzero_s",
+                  (unsigned int)123,& str1_17[max_len]); /* printf_va_853 */
   __retres = 0;
   return __retres;
 }
@@ -29598,75 +29298,69 @@ int test_wcpcpy_s(void)
   rsize_t sz;
   rsize_t tmp_1;
   unsigned int testno = (unsigned int)0;
-  printf_va_854("\nTesting wcpcpy_s:\n");
+  printf("\nTesting wcpcpy_s:\n"); /* printf_va_854 */
   testno ++;
-  printf_va_855("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_855 */
   ret = wcpcpy_s((wchar_t *)0,(unsigned int)128,(wchar_t const *)(str2_11),
                  & rc);
-  if (rc != 400) printf_va_856("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)105,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_857("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)110,(unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)105,(unsigned int)rc); /* printf_va_856 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)110,
+                                  (unsigned int)rc); /* printf_va_857 */
   testno ++;
-  printf_va_858("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_858 */
   ret = wcpcpy_s(str1_11,(unsigned int)0,(wchar_t const *)(str2_11),& rc);
-  if (rc != 401) printf_va_859("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)120,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_860("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)124,(unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)120,(unsigned int)rc); /* printf_va_859 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)124,
+                                  (unsigned int)rc); /* printf_va_860 */
   testno ++;
-  printf_va_861("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_861 */
   ret = wcpcpy_s(str1_11,(unsigned int)((4UL << 10) + (unsigned long)1),
                  (wchar_t const *)(str2_11),& rc);
-  if (rc != 403) printf_va_862("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)135,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_863("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)139,(unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)135,(unsigned int)rc); /* printf_va_862 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)139,
+                                  (unsigned int)rc); /* printf_va_863 */
   testno ++;
-  printf_va_864("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_864 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
            "a" "a" "a" );
   ret = wcpcpy_s(str1_11,(unsigned int)5,(wchar_t const *)0,& rc);
-  if (rc != 400) printf_va_865("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)151,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_866("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)156,(unsigned int)rc);
-  if (str1_11[0] != 0) printf_va_867("%s %u   Error rc=%u \n",
-                                     (char *)"test_wcpcpy_s",
-                                     (unsigned int)169,(unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)151,(unsigned int)rc); /* printf_va_865 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)156,
+                                  (unsigned int)rc); /* printf_va_866 */
+  if (str1_11[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcpcpy_s",(unsigned int)169,
+                              (unsigned int)rc); /* printf_va_867 */
   testno ++;
-  printf_va_868("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_868 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
            "a" "a" "a" );
   ret = wcpcpy_s(str1_11,(unsigned int)5,(wchar_t const *)(str1_11),& rc);
-  if (rc != 403) printf_va_869("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)183,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_870("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)188,(unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)183,(unsigned int)rc); /* printf_va_869 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)188,
+                                  (unsigned int)rc); /* printf_va_870 */
   testno ++;
-  printf_va_871("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_871 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
            "a" "a" "a" );
   ret = wcpcpy_s(str1_11,(unsigned int)128,(wchar_t const *)(str1_11),& rc);
-  if (rc != 0) printf_va_872("%s %u   Error rc=%u \n",
-                             (char *)"test_wcpcpy_s",(unsigned int)201,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                      (unsigned int)201,(unsigned int)rc); /* printf_va_872 */
   if (ret == (wchar_t *)0) goto _LOR;
   else 
     if (*(ret + 0) != 0) goto _LOR;
@@ -29675,45 +29369,42 @@ int test_wcpcpy_s(void)
       tmp = wcsnlen_s((wchar_t const *)(str1_11),(unsigned int)128);
       ;
       if (ret != & str1_11[tmp]) _LOR:
-                                 printf_va_873("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                               (char *)"test_wcpcpy_s",
-                                               (unsigned int)206,
-                                               (unsigned int)rc);
+                                 printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                        (char *)"test_wcpcpy_s",
+                                        (unsigned int)206,(unsigned int)rc); /* printf_va_873 */
     }
   testno ++;
-  printf_va_874("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_874 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   sz = wcsnlen_s((wchar_t const *)(str1_11),(unsigned int)128);
   ret = wcpcpy_s(str1_11,(unsigned int)128,(wchar_t const *)(& str1_11[5]),
                  & rc);
-  if (rc != 404) printf_va_875("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)222,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_876("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)226,(unsigned int)rc);
-  if (str1_11[0] != 0) printf_va_877("%s %u   Error rc=%u \n",
-                                     (char *)"test_wcpcpy_s",
-                                     (unsigned int)239,(unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)222,(unsigned int)rc); /* printf_va_875 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)226,
+                                  (unsigned int)rc); /* printf_va_876 */
+  if (str1_11[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcpcpy_s",(unsigned int)239,
+                              (unsigned int)rc); /* printf_va_877 */
   testno ++;
-  printf_va_878("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_878 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   sz = wcsnlen_s((wchar_t const *)(str1_11),(unsigned int)128);
   ret = wcpcpy_s(& str1_11[5],(unsigned int)128,(wchar_t const *)(str1_11),
                  & rc);
-  if (rc != 404) printf_va_879("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)256,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_880("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)260,(unsigned int)rc);
-  if (str1_11[5] != 0) printf_va_881("%s %u   Error rc=%u \n",
-                                     (char *)"test_wcpcpy_s",
-                                     (unsigned int)273,(unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)256,(unsigned int)rc); /* printf_va_879 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)260,
+                                  (unsigned int)rc); /* printf_va_880 */
+  if (str1_11[5] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcpcpy_s",(unsigned int)273,
+                              (unsigned int)rc); /* printf_va_881 */
   testno ++;
-  printf_va_882("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_882 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
@@ -29721,29 +29412,27 @@ int test_wcpcpy_s(void)
   str2_11[0] = 0;
   ret = wcpcpy_s(str1_11,(unsigned int)(128 / 2),(wchar_t const *)(str2_11),
                  & rc);
-  if (rc != 0) printf_va_883("%s %u   Error rc=%u \n",
-                             (char *)"test_wcpcpy_s",(unsigned int)295,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                      (unsigned int)295,(unsigned int)rc); /* printf_va_883 */
   if (ret == (wchar_t *)0) goto _LOR_0;
   else 
     if (*(ret + 0) != 0) goto _LOR_0;
     else 
       if (ret != str1_11) _LOR_0:
-                          printf_va_884("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                        (char *)"test_wcpcpy_s",
-                                        (unsigned int)299,(unsigned int)rc);
-  if (str1_11[0] != 0) printf_va_885("%s %u   Error - string should be NULL rc=%u \n",
-                                     (char *)"test_wcpcpy_s",
-                                     (unsigned int)312,(unsigned int)rc);
+                          printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                 (char *)"test_wcpcpy_s",(unsigned int)299,
+                                 (unsigned int)rc); /* printf_va_884 */
+  if (str1_11[0] != 0) printf("%s %u   Error - string should be NULL rc=%u \n",
+                              (char *)"test_wcpcpy_s",(unsigned int)312,
+                              (unsigned int)rc); /* printf_va_885 */
   testno ++;
-  printf_va_886("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_886 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   memset_s((void *)(str2_11),(unsigned int)'\000',(unsigned char)30);
   ret = wcpcpy_s(str2_11,(unsigned int)128,(wchar_t const *)(str1_11),& rc);
-  if (rc != 0) printf_va_887("%s %u   Error rc=%u \n",
-                             (char *)"test_wcpcpy_s",(unsigned int)328,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                      (unsigned int)328,(unsigned int)rc); /* printf_va_887 */
   if (ret == (wchar_t *)0) goto _LOR_1;
   else 
     if (*(ret + 0) != 0) goto _LOR_1;
@@ -29752,35 +29441,31 @@ int test_wcpcpy_s(void)
       tmp_0 = wcsnlen_s((wchar_t const *)(str2_11),(unsigned int)128);
       ;
       if (ret != & str2_11[tmp_0]) _LOR_1:
-                                   printf_va_888("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                 (char *)"test_wcpcpy_s",
-                                                 (unsigned int)332,
-                                                 (unsigned int)rc);
+                                   printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                          (char *)"test_wcpcpy_s",
+                                          (unsigned int)332,(unsigned int)rc); /* printf_va_888 */
     }
   rc = memcmp_s((void const *)(str2_11),(unsigned int)128,(void const *)L"k"
                 "e" "e" "p" " " "i" "t" " " "s" "i" "m" "p" "l" "e" ,
                 (unsigned int)15 * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_889("%s %u   Error -%ls- \n",
-                              (char *)"test_wcpcpy_s",(unsigned int)338,
-                              str1_11);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcpcpy_s",
+                       (unsigned int)338,str1_11); /* printf_va_889 */
   testno ++;
-  printf_va_890("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_890 */
   memset_s((void *)(str1_11),(unsigned int)'\000',(unsigned char)50);
   wcscpy_s(str2_11,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   sz = wcsnlen_s((wchar_t const *)(str2_11),(unsigned int)128);
   ret = wcpcpy_s(str1_11,(unsigned int)128,(wchar_t const *)(str2_11),& rc);
-  if (rc != 0) printf_va_891("%s %u   Error rc=%u \n",
-                             (char *)"test_wcpcpy_s",(unsigned int)354,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                      (unsigned int)354,(unsigned int)rc); /* printf_va_891 */
   tmp_1 = wcsnlen_s((wchar_t const *)(str2_11),(unsigned int)128);
   rc = memcmp_s((void const *)(str1_11),(unsigned int)128,
                 (void const *)(str2_11),tmp_1 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_892("%s %u -%ls- <> -%ls-  (smax=%lu) Error rc=%u \n",
-                              (char *)"test_wcpcpy_s",(unsigned int)360,
-                              str1_11,str2_11,(unsigned long)sz,
-                              (unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls- <> -%ls-  (smax=%lu) Error rc=%u \n",
+                       (char *)"test_wcpcpy_s",(unsigned int)360,str1_11,
+                       str2_11,(unsigned long)sz,(unsigned int)rc); /* printf_va_892 */
   if (ret == (wchar_t *)0) goto _LOR_2;
   else 
     if (*(ret + 0) != 0) goto _LOR_2;
@@ -29789,20 +29474,18 @@ int test_wcpcpy_s(void)
       tmp_2 = wcsnlen_s((wchar_t const *)(str1_11),(unsigned int)128);
       ;
       if (ret != & str1_11[tmp_2]) _LOR_2:
-                                   printf_va_893("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                 (char *)"test_wcpcpy_s",
-                                                 (unsigned int)365,
-                                                 (unsigned int)rc);
+                                   printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                          (char *)"test_wcpcpy_s",
+                                          (unsigned int)365,(unsigned int)rc); /* printf_va_893 */
     }
   testno ++;
-  printf_va_894("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_894 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"x" "x" "x" "x" "x"
            "x" "x" "x" "x" "x" );
   wcscpy_s(str2_11,(unsigned int)128,(wchar_t const *)L"a" "b" "c" "d" "e" );
   ret = wcpcpy_s(str1_11,(unsigned int)128,(wchar_t const *)(str2_11),& rc);
-  if (rc != 0) printf_va_895("%s %u   Error rc=%u \n",
-                             (char *)"test_wcpcpy_s",(unsigned int)378,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                      (unsigned int)378,(unsigned int)rc); /* printf_va_895 */
   if (ret == (wchar_t *)0) goto _LOR_3;
   else 
     if (*(ret + 0) != 0) goto _LOR_3;
@@ -29811,74 +29494,65 @@ int test_wcpcpy_s(void)
       tmp_3 = wcsnlen_s((wchar_t const *)(str1_11),(unsigned int)128);
       ;
       if (ret != & str1_11[tmp_3]) _LOR_3:
-                                   printf_va_896("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                 (char *)"test_wcpcpy_s",
-                                                 (unsigned int)383,
-                                                 (unsigned int)rc);
+                                   printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                          (char *)"test_wcpcpy_s",
+                                          (unsigned int)383,(unsigned int)rc); /* printf_va_896 */
     }
   sz = wcsnlen_s((wchar_t const *)(str1_11),(unsigned int)128);
-  if (sz != (rsize_t)5) printf_va_897("%s %u (sz=%lu <> 5) Error rc=%u \n",
-                                      (char *)"test_wcpcpy_s",
-                                      (unsigned int)389,(unsigned long)sz,
-                                      (unsigned int)rc);
+  if (sz != (rsize_t)5) printf("%s %u (sz=%lu <> 5) Error rc=%u \n",
+                               (char *)"test_wcpcpy_s",(unsigned int)389,
+                               (unsigned long)sz,(unsigned int)rc); /* printf_va_897 */
   rc = memcmp_s((void const *)(str1_11),(unsigned int)128,
                 (void const *)(str2_11),(unsigned int)6 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_898("%s %u -%ls- <> -%ls-  (size=%lu) Error rc=%u \n",
-                              (char *)"test_wcpcpy_s",(unsigned int)394,
-                              str1_11,str2_11,(unsigned long)sz,
-                              (unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls- <> -%ls-  (size=%lu) Error rc=%u \n",
+                       (char *)"test_wcpcpy_s",(unsigned int)394,str1_11,
+                       str2_11,(unsigned long)sz,(unsigned int)rc); /* printf_va_898 */
   testno ++;
-  printf_va_899("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_899 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"q" "q" "w" "e" "q"
            "e" "q" "e" "q" "e" "q" );
   wcscpy_s(str2_11,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   sz = wcsnlen_s((wchar_t const *)(str2_11),(unsigned int)128);
   ret = wcpcpy_s(str1_11,(unsigned int)14,(wchar_t const *)(str2_11),& rc);
-  if (rc != 406) printf_va_900("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)409,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_901("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)413,(unsigned int)rc);
-  if (str1_11[0] != 0) printf_va_902("%s %u -%ls-  Error rc=%u \n",
-                                     (char *)"test_wcpcpy_s",
-                                     (unsigned int)418,str1_11,
-                                     (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)409,(unsigned int)rc); /* printf_va_900 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)413,
+                                  (unsigned int)rc); /* printf_va_901 */
+  if (str1_11[0] != 0) printf("%s %u -%ls-  Error rc=%u \n",
+                              (char *)"test_wcpcpy_s",(unsigned int)418,
+                              str1_11,(unsigned int)rc); /* printf_va_902 */
   testno ++;
-  printf_va_903("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_903 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"q" "q" "w" "e" "q"
            "e" "q" "e" "q" "e" "q" );
   wcscpy_s(str2_11,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   sz = wcsnlen_s((wchar_t const *)(str2_11),(unsigned int)128);
   ret = wcpcpy_s(str2_11,(unsigned int)6,(wchar_t const *)(str1_11),& rc);
-  if (rc != 406) printf_va_904("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)432,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_905("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)436,(unsigned int)rc);
-  if (str2_11[0] != 0) printf_va_906("%s %u -%ls-  Error rc=%u \n",
-                                     (char *)"test_wcpcpy_s",
-                                     (unsigned int)441,str1_11,
-                                     (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)432,(unsigned int)rc); /* printf_va_904 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)436,
+                                  (unsigned int)rc); /* printf_va_905 */
+  if (str2_11[0] != 0) printf("%s %u -%ls-  Error rc=%u \n",
+                              (char *)"test_wcpcpy_s",(unsigned int)441,
+                              str1_11,(unsigned int)rc); /* printf_va_906 */
   testno ++;
-  printf_va_907("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_907 */
   wcscpy_s(str2_11,(unsigned int)128,(wchar_t const *)L"q" "q" "w" "e" "q"
            "e" "q" "e" "q" "e" "q" );
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"i" "t" );
   ret = wcpcpy_s(str2_11,(unsigned int)3,(wchar_t const *)(str1_11),& rc);
-  if (rc != 0) printf_va_908("%s %u   Error rc=%u \n",
-                             (char *)"test_wcpcpy_s",(unsigned int)454,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                      (unsigned int)454,(unsigned int)rc); /* printf_va_908 */
   rc = memcmp_s((void const *)(str1_11),(unsigned int)128,
                 (void const *)(str2_11),(unsigned int)3 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_909("%s %u -%ls-  Error rc=%u \n",
-                              (char *)"test_wcpcpy_s",(unsigned int)460,
-                              str1_11,(unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls-  Error rc=%u \n",(char *)"test_wcpcpy_s",
+                       (unsigned int)460,str1_11,(unsigned int)rc); /* printf_va_909 */
   if (ret == (wchar_t *)0) goto _LOR_4;
   else 
     if (*(ret + 0) != 0) goto _LOR_4;
@@ -29887,20 +29561,18 @@ int test_wcpcpy_s(void)
       tmp_4 = wcsnlen_s((wchar_t const *)(str2_11),(unsigned int)128);
       ;
       if (ret != & str2_11[tmp_4]) _LOR_4:
-                                   printf_va_910("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                 (char *)"test_wcpcpy_s",
-                                                 (unsigned int)464,
-                                                 (unsigned int)rc);
+                                   printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                          (char *)"test_wcpcpy_s",
+                                          (unsigned int)464,(unsigned int)rc); /* printf_va_910 */
     }
   testno ++;
-  printf_va_911("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_911 */
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"q" "q" "1" "2" "3"
            "4" "5" "w" "e" "q" "e" "q" "e" "q" "e" "q" );
   wcscpy_s(str2_11,(unsigned int)128,(wchar_t const *)L"i" "t" );
   ret = wcpcpy_s(str1_11,(unsigned int)10,(wchar_t const *)(str2_11),& rc);
-  if (rc != 0) printf_va_912("%s %u   Error rc=%u \n",
-                             (char *)"test_wcpcpy_s",(unsigned int)477,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                      (unsigned int)477,(unsigned int)rc); /* printf_va_912 */
   if (ret == (wchar_t *)0) goto _LOR_5;
   else 
     if (*(ret + 0) != 0) goto _LOR_5;
@@ -29909,34 +29581,30 @@ int test_wcpcpy_s(void)
       tmp_5 = wcsnlen_s((wchar_t const *)(str1_11),(unsigned int)128);
       ;
       if (ret != & str1_11[tmp_5]) _LOR_5:
-                                   printf_va_913("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                                 (char *)"test_wcpcpy_s",
-                                                 (unsigned int)481,
-                                                 (unsigned int)rc);
+                                   printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                          (char *)"test_wcpcpy_s",
+                                          (unsigned int)481,(unsigned int)rc); /* printf_va_913 */
     }
   rc = memcmp_s((void const *)(str1_11),(unsigned int)128,
                 (void const *)(str2_11),(unsigned int)3 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_914("%s %u -%ls-  Error rc=%u \n",
-                              (char *)"test_wcpcpy_s",(unsigned int)487,
-                              str1_11,(unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls-  Error rc=%u \n",(char *)"test_wcpcpy_s",
+                       (unsigned int)487,str1_11,(unsigned int)rc); /* printf_va_914 */
   testno ++;
-  printf_va_915("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_915 */
   wcscpy_s(str2_11,(unsigned int)128,(wchar_t const *)L"q" "q" "w" "e" "q"
            "e" "q" "e" "q" "e" "q" );
   wcscpy_s(str1_11,(unsigned int)128,(wchar_t const *)L"i" "t" );
   sz = wcsnlen_s((wchar_t const *)(str2_11),(unsigned int)128);
   ret = wcpcpy_s(str2_11,(unsigned int)2,(wchar_t const *)(str1_11),& rc);
-  if (rc != 406) printf_va_916("%s %u   Error rc=%u \n",
-                               (char *)"test_wcpcpy_s",(unsigned int)502,
-                               (unsigned int)rc);
-  if (ret != (wchar_t *)0) printf_va_917("Returned pointer incorrect: %s %u   Error rc=%u \n",
-                                         (char *)"test_wcpcpy_s",
-                                         (unsigned int)507,(unsigned int)rc);
-  if (str2_11[0] != 0) printf_va_918("%s %u -%ls-  Error rc=%u \n",
-                                     (char *)"test_wcpcpy_s",
-                                     (unsigned int)512,str1_11,
-                                     (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcpcpy_s",
+                        (unsigned int)502,(unsigned int)rc); /* printf_va_916 */
+  if (ret != (wchar_t *)0) printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
+                                  (char *)"test_wcpcpy_s",(unsigned int)507,
+                                  (unsigned int)rc); /* printf_va_917 */
+  if (str2_11[0] != 0) printf("%s %u -%ls-  Error rc=%u \n",
+                              (char *)"test_wcpcpy_s",(unsigned int)512,
+                              str1_11,(unsigned int)rc); /* printf_va_918 */
   __retres = 0;
   return __retres;
 }
@@ -30841,84 +30509,72 @@ int test_wcscat_s(void)
   rsize_t tmp_1;
   rsize_t tmp_2;
   unsigned int testno = (unsigned int)0;
-  printf_va_919("\nTesting wcscat_s:\n");
+  printf("\nTesting wcscat_s:\n"); /* printf_va_919 */
   testno ++;
-  printf_va_920("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_920 */
   rc = wcscat_s((wchar_t *)0,(unsigned int)128,(wchar_t const *)(str2_12));
-  if (rc != 400) printf_va_921("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)62,
-                               (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)62,(unsigned int)rc); /* printf_va_921 */
   testno ++;
-  printf_va_922("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_922 */
   rc = wcscat_s(str1_12,(unsigned int)128,(wchar_t const *)0);
-  if (rc != 400) printf_va_923("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)72,
-                               (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)72,(unsigned int)rc); /* printf_va_923 */
   testno ++;
-  printf_va_924("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_924 */
   rc = wcscat_s(str1_12,(unsigned int)0,(wchar_t const *)(str2_12));
-  if (rc != 401) printf_va_925("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)82,
-                               (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)82,(unsigned int)rc); /* printf_va_925 */
   testno ++;
-  printf_va_926("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_926 */
   rc = wcscat_s(str1_12,(unsigned int)((4UL << 10) + (unsigned long)1),
                 (wchar_t const *)(str2_12));
-  if (rc != 403) printf_va_927("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)92,
-                               (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)92,(unsigned int)rc); /* printf_va_927 */
   testno ++;
-  printf_va_928("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_928 */
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" "5"
            "6" "7" "8" "9" "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" );
   rc = wcscat_s(str1_12,(unsigned int)8,(wchar_t const *)(& str1_12[7]));
-  if (rc != 404) printf_va_929("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)105,
-                               (unsigned int)rc);
-  if (str1_12[0] != 0) printf_va_930("%s %u  Expected null  \n",
-                                     (char *)"test_wcscat_s",
-                                     (unsigned int)110);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)105,(unsigned int)rc); /* printf_va_929 */
+  if (str1_12[0] != 0) printf("%s %u  Expected null  \n",
+                              (char *)"test_wcscat_s",(unsigned int)110); /* printf_va_930 */
   testno ++;
-  printf_va_931("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_931 */
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" );
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str1_12,(unsigned int)1,(wchar_t const *)(str2_12));
-  if (rc != 407) printf_va_932("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)123,
-                               (unsigned int)rc);
-  if (str1_12[0] != 0) printf_va_933("%s %u  Expected null  \n",
-                                     (char *)"test_wcscat_s",
-                                     (unsigned int)128);
+  if (rc != 407) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)123,(unsigned int)rc); /* printf_va_932 */
+  if (str1_12[0] != 0) printf("%s %u  Expected null  \n",
+                              (char *)"test_wcscat_s",(unsigned int)128); /* printf_va_933 */
   testno ++;
-  printf_va_934("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_934 */
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" );
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str1_12,(unsigned int)10,(wchar_t const *)(str2_12));
-  if (rc != 407) printf_va_935("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)141,
-                               (unsigned int)rc);
-  if (str1_12[0] != 0) printf_va_936("%s %u  Expected null  \n",
-                                     (char *)"test_wcscat_s",
-                                     (unsigned int)146);
+  if (rc != 407) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)141,(unsigned int)rc); /* printf_va_935 */
+  if (str1_12[0] != 0) printf("%s %u  Expected null  \n",
+                              (char *)"test_wcscat_s",(unsigned int)146); /* printf_va_936 */
   testno ++;
-  printf_va_937("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_937 */
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   wcscpy_s(& str1_12[20],(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" );
   rc = wcscat_s(str1_12,(unsigned int)30,(wchar_t const *)(& str1_12[20]));
-  if (rc != 404) printf_va_938("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)159,
-                               (unsigned int)rc);
-  if (str1_12[0] != 0) printf_va_939("%s %u  Expected null  \n",
-                                     (char *)"test_wcscat_s",
-                                     (unsigned int)164);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)159,(unsigned int)rc); /* printf_va_938 */
+  if (str1_12[0] != 0) printf("%s %u  Expected null  \n",
+                              (char *)"test_wcscat_s",(unsigned int)164); /* printf_va_939 */
   testno ++;
-  printf_va_940("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_940 */
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" );
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
@@ -30928,178 +30584,152 @@ int test_wcscat_s(void)
   tmp_0 = wcsnlen_s((wchar_t const *)(str2_12),(unsigned int)128);
   len2 = (int)tmp_0;
   rc = wcscat_s(str1_12,(unsigned int)50,(wchar_t const *)(str2_12));
-  if (rc != 0) printf_va_941("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscat_s",(unsigned int)180,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                      (unsigned int)180,(unsigned int)rc); /* printf_va_941 */
   tmp_1 = wcsnlen_s((wchar_t const *)(str1_12),(unsigned int)128);
   len3 = (int)tmp_1;
-  if (len3 != len1 + len2) printf_va_942("%s %u lengths wrong: %u  %u  %u \n",
-                                         (char *)"test_wcscat_s",
-                                         (unsigned int)186,
-                                         (unsigned int)len1,
-                                         (unsigned int)len2,
-                                         (unsigned int)len3);
+  if (len3 != len1 + len2) printf("%s %u lengths wrong: %u  %u  %u \n",
+                                  (char *)"test_wcscat_s",(unsigned int)186,
+                                  (unsigned int)len1,(unsigned int)len2,
+                                  (unsigned int)len3); /* printf_va_942 */
   testno ++;
-  printf_va_943("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_943 */
   str1_12[0] = '\000';
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str1_12,(unsigned int)1,(wchar_t const *)(str2_12));
-  if (rc != 406) printf_va_944("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)200,
-                               (unsigned int)rc);
-  if (str1_12[0] != 0) printf_va_945("%s %u  Expected null  \n",
-                                     (char *)"test_wcscat_s",
-                                     (unsigned int)205);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)200,(unsigned int)rc); /* printf_va_944 */
+  if (str1_12[0] != 0) printf("%s %u  Expected null  \n",
+                              (char *)"test_wcscat_s",(unsigned int)205); /* printf_va_945 */
   testno ++;
-  printf_va_946("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_946 */
   str1_12[0] = '\000';
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str1_12,(unsigned int)11,(wchar_t const *)(str2_12));
-  if (rc != 406) printf_va_947("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)218,
-                               (unsigned int)rc);
-  if (str1_12[0] != 0) printf_va_948("%s %u  Expected null  \n",
-                                     (char *)"test_wcscat_s",
-                                     (unsigned int)223);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)218,(unsigned int)rc); /* printf_va_947 */
+  if (str1_12[0] != 0) printf("%s %u  Expected null  \n",
+                              (char *)"test_wcscat_s",(unsigned int)223); /* printf_va_948 */
   testno ++;
-  printf_va_949("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_949 */
   str1_12[0] = '\000';
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str1_12,(unsigned int)20,(wchar_t const *)(str2_12));
-  if (rc != 0) printf_va_950("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscat_s",(unsigned int)236,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                      (unsigned int)236,(unsigned int)rc); /* printf_va_950 */
   tmp_2 = wcsnlen_s((wchar_t const *)(str2_12),(unsigned int)128);
   rc = memcmp_s((void const *)(str1_12),(unsigned int)128,
                 (void const *)(str2_12),tmp_2 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_951("%s %u   Error -%ls- \n",
-                              (char *)"test_wcscat_s",(unsigned int)242,
-                              str1_12);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcscat_s",
+                       (unsigned int)242,str1_12); /* printf_va_951 */
   testno ++;
-  printf_va_952("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_952 */
   str1_12[0] = '\000';
   str2_12[0] = '\000';
   rc = wcscat_s(str1_12,(unsigned int)128,(wchar_t const *)(str2_12));
-  if (rc != 0) printf_va_953("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscat_s",(unsigned int)256,
-                             (unsigned int)rc);
-  if (str1_12[0] != 0) printf_va_954("%s %u  Expected null  \n",
-                                     (char *)"test_wcscat_s",
-                                     (unsigned int)261);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                      (unsigned int)256,(unsigned int)rc); /* printf_va_953 */
+  if (str1_12[0] != 0) printf("%s %u  Expected null  \n",
+                              (char *)"test_wcscat_s",(unsigned int)261); /* printf_va_954 */
   testno ++;
-  printf_va_955("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_955 */
   str1_12[0] = '\000';
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str2_12,(unsigned int)128,(wchar_t const *)(str1_12));
-  if (rc != 0) printf_va_956("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscat_s",(unsigned int)274,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                      (unsigned int)274,(unsigned int)rc); /* printf_va_956 */
   rc = memcmp_s((void const *)(str2_12),(unsigned int)128,(void const *)L"k"
                 "e" "e" "p" " " "i" "t" " " "s" "i" "m" "p" "l" "e" ,
                 (unsigned int)15 * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_957("%s %u   Error -%ls- \n",
-                              (char *)"test_wcscat_s",(unsigned int)280,
-                              str1_12);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcscat_s",
+                       (unsigned int)280,str1_12); /* printf_va_957 */
   testno ++;
-  printf_va_958("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_958 */
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"q" "q" "w" "e" "q"
            "q" );
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str1_12,(unsigned int)128,(wchar_t const *)(str2_12));
-  if (rc != 0) printf_va_959("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscat_s",(unsigned int)293,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                      (unsigned int)293,(unsigned int)rc); /* printf_va_959 */
   rc = memcmp_s((void const *)(str1_12),(unsigned int)128,(void const *)L"q"
                 "q" "w" "e" "q" "q" "k" "e" "e" "p" " " "i" "t" " " "s" "i"
                 "m" "p" "l" "e" ,(unsigned int)20 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_960("%s %u   Error -%ls- \n",
-                              (char *)"test_wcscat_s",(unsigned int)299,
-                              str1_12);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcscat_s",
+                       (unsigned int)299,str1_12); /* printf_va_960 */
   testno ++;
-  printf_va_961("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_961 */
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" );
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str2_12,(unsigned int)16,(wchar_t const *)(str1_12));
-  if (rc != 406) printf_va_962("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)312,
-                               (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)312,(unsigned int)rc); /* printf_va_962 */
   testno ++;
-  printf_va_963("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_963 */
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" );
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str2_12,(unsigned int)19,(wchar_t const *)(str1_12));
-  if (rc != 0) printf_va_964("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscat_s",(unsigned int)325,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                      (unsigned int)325,(unsigned int)rc); /* printf_va_964 */
   rc = memcmp_s((void const *)(str2_12),(unsigned int)128,(void const *)L"k"
                 "e" "e" "p" " " "i" "t" " " "s" "i" "m" "p" "l" "e" "1" "2"
                 "3" "4" ,(unsigned int)19 * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_965("%s %u   Error -%ls- \n",
-                              (char *)"test_wcscat_s",(unsigned int)331,
-                              str1_12);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcscat_s",
+                       (unsigned int)331,str1_12); /* printf_va_965 */
   testno ++;
-  printf_va_966("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_966 */
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" "5"
            "6" "7" "8" "9" "1" "2" "3" "4" "5" "6" "7" "8" "9" );
   wcscpy_s(& str1_12[13],(unsigned int)128,(wchar_t const *)L"A" "B" "C" "D"
            "E" "F" "G" "H" "I" "J" "K" "L" "M" "N" "O" "P" "1" "2" "3" "4"
            "5" "6" "7" "8" "9" );
   rc = wcscat_s(& str1_12[13],(unsigned int)128,(wchar_t const *)(str1_12));
-  if (rc != 404) printf_va_967("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)345,
-                               (unsigned int)rc);
-  if (str1_12[13] != 0) printf_va_968("%s %u  Expected null  \n",
-                                      (char *)"test_wcscat_s",
-                                      (unsigned int)350);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)345,(unsigned int)rc); /* printf_va_967 */
+  if (str1_12[13] != 0) printf("%s %u  Expected null  \n",
+                               (char *)"test_wcscat_s",(unsigned int)350); /* printf_va_968 */
   testno ++;
-  printf_va_969("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_969 */
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"1" "2" "3" );
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcscat_s(str2_12,(unsigned int)31,(wchar_t const *)(str1_12));
-  if (rc != 0) printf_va_970("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscat_s",(unsigned int)363,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                      (unsigned int)363,(unsigned int)rc); /* printf_va_970 */
   rc = memcmp_s((void const *)(str2_12),(unsigned int)128,(void const *)L"1"
                 "2" "3" "k" "e" "e" "p" " " "i" "t" " " "s" "i" "m" "p" "l"
                 "e" ,(unsigned int)17 * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_971("%s %u   Error -%ls- \n",
-                              (char *)"test_wcscat_s",(unsigned int)369,
-                              str1_12);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcscat_s",
+                       (unsigned int)369,str1_12); /* printf_va_971 */
   testno ++;
-  printf_va_972("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_972 */
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" );
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"5" "6" "7" "8" "9" );
   rc = wcscat_s(str2_12,(unsigned int)10,(wchar_t const *)(str1_12));
-  if (rc != 0) printf_va_973("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscat_s",(unsigned int)382,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                      (unsigned int)382,(unsigned int)rc); /* printf_va_973 */
   rc = memcmp_s((void const *)(str2_12),(unsigned int)128,(void const *)L"1"
                 "2" "3" "4" "5" "6" "7" "8" "9" ,
                 (unsigned int)9 * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_974("%s %u   Error -%ls- \n",
-                              (char *)"test_wcscat_s",(unsigned int)389,
-                              str1_12);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcscat_s",
+                       (unsigned int)389,str1_12); /* printf_va_974 */
   testno ++;
-  printf_va_975("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_975 */
   wcscpy_s(str2_12,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" );
   wcscpy_s(str1_12,(unsigned int)128,(wchar_t const *)L"5" "6" "7" "8" "9" );
   rc = wcscat_s(str2_12,(unsigned int)9,(wchar_t const *)(str1_12));
-  if (rc != 406) printf_va_976("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscat_s",(unsigned int)402,
-                               (unsigned int)rc);
-  if (str2_12[0] != 0) printf_va_977("%s %u  Expected null  \n",
-                                     (char *)"test_wcscat_s",
-                                     (unsigned int)407);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcscat_s",
+                        (unsigned int)402,(unsigned int)rc); /* printf_va_976 */
+  if (str2_12[0] != 0) printf("%s %u  Expected null  \n",
+                              (char *)"test_wcscat_s",(unsigned int)407); /* printf_va_977 */
   __retres = 0;
   return __retres;
 }
@@ -31855,74 +31485,67 @@ int test_wcscpy_s(void)
   rsize_t sz;
   rsize_t sz_orig;
   unsigned int testno = (unsigned int)0;
-  printf_va_978("\nTesting wcscpy_s:\n");
+  printf("\nTesting wcscpy_s:\n"); /* printf_va_978 */
   testno ++;
-  printf_va_979("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_979 */
   rc = wcscpy_s((wchar_t *)0,(unsigned int)(128 * 4),
                 (wchar_t const *)(str2_13));
-  if (rc != 400) printf_va_980("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)104,
-                               (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)104,(unsigned int)rc); /* printf_va_980 */
   testno ++;
-  printf_va_981("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_981 */
   rc = wcscpy_s(str1_13,(unsigned int)0,(wchar_t const *)(str2_13));
-  if (rc != 401) printf_va_982("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)114,
-                               (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)114,(unsigned int)rc); /* printf_va_982 */
   testno ++;
-  printf_va_983("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_983 */
   rc = wcscpy_s(str1_13,(unsigned int)((4UL << 10) + (unsigned long)1),
                 (wchar_t const *)(str2_13));
-  if (rc != 403) printf_va_984("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)124,
-                               (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)124,(unsigned int)rc); /* printf_va_984 */
   testno ++;
-  printf_va_985("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_985 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" ,(unsigned int)5);
   rc = wcscpy_s(str1_13,(unsigned int)5,(wchar_t const *)0);
-  if (rc != 400) printf_va_986("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)136,
-                               (unsigned int)rc);
-  if (str1_13[0] != 0) printf_va_987("%s %u   Error rc=%u \n",
-                                     (char *)"test_wcscpy_s",
-                                     (unsigned int)149,(unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)136,(unsigned int)rc); /* printf_va_986 */
+  if (str1_13[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcscpy_s",(unsigned int)149,
+                              (unsigned int)rc); /* printf_va_987 */
   testno ++;
-  printf_va_988("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_988 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" ,(unsigned int)42);
   rc = wcscpy_s(str1_13,(unsigned int)5,(wchar_t const *)(str1_13));
-  if (rc != 403) printf_va_989("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)163,
-                               (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)163,(unsigned int)rc); /* printf_va_989 */
   testno ++;
-  printf_va_990("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_990 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" ,(unsigned int)42);
   rc = wcscpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)(str1_13));
-  if (rc != 0) printf_va_991("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscpy_s",(unsigned int)175,
-                             (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                      (unsigned int)175,(unsigned int)rc); /* printf_va_991 */
   testno ++;
-  printf_va_992("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_992 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" ,(unsigned int)47);
   rc = wcscpy_s(str1_13,(unsigned int)(128 * 4),
                 (wchar_t const *)(& str1_13[5]));
-  if (rc != 404) printf_va_993("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)190,
-                               (unsigned int)rc);
-  if (str1_13[0] != 0) printf_va_994("%s %u   Error rc=%u \n",
-                                     (char *)"test_wcscpy_s",
-                                     (unsigned int)203,(unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)190,(unsigned int)rc); /* printf_va_993 */
+  if (str1_13[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcscpy_s",(unsigned int)203,
+                              (unsigned int)rc); /* printf_va_994 */
   testno ++;
-  printf_va_995("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_995 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
@@ -31930,14 +31553,13 @@ int test_wcscpy_s(void)
   sz = wcsnlen_s((wchar_t const *)(str1_13),(unsigned int)(128 * 4));
   rc = wcscpy_s(& str1_13[8],(unsigned int)(128 * 4),
                 (wchar_t const *)(str1_13));
-  if (rc != 404) printf_va_996("%s %u   Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)220,
-                               (unsigned int)rc);
-  if (str1_13[8] != 0) printf_va_997("%s %u   Error rc=%u \n",
-                                     (char *)"test_wcscpy_s",
-                                     (unsigned int)233,(unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)220,(unsigned int)rc); /* printf_va_996 */
+  if (str1_13[8] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcscpy_s",(unsigned int)233,
+                              (unsigned int)rc); /* printf_va_997 */
   testno ++;
-  printf_va_998("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_998 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
@@ -31945,14 +31567,13 @@ int test_wcscpy_s(void)
   str2_13[0] = 0;
   rc = wcscpy_s(str1_13,(unsigned int)((128 * 4) / 2),
                 (wchar_t const *)(str2_13));
-  if (rc != 0) printf_va_999("%s %u   Error rc=%u \n",
-                             (char *)"test_wcscpy_s",(unsigned int)250,
-                             (unsigned int)rc);
-  if (str1_13[0] != 0) printf_va_1000("%s %u   Error - string should be NULL rc=%u \n",
-                                      (char *)"test_wcscpy_s",
-                                      (unsigned int)263,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                      (unsigned int)250,(unsigned int)rc); /* printf_va_999 */
+  if (str1_13[0] != 0) printf("%s %u   Error - string should be NULL rc=%u \n",
+                              (char *)"test_wcscpy_s",(unsigned int)263,
+                              (unsigned int)rc); /* printf_va_1000 */
   testno ++;
-  printf_va_1001("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1001 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
@@ -31960,17 +31581,16 @@ int test_wcscpy_s(void)
   sz = wcsnlen_s((wchar_t const *)(str1_13),(unsigned int)(128 * 4));
   memset_s((void *)(str2_13),(unsigned int)'\000',(unsigned char)30);
   rc = wcscpy_s(str2_13,(unsigned int)(128 * 4),(wchar_t const *)(str1_13));
-  if (rc != 0) printf_va_1002("%s %u   Error rc=%u \n",
-                              (char *)"test_wcscpy_s",(unsigned int)279,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                      (unsigned int)279,(unsigned int)rc); /* printf_va_1002 */
   rc = memcmp_s((void const *)(str2_13),(unsigned int)(128 * 4),
                 (void const *)(str1_13),(sz + (rsize_t)1) * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1003("%s %u   Error -%ls- <> -%ls-\n",
-                               (char *)"test_wcscpy_s",(unsigned int)285,
-                               str2_13,str1_13);
+  if (ind != 0) printf("%s %u   Error -%ls- <> -%ls-\n",
+                       (char *)"test_wcscpy_s",(unsigned int)285,str2_13,
+                       str1_13); /* printf_va_1003 */
   testno ++;
-  printf_va_1004("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1004 */
   memset_s((void *)(str1_13),(unsigned int)'\000',(unsigned char)50);
   wmemcpy_s(str2_13,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
@@ -31978,81 +31598,70 @@ int test_wcscpy_s(void)
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" ,(unsigned int)47);
   sz = wcsnlen_s((wchar_t const *)(str2_13),(unsigned int)(128 * 4));
   rc = wcscpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)(str2_13));
-  if (rc != 0) printf_va_1005("%s %u   Error rc=%u \n",
-                              (char *)"test_wcscpy_s",(unsigned int)300,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                      (unsigned int)300,(unsigned int)rc); /* printf_va_1005 */
   rc = memcmp_s((void const *)(str1_13),(unsigned int)(128 * 4),
                 (void const *)(str2_13),sz * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_1006("%s %u -%ls- <> -%ls-  (smax=%lu) Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)306,
-                               str1_13,str2_13,(unsigned long)sz,
-                               (unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls- <> -%ls-  (smax=%lu) Error rc=%u \n",
+                       (char *)"test_wcscpy_s",(unsigned int)306,str1_13,
+                       str2_13,(unsigned long)sz,(unsigned int)rc); /* printf_va_1006 */
   testno ++;
-  printf_va_1007("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1007 */
   wmemset_s(str1_13,120,(unsigned int)20);
   wmemcpy_s(str2_13,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" ,(unsigned int)15);
   sz_orig = wcsnlen_s((wchar_t const *)(str2_13),(unsigned int)(128 * 4));
   rc = wcscpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)(str2_13));
-  if (rc != 0) printf_va_1008("%s %u   Error rc=%u \n",
-                              (char *)"test_wcscpy_s",(unsigned int)320,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                      (unsigned int)320,(unsigned int)rc); /* printf_va_1008 */
   sz = wcsnlen_s((wchar_t const *)(str1_13),(unsigned int)(128 * 4));
   if (sz != sz_orig) 
-    if (sz == (rsize_t)14) printf_va_1009("%s %u (sz=%lu <> 5) Error rc=%u \n",
-                                          (char *)"test_wcscpy_s",
-                                          (unsigned int)326,
-                                          (unsigned long)sz,(unsigned int)rc);
+    if (sz == (rsize_t)14) printf("%s %u (sz=%lu <> 5) Error rc=%u \n",
+                                  (char *)"test_wcscpy_s",(unsigned int)326,
+                                  (unsigned long)sz,(unsigned int)rc); /* printf_va_1009 */
   rc = memcmp_s((void const *)(str1_13),(unsigned int)(128 * 4),
                 (void const *)(str2_13),sz * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_1010("%s %u -%ls- <> -%ls-  (size=%lu) Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)331,
-                               str1_13,str2_13,(unsigned long)sz,
-                               (unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls- <> -%ls-  (size=%lu) Error rc=%u \n",
+                       (char *)"test_wcscpy_s",(unsigned int)331,str1_13,
+                       str2_13,(unsigned long)sz,(unsigned int)rc); /* printf_va_1010 */
   testno ++;
-  printf_va_1011("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1011 */
   wmemset_s(str1_13,120,(unsigned int)20);
   wmemcpy_s(str2_13,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" ,(unsigned int)15);
   rc = wcscpy_s(str1_13,(unsigned int)14,(wchar_t const *)(str2_13));
-  if (rc != 406) printf_va_1012("%s %u   Error rc=%u \n",
-                                (char *)"test_wcscpy_s",(unsigned int)346,
-                                (unsigned int)rc);
-  if (str1_13[0] != 0) printf_va_1013("%s %u -%ls-  Error rc=%u \n",
-                                      (char *)"test_wcscpy_s",
-                                      (unsigned int)351,str1_13,
-                                      (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)346,(unsigned int)rc); /* printf_va_1012 */
+  if (str1_13[0] != 0) printf("%s %u -%ls-  Error rc=%u \n",
+                              (char *)"test_wcscpy_s",(unsigned int)351,
+                              str1_13,(unsigned int)rc); /* printf_va_1013 */
   testno ++;
-  printf_va_1014("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1014 */
   wmemset_s(str1_13,120,(unsigned int)20);
   wmemcpy_s(str2_13,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" ,(unsigned int)15);
   rc = wcscpy_s(str2_13,(unsigned int)6,(wchar_t const *)(str1_13));
-  if (rc != 406) printf_va_1015("%s %u   Error rc=%u \n",
-                                (char *)"test_wcscpy_s",(unsigned int)364,
-                                (unsigned int)rc);
-  if (str2_13[0] != 0) printf_va_1016("%s %u -%ls-  Error rc=%u \n",
-                                      (char *)"test_wcscpy_s",
-                                      (unsigned int)369,str1_13,
-                                      (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)364,(unsigned int)rc); /* printf_va_1015 */
+  if (str2_13[0] != 0) printf("%s %u -%ls-  Error rc=%u \n",
+                              (char *)"test_wcscpy_s",(unsigned int)369,
+                              str1_13,(unsigned int)rc); /* printf_va_1016 */
   testno ++;
-  printf_va_1017("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1017 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"i" "t" ,
             (unsigned int)3);
   wmemcpy_s(str2_13,(unsigned int)(128 * 4),(wchar_t const *)L"q" "q" "w" "e"
             "q" "e" "q" "e" "q" "e" "q" ,(unsigned int)12);
   rc = wcscpy_s(str2_13,(unsigned int)3,(wchar_t const *)(str1_13));
-  if (rc != 0) printf_va_1018("%s %u   Error rc=%u \n",
-                              (char *)"test_wcscpy_s",(unsigned int)383,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                      (unsigned int)383,(unsigned int)rc); /* printf_va_1018 */
   rc = memcmp_s((void const *)(str1_13),(unsigned int)(128 * 4),
                 (void const *)(str2_13),(unsigned int)3 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1019("%s %u -%ls-  Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)389,
-                               str1_13,(unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls-  Error rc=%u \n",(char *)"test_wcscpy_s",
+                       (unsigned int)389,str1_13,(unsigned int)rc); /* printf_va_1019 */
   testno ++;
-  printf_va_1020("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1020 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"q" "q" "1" "2"
             "3" "4" "5" "w" "e" "q" "e" "q" "e" "q" "e" "q" ,
             (unsigned int)17);
@@ -32060,30 +31669,26 @@ int test_wcscpy_s(void)
             (unsigned int)3);
   sz_orig = wcsnlen_s((wchar_t const *)(str2_13),(unsigned int)(128 * 4));
   rc = wcscpy_s(str1_13,(unsigned int)10,(wchar_t const *)(str2_13));
-  if (rc != 0) printf_va_1021("%s %u   Error rc=%u \n",
-                              (char *)"test_wcscpy_s",(unsigned int)404,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                      (unsigned int)404,(unsigned int)rc); /* printf_va_1021 */
   rc = memcmp_s((void const *)(str1_13),(unsigned int)(128 * 4),
                 (void const *)(str2_13),(unsigned int)3 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1022("%s %u -%ls-  Error rc=%u \n",
-                               (char *)"test_wcscpy_s",(unsigned int)410,
-                               str1_13,(unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls-  Error rc=%u \n",(char *)"test_wcscpy_s",
+                       (unsigned int)410,str1_13,(unsigned int)rc); /* printf_va_1022 */
   testno ++;
-  printf_va_1023("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1023 */
   wmemcpy_s(str1_13,(unsigned int)(128 * 4),(wchar_t const *)L"i" "t" ,
             (unsigned int)3);
   wmemcpy_s(str2_13,(unsigned int)(128 * 4),(wchar_t const *)L"q" "q" "w" "e"
             "q" "e" "q" "e" "q" "e" "q" ,(unsigned int)12);
   sz = wcsnlen_s((wchar_t const *)(str2_13),(unsigned int)(128 * 4));
   rc = wcscpy_s(str2_13,(unsigned int)2,(wchar_t const *)(str1_13));
-  if (rc != 406) printf_va_1024("%s %u   Error rc=%u \n",
-                                (char *)"test_wcscpy_s",(unsigned int)426,
-                                (unsigned int)rc);
-  if (str2_13[0] != 0) printf_va_1025("%s %u -%ls-  Error rc=%u \n",
-                                      (char *)"test_wcscpy_s",
-                                      (unsigned int)431,str1_13,
-                                      (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcscpy_s",
+                        (unsigned int)426,(unsigned int)rc); /* printf_va_1024 */
+  if (str2_13[0] != 0) printf("%s %u -%ls-  Error rc=%u \n",
+                              (char *)"test_wcscpy_s",(unsigned int)431,
+                              str1_13,(unsigned int)rc); /* printf_va_1025 */
   __retres = 0;
   return __retres;
 }
@@ -33070,83 +32675,75 @@ int test_wcsncat_s(void)
   rsize_t tmp_3;
   rsize_t tmp_4;
   unsigned int testno = (unsigned int)0;
-  printf_va_1026("\nTesting wcsncat_s:\n");
+  printf("\nTesting wcsncat_s:\n"); /* printf_va_1026 */
   testno ++;
-  printf_va_1027("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1027 */
   rc = wcsncat_s((wchar_t *)0,(unsigned int)128,(wchar_t const *)(str2_14),
                  (unsigned int)128);
-  if (rc != 400) printf_va_1028("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)105,
-                                (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)105,(unsigned int)rc); /* printf_va_1028 */
   testno ++;
-  printf_va_1029("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1029 */
   rc = wcsncat_s(str1_14,(unsigned int)128,(wchar_t const *)0,
                  (unsigned int)128);
-  if (rc != 400) printf_va_1030("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)115,
-                                (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)115,(unsigned int)rc); /* printf_va_1030 */
   testno ++;
-  printf_va_1031("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1031 */
   rc = wcsncat_s(str1_14,(unsigned int)128,(wchar_t const *)(str2_14),
                  (unsigned int)((4UL << 10) + (unsigned long)1));
-  if (rc != 403) printf_va_1032("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)125,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)125,(unsigned int)rc); /* printf_va_1032 */
   testno ++;
-  printf_va_1033("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1033 */
   rc = wcsncat_s(str1_14,(unsigned int)0,(wchar_t const *)(str2_14),
                  (unsigned int)128);
-  if (rc != 401) printf_va_1034("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)134,
-                                (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)134,(unsigned int)rc); /* printf_va_1034 */
   testno ++;
-  printf_va_1035("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1035 */
   rc = wcsncat_s(str1_14,(unsigned int)((4UL << 10) + (unsigned long)1),
                  (wchar_t const *)(str2_14),(unsigned int)128);
-  if (rc != 403) printf_va_1036("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)144,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)144,(unsigned int)rc); /* printf_va_1036 */
   testno ++;
-  printf_va_1037("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1037 */
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" " " "k" "e" "e" "p" " " "i" "t" " " "s" "i"
            "m" "p" "l" "e" );
   rc = wcsncat_s(str1_14,(unsigned int)128,(wchar_t const *)(& str1_14[11]),
                  (unsigned int)128);
-  if (rc != 404) printf_va_1038("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)158,
-                                (unsigned int)rc);
-  if (str1_14[0] != '\000') printf_va_1039("%s %u  Expected null  \n",
-                                           (char *)"test_wcsncat_s",
-                                           (unsigned int)163);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)158,(unsigned int)rc); /* printf_va_1038 */
+  if (str1_14[0] != '\000') printf("%s %u  Expected null  \n",
+                                   (char *)"test_wcsncat_s",
+                                   (unsigned int)163); /* printf_va_1039 */
   testno ++;
-  printf_va_1040("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1040 */
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str1_14,(unsigned int)2,(wchar_t const *)(& str1_14[20]),
                  (unsigned int)128);
-  if (rc != 407) printf_va_1041("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)175,
-                                (unsigned int)rc);
-  if (str1_14[0] != '\000') printf_va_1042("%s %u  Expected null  \n",
-                                           (char *)"test_wcsncat_s",
-                                           (unsigned int)180);
+  if (rc != 407) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)175,(unsigned int)rc); /* printf_va_1041 */
+  if (str1_14[0] != '\000') printf("%s %u  Expected null  \n",
+                                   (char *)"test_wcsncat_s",
+                                   (unsigned int)180); /* printf_va_1042 */
   testno ++;
-  printf_va_1043("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1043 */
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   wcscpy_s(& str1_14[20],(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a"
            "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" );
   rc = wcsncat_s(str1_14,(unsigned int)30,(wchar_t const *)(& str1_14[20]),
                  (unsigned int)128);
-  if (rc != 404) printf_va_1044("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)193,
-                                (unsigned int)rc);
-  if (str1_14[0] != '\000') printf_va_1045("%s %u  Expected null  \n",
-                                           (char *)"test_wcsncat_s",
-                                           (unsigned int)198);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)193,(unsigned int)rc); /* printf_va_1044 */
+  if (str1_14[0] != '\000') printf("%s %u  Expected null  \n",
+                                   (char *)"test_wcsncat_s",
+                                   (unsigned int)198); /* printf_va_1045 */
   testno ++;
-  printf_va_1046("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1046 */
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" );
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
@@ -33156,26 +32753,22 @@ int test_wcsncat_s(void)
   len2 = 10;
   rc = wcsncat_s(str1_14,(unsigned int)50,(wchar_t const *)(str2_14),
                  (unsigned int)len2);
-  if (rc != 0) printf_va_1047("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncat_s",(unsigned int)214,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                      (unsigned int)214,(unsigned int)rc); /* printf_va_1047 */
   tmp_0 = wcsnlen_s((wchar_t const *)(str1_14),(unsigned int)128);
   len3 = (int)tmp_0;
-  if (len3 != len1 + len2) printf_va_1048("%s %u lengths wrong: %u  %u  %u \n",
-                                          (char *)"test_wcsncat_s",
-                                          (unsigned int)220,
-                                          (unsigned int)len1,
-                                          (unsigned int)len2,
-                                          (unsigned int)len3);
+  if (len3 != len1 + len2) printf("%s %u lengths wrong: %u  %u  %u \n",
+                                  (char *)"test_wcsncat_s",(unsigned int)220,
+                                  (unsigned int)len1,(unsigned int)len2,
+                                  (unsigned int)len3); /* printf_va_1048 */
   rc = memcmp_s((void const *)(str1_14),(unsigned int)128,(void const *)L"a"
                 "a" "a" "a" "a" "a" "a" "a" "a" "a" "k" "e" "e" "p" " " "i"
                 "t" " " "s" "i" ,(unsigned int)(len3 + 1) * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1049("%s %u   Error -%ls- \n",
-                               (char *)"test_wcsncat_s",(unsigned int)226,
-                               str1_14);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcsncat_s",
+                       (unsigned int)226,str1_14); /* printf_va_1049 */
   testno ++;
-  printf_va_1050("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1050 */
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"a" "a" "a" "a" "a"
            "a" "a" "a" "a" "a" );
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
@@ -33186,196 +32779,174 @@ int test_wcsncat_s(void)
   len2 = (int)tmp_2;
   rc = wcsncat_s(str1_14,(unsigned int)50,(wchar_t const *)(str2_14),
                  (unsigned int)128);
-  if (rc != 0) printf_va_1051("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncat_s",(unsigned int)242,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                      (unsigned int)242,(unsigned int)rc); /* printf_va_1051 */
   tmp_3 = wcsnlen_s((wchar_t const *)(str1_14),(unsigned int)128);
   len3 = (int)tmp_3;
-  if (len3 != len1 + len2) printf_va_1052("%s %u lengths wrong: %u  %u  %u \n",
-                                          (char *)"test_wcsncat_s",
-                                          (unsigned int)248,
-                                          (unsigned int)len1,
-                                          (unsigned int)len2,
-                                          (unsigned int)len3);
+  if (len3 != len1 + len2) printf("%s %u lengths wrong: %u  %u  %u \n",
+                                  (char *)"test_wcsncat_s",(unsigned int)248,
+                                  (unsigned int)len1,(unsigned int)len2,
+                                  (unsigned int)len3); /* printf_va_1052 */
   rc = memcmp_s((void const *)(str1_14),(unsigned int)128,(void const *)L"a"
                 "a" "a" "a" "a" "a" "a" "a" "a" "a" "k" "e" "e" "p" " " "i"
                 "t" " " "s" "i" "m" "p" "l" "e" ,
                 (unsigned int)(len3 + 1) * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_1053("%s %u   Error -%ls- \n",
-                               (char *)"test_wcsncat_s",(unsigned int)254,
-                               str1_14);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcsncat_s",
+                       (unsigned int)254,str1_14); /* printf_va_1053 */
   testno ++;
-  printf_va_1054("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1054 */
   str1_14[0] = '\000';
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str1_14,(unsigned int)1,(wchar_t const *)(str2_14),
                  (unsigned int)128);
-  if (rc != 406) printf_va_1055("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)268,
-                                (unsigned int)rc);
-  if (str1_14[0] != '\000') printf_va_1056("%s %u  Expected null  \n",
-                                           (char *)"test_wcsncat_s",
-                                           (unsigned int)273);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)268,(unsigned int)rc); /* printf_va_1055 */
+  if (str1_14[0] != '\000') printf("%s %u  Expected null  \n",
+                                   (char *)"test_wcsncat_s",
+                                   (unsigned int)273); /* printf_va_1056 */
   testno ++;
-  printf_va_1057("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1057 */
   str1_14[0] = '\000';
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str1_14,(unsigned int)14,(wchar_t const *)(str2_14),
                  (unsigned int)128);
-  if (rc != 406) printf_va_1058("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)286,
-                                (unsigned int)rc);
-  if (str1_14[0] != '\000') printf_va_1059("%s %u  Expected null  \n",
-                                           (char *)"test_wcsncat_s",
-                                           (unsigned int)291);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)286,(unsigned int)rc); /* printf_va_1058 */
+  if (str1_14[0] != '\000') printf("%s %u  Expected null  \n",
+                                   (char *)"test_wcsncat_s",
+                                   (unsigned int)291); /* printf_va_1059 */
   testno ++;
-  printf_va_1060("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1060 */
   str1_14[0] = '\000';
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str1_14,(unsigned int)20,(wchar_t const *)(str2_14),
                  (unsigned int)128);
-  if (rc != 0) printf_va_1061("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncat_s",(unsigned int)304,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                      (unsigned int)304,(unsigned int)rc); /* printf_va_1061 */
   tmp_4 = wcsnlen_s((wchar_t const *)(str2_14),(unsigned int)128);
   rc = memcmp_s((void const *)(str1_14),(unsigned int)128,
                 (void const *)(str2_14),tmp_4 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1062("%s %u   Error -%ls- \n",
-                               (char *)"test_wcsncat_s",(unsigned int)310,
-                               str1_14);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcsncat_s",
+                       (unsigned int)310,str1_14); /* printf_va_1062 */
   testno ++;
-  printf_va_1063("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1063 */
   str1_14[0] = '\000';
   str2_14[0] = '\000';
   rc = wcsncat_s(str1_14,(unsigned int)128,(wchar_t const *)(str2_14),
                  (unsigned int)128);
-  if (rc != 0) printf_va_1064("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncat_s",(unsigned int)324,
-                              (unsigned int)rc);
-  if (str1_14[0] != '\000') printf_va_1065("%s %u  Expected null  \n",
-                                           (char *)"test_wcsncat_s",
-                                           (unsigned int)329);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                      (unsigned int)324,(unsigned int)rc); /* printf_va_1064 */
+  if (str1_14[0] != '\000') printf("%s %u  Expected null  \n",
+                                   (char *)"test_wcsncat_s",
+                                   (unsigned int)329); /* printf_va_1065 */
   testno ++;
-  printf_va_1066("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1066 */
   str1_14[0] = '\000';
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str2_14,(unsigned int)128,(wchar_t const *)(str1_14),
                  (unsigned int)128);
-  if (rc != 0) printf_va_1067("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncat_s",(unsigned int)342,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                      (unsigned int)342,(unsigned int)rc); /* printf_va_1067 */
   rc = memcmp_s((void const *)(str2_14),(unsigned int)128,(void const *)L"k"
                 "e" "e" "p" " " "i" "t" " " "s" "i" "m" "p" "l" "e" ,
                 (unsigned int)15 * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_1068("%s %u   Error -%ls- \n",
-                               (char *)"test_wcsncat_s",(unsigned int)348,
-                               str1_14);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcsncat_s",
+                       (unsigned int)348,str1_14); /* printf_va_1068 */
   testno ++;
-  printf_va_1069("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1069 */
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"q" "q" "w" "e" "q"
            "q" );
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str2_14,(unsigned int)128,(wchar_t const *)(str1_14),
                  (unsigned int)128);
-  if (rc != 0) printf_va_1070("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncat_s",(unsigned int)361,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                      (unsigned int)361,(unsigned int)rc); /* printf_va_1070 */
   rc = memcmp_s((void const *)(str2_14),(unsigned int)128,(void const *)L"q"
                 "q" "w" "e" "q" "q" "k" "e" "e" "p" " " "i" "t" " " "s" "i"
                 "m" "p" "l" "e" ,(unsigned int)20 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1071("%s %u   Error -%ls- \n",
-                               (char *)"test_wcsncat_s",(unsigned int)367,
-                               str1_14);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcsncat_s",
+                       (unsigned int)367,str1_14); /* printf_va_1071 */
   testno ++;
-  printf_va_1072("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1072 */
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" );
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str2_14,(unsigned int)12,(wchar_t const *)(str1_14),
                  (unsigned int)128);
-  if (rc != 407) printf_va_1073("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)380,
-                                (unsigned int)rc);
-  if (str2_14[0] != '\000') printf_va_1074("%s %u  Expected null  \n",
-                                           (char *)"test_wcsncat_s",
-                                           (unsigned int)385);
+  if (rc != 407) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)380,(unsigned int)rc); /* printf_va_1073 */
+  if (str2_14[0] != '\000') printf("%s %u  Expected null  \n",
+                                   (char *)"test_wcsncat_s",
+                                   (unsigned int)385); /* printf_va_1074 */
   testno ++;
-  printf_va_1075("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1075 */
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" );
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str2_14,(unsigned int)16,(wchar_t const *)(str1_14),
                  (unsigned int)128);
-  if (rc != 406) printf_va_1076("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)398,
-                                (unsigned int)rc);
-  if (str2_14[0] != '\000') printf_va_1077("%s %u  Expected null  \n",
-                                           (char *)"test_wcsncat_s",
-                                           (unsigned int)403);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)398,(unsigned int)rc); /* printf_va_1076 */
+  if (str2_14[0] != '\000') printf("%s %u  Expected null  \n",
+                                   (char *)"test_wcsncat_s",
+                                   (unsigned int)403); /* printf_va_1077 */
   testno ++;
-  printf_va_1078("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1078 */
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" "5"
            "6" "7" "8" "9" "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" );
   rc = wcsncat_s(& str1_14[7],(unsigned int)128,(wchar_t const *)(str1_14),
                  (unsigned int)128);
-  if (rc != 404) printf_va_1079("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)415,
-                                (unsigned int)rc);
-  if (str1_14[7] != '\000') printf_va_1080("%s %u  Expected null  \n",
-                                           (char *)"test_wcsncat_s",
-                                           (unsigned int)420);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)415,(unsigned int)rc); /* printf_va_1079 */
+  if (str1_14[7] != '\000') printf("%s %u  Expected null  \n",
+                                   (char *)"test_wcsncat_s",
+                                   (unsigned int)420); /* printf_va_1080 */
   testno ++;
-  printf_va_1081("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1081 */
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" );
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str2_14,(unsigned int)19,(wchar_t const *)(str1_14),
                  (unsigned int)128);
-  if (rc != 0) printf_va_1082("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncat_s",(unsigned int)433,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                      (unsigned int)433,(unsigned int)rc); /* printf_va_1082 */
   rc = memcmp_s((void const *)(str2_14),(unsigned int)128,(void const *)L"k"
                 "e" "e" "p" " " "i" "t" " " "s" "i" "m" "p" "l" "e" "1" "2"
                 "3" "4" ,(unsigned int)19 * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_1083("%s %u   Error -%ls- \n",
-                               (char *)"test_wcsncat_s",(unsigned int)439,
-                               str1_14);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcsncat_s",
+                       (unsigned int)439,str1_14); /* printf_va_1083 */
   testno ++;
-  printf_va_1084("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1084 */
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" "5"
            "6" "7" "8" "9" );
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"k" "e" "e" "p" " "
            "i" "t" " " "s" "i" "m" "p" "l" "e" );
   rc = wcsncat_s(str2_14,(unsigned int)128,(wchar_t const *)(str1_14),
                  (unsigned int)7);
-  if (rc != 0) printf_va_1085("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncat_s",(unsigned int)452,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                      (unsigned int)452,(unsigned int)rc); /* printf_va_1085 */
   rc = memcmp_s((void const *)(str2_14),(unsigned int)128,(void const *)L"1"
                 "2" "3" "4" "5" "6" "7" "8" "9" "k" "e" "e" "p" " " "i" "t" ,
                 (unsigned int)17 * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_1086("%s %u   Error -%ls- \n",
-                               (char *)"test_wcsncat_s",(unsigned int)458,
-                               str1_14);
+  if (ind != 0) printf("%s %u   Error -%ls- \n",(char *)"test_wcsncat_s",
+                       (unsigned int)458,str1_14); /* printf_va_1086 */
   testno ++;
-  printf_va_1087("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1087 */
   wcscpy_s(str2_14,(unsigned int)128,(wchar_t const *)L"1" "2" "3" "4" );
   wcscpy_s(str1_14,(unsigned int)128,(wchar_t const *)L"5" "6" "7" "8" "9" );
   rc = wcsncat_s(str2_14,(unsigned int)9,(wchar_t const *)(str1_14),
                  (unsigned int)128);
-  if (rc != 406) printf_va_1088("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncat_s",(unsigned int)471,
-                                (unsigned int)rc);
-  if (str2_14[0] != 0) printf_va_1089("%s %u  Expected null  \n",
-                                      (char *)"test_wcsncat_s",
-                                      (unsigned int)476);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncat_s",
+                        (unsigned int)471,(unsigned int)rc); /* printf_va_1088 */
+  if (str2_14[0] != 0) printf("%s %u  Expected null  \n",
+                              (char *)"test_wcsncat_s",(unsigned int)476); /* printf_va_1089 */
   __retres = 0;
   return __retres;
 }
@@ -34272,90 +33843,82 @@ int test_wcsncpy_s(void)
   rsize_t sz;
   rsize_t sz_orig;
   unsigned int testno = (unsigned int)0;
-  printf_va_1090("\nTesting wcsncpy_s:\n");
+  printf("\nTesting wcsncpy_s:\n"); /* printf_va_1090 */
   testno ++;
-  printf_va_1091("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1091 */
   rc = wcsncpy_s((wchar_t *)0,(unsigned int)(128 * 4),
                  (wchar_t const *)(str2_15),(unsigned int)(128 * 4));
-  if (rc != 400) printf_va_1092("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)104,
-                                (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)104,(unsigned int)rc); /* printf_va_1092 */
   testno ++;
-  printf_va_1093("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1093 */
   rc = wcsncpy_s(str1_15,(unsigned int)0,(wchar_t const *)(str2_15),
                  (unsigned int)(128 * 4));
-  if (rc != 401) printf_va_1094("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)114,
-                                (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)114,(unsigned int)rc); /* printf_va_1094 */
   testno ++;
-  printf_va_1095("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1095 */
   rc = wcsncpy_s(str1_15,(unsigned int)((4UL << 10) + (unsigned long)1),
                  (wchar_t const *)(str2_15),(unsigned int)(128 * 4));
-  if (rc != 403) printf_va_1096("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)124,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)124,(unsigned int)rc); /* printf_va_1096 */
   testno ++;
-  printf_va_1097("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1097 */
   wmemcpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" ,(unsigned int)5);
   rc = wcsncpy_s(str1_15,(unsigned int)5,(wchar_t const *)0,
                  (unsigned int)(128 * 4));
-  if (rc != 400) printf_va_1098("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)136,
-                                (unsigned int)rc);
-  if (str1_15[0] != 0) printf_va_1099("%s %u   Error rc=%u \n",
-                                      (char *)"test_wcsncpy_s",
-                                      (unsigned int)149,(unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)136,(unsigned int)rc); /* printf_va_1098 */
+  if (str1_15[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcsncpy_s",(unsigned int)149,
+                              (unsigned int)rc); /* printf_va_1099 */
   testno ++;
-  printf_va_1100("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1100 */
   rc = wcsncpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)(str2_15),
                  (unsigned int)0);
-  if (rc != 401) printf_va_1101("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)160,
-                                (unsigned int)rc);
-  if (str1_15[0] != 0) printf_va_1102("%s %u   Error rc=%u \n",
-                                      (char *)"test_wcsncpy_s",
-                                      (unsigned int)172,(unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)160,(unsigned int)rc); /* printf_va_1101 */
+  if (str1_15[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcsncpy_s",(unsigned int)172,
+                              (unsigned int)rc); /* printf_va_1102 */
   testno ++;
-  printf_va_1103("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1103 */
   rc = wcsncpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)(str2_15),
                  (unsigned int)((4UL << 10) + (unsigned long)1));
-  if (rc != 403) printf_va_1104("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)183,
-                                (unsigned int)rc);
-  if (str1_15[0] != 0) printf_va_1105("%s %u   Error rc=%u \n",
-                                      (char *)"test_wcsncpy_s",
-                                      (unsigned int)195,(unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)183,(unsigned int)rc); /* printf_va_1104 */
+  if (str1_15[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcsncpy_s",(unsigned int)195,
+                              (unsigned int)rc); /* printf_va_1105 */
   testno ++;
-  printf_va_1106("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1106 */
   wmemcpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" ,(unsigned int)42);
   rc = wcsncpy_s(str1_15,(unsigned int)5,(wchar_t const *)(str1_15),
                  (unsigned int)(128 * 4));
-  if (rc != 404) printf_va_1107("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)208,
-                                (unsigned int)rc);
-  if (str1_15[0] != 0) printf_va_1108("%s %u   Error rc=%u \n",
-                                      (char *)"test_wcsncpy_s",
-                                      (unsigned int)220,(unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)208,(unsigned int)rc); /* printf_va_1107 */
+  if (str1_15[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcsncpy_s",(unsigned int)220,
+                              (unsigned int)rc); /* printf_va_1108 */
   testno ++;
-  printf_va_1109("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1109 */
   wmemcpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" ,(unsigned int)42);
   rc = wcsncpy_s(str1_15,(unsigned int)(128 * 4),
                  (wchar_t const *)(& str1_15[5]),(unsigned int)30);
-  if (rc != 404) printf_va_1110("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)233,
-                                (unsigned int)rc);
-  if (str1_15[0] != 0) printf_va_1111("%s %u   Error rc=%u \n",
-                                      (char *)"test_wcsncpy_s",
-                                      (unsigned int)245,(unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)233,(unsigned int)rc); /* printf_va_1110 */
+  if (str1_15[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcsncpy_s",(unsigned int)245,
+                              (unsigned int)rc); /* printf_va_1111 */
   testno ++;
-  printf_va_1112("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1112 */
   wmemcpy_s(str2_15,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
@@ -34363,21 +33926,20 @@ int test_wcsncpy_s(void)
   wmemset_s(str1_15,0,(unsigned int)20);
   rc = wcsncpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)(str2_15),
                  (unsigned int)10);
-  if (rc != 0) printf_va_1113("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncpy_s",(unsigned int)260,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                      (unsigned int)260,(unsigned int)rc); /* printf_va_1113 */
   if (str1_15[9] == 0) 
-    if (str2_15[10] != 0) printf_va_1114("%s %u   Error rc=%u \n",
-                                         (char *)"test_wcsncpy_s",
-                                         (unsigned int)265,(unsigned int)rc);
+    if (str2_15[10] != 0) printf("%s %u   Error rc=%u \n",
+                                 (char *)"test_wcsncpy_s",(unsigned int)265,
+                                 (unsigned int)rc); /* printf_va_1114 */
   rc = memcmp_s((void const *)(str1_15),(unsigned int)(128 * 4),
                 (void const *)(str2_15),(unsigned int)10 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1115("%s %u   Error -%ls- <> -%ls-\n",
-                               (char *)"test_wcsncpy_s",(unsigned int)271,
-                               str1_15,str2_15);
+  if (ind != 0) printf("%s %u   Error -%ls- <> -%ls-\n",
+                       (char *)"test_wcsncpy_s",(unsigned int)271,str1_15,
+                       str2_15); /* printf_va_1115 */
   testno ++;
-  printf_va_1116("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1116 */
   wmemset_s(str1_15,0,(unsigned int)20);
   wmemcpy_s(str2_15,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
@@ -34386,20 +33948,19 @@ int test_wcsncpy_s(void)
   sz = wcsnlen_s((wchar_t const *)(str2_15),(unsigned int)(128 * 4));
   rc = wcsncpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)(str2_15),
                  (unsigned int)(128 * 4));
-  if (rc != 0) printf_va_1117("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncpy_s",(unsigned int)286,
-                              (unsigned int)rc);
-  if (str1_15[sz] != 0) printf_va_1118("%s %u   Error rc=%u \n",
-                                       (char *)"test_wcsncpy_s",
-                                       (unsigned int)291,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                      (unsigned int)286,(unsigned int)rc); /* printf_va_1117 */
+  if (str1_15[sz] != 0) printf("%s %u   Error rc=%u \n",
+                               (char *)"test_wcsncpy_s",(unsigned int)291,
+                               (unsigned int)rc); /* printf_va_1118 */
   rc = memcmp_s((void const *)(str1_15),(unsigned int)(128 * 4),
                 (void const *)(str2_15),(sz + (rsize_t)1) * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1119("%s %u   Error -%ls- <> -%ls-\n",
-                               (char *)"test_wcsncpy_s",(unsigned int)297,
-                               str1_15,str2_15);
+  if (ind != 0) printf("%s %u   Error -%ls- <> -%ls-\n",
+                       (char *)"test_wcsncpy_s",(unsigned int)297,str1_15,
+                       str2_15); /* printf_va_1119 */
   testno ++;
-  printf_va_1120("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1120 */
   wmemset_s(str1_15,0,(unsigned int)20);
   wmemcpy_s(str2_15,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
@@ -34408,28 +33969,26 @@ int test_wcsncpy_s(void)
   sz = wcsnlen_s((wchar_t const *)(str2_15),(unsigned int)(128 * 4));
   rc = wcsncpy_s(str1_15,sz - (rsize_t)5,(wchar_t const *)(str2_15),
                  (unsigned int)(128 * 4));
-  if (rc != 406) printf_va_1121("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)312,
-                                (unsigned int)rc);
-  if (str1_15[0] != 0) printf_va_1122("%s %u   Error rc=%u \n",
-                                      (char *)"test_wcsncpy_s",
-                                      (unsigned int)324,(unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)312,(unsigned int)rc); /* printf_va_1121 */
+  if (str1_15[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcsncpy_s",(unsigned int)324,
+                              (unsigned int)rc); /* printf_va_1122 */
   testno ++;
-  printf_va_1123("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1123 */
   wmemcpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" ,(unsigned int)42);
   rc = wcsncpy_s(& str1_15[5],(unsigned int)(128 * 4),
                  (wchar_t const *)(str1_15),(unsigned int)30);
-  if (rc != 404) printf_va_1124("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)337,
-                                (unsigned int)rc);
-  if (str1_15[5] != 0) printf_va_1125("%s %u   Error rc=%u \n",
-                                      (char *)"test_wcsncpy_s",
-                                      (unsigned int)349,(unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)337,(unsigned int)rc); /* printf_va_1124 */
+  if (str1_15[5] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcsncpy_s",(unsigned int)349,
+                              (unsigned int)rc); /* printf_va_1125 */
   testno ++;
-  printf_va_1126("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1126 */
   wmemcpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
@@ -34437,21 +33996,20 @@ int test_wcsncpy_s(void)
   wmemset_s(str2_15,0,(unsigned int)20);
   rc = wcsncpy_s(str2_15,(unsigned int)(128 * 4),(wchar_t const *)(str1_15),
                  (unsigned int)17);
-  if (rc != 0) printf_va_1127("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncpy_s",(unsigned int)364,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                      (unsigned int)364,(unsigned int)rc); /* printf_va_1127 */
   if (str2_15[16] == 0) 
-    if (str2_15[17] != 0) printf_va_1128("%s %u   Error rc=%u \n",
-                                         (char *)"test_wcsncpy_s",
-                                         (unsigned int)369,(unsigned int)rc);
+    if (str2_15[17] != 0) printf("%s %u   Error rc=%u \n",
+                                 (char *)"test_wcsncpy_s",(unsigned int)369,
+                                 (unsigned int)rc); /* printf_va_1128 */
   rc = memcmp_s((void const *)(str1_15),(unsigned int)(128 * 4),
                 (void const *)(str2_15),(unsigned int)17 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1129("%s %u   Error -%ls- <> -%ls-\n",
-                               (char *)"test_wcsncpy_s",(unsigned int)375,
-                               str1_15,str2_15);
+  if (ind != 0) printf("%s %u   Error -%ls- <> -%ls-\n",
+                       (char *)"test_wcsncpy_s",(unsigned int)375,str1_15,
+                       str2_15); /* printf_va_1129 */
   testno ++;
-  printf_va_1130("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1130 */
   wmemset_s(str2_15,0,(unsigned int)20);
   wmemcpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
@@ -34460,20 +34018,19 @@ int test_wcsncpy_s(void)
   sz = wcsnlen_s((wchar_t const *)(str1_15),(unsigned int)(128 * 4));
   rc = wcsncpy_s(str2_15,(unsigned int)(128 * 4),(wchar_t const *)(str1_15),
                  (unsigned int)(128 * 4));
-  if (rc != 0) printf_va_1131("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncpy_s",(unsigned int)390,
-                              (unsigned int)rc);
-  if (str1_15[sz] != 0) printf_va_1132("%s %u   Error rc=%u \n",
-                                       (char *)"test_wcsncpy_s",
-                                       (unsigned int)395,(unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                      (unsigned int)390,(unsigned int)rc); /* printf_va_1131 */
+  if (str1_15[sz] != 0) printf("%s %u   Error rc=%u \n",
+                               (char *)"test_wcsncpy_s",(unsigned int)395,
+                               (unsigned int)rc); /* printf_va_1132 */
   rc = memcmp_s((void const *)(str2_15),(unsigned int)(128 * 4),
                 (void const *)(str1_15),(sz + (rsize_t)1) * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1133("%s %u   Error -%ls- <> -%ls-\n",
-                               (char *)"test_wcsncpy_s",(unsigned int)401,
-                               str2_15,str1_15);
+  if (ind != 0) printf("%s %u   Error -%ls- <> -%ls-\n",
+                       (char *)"test_wcsncpy_s",(unsigned int)401,str2_15,
+                       str1_15); /* printf_va_1133 */
   testno ++;
-  printf_va_1134("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1134 */
   wmemset_s(str2_15,0,(unsigned int)20);
   wmemcpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" "-" "-" "k" "e" "e" "p"
@@ -34482,54 +34039,49 @@ int test_wcsncpy_s(void)
   sz = wcsnlen_s((wchar_t const *)(str1_15),(unsigned int)(128 * 4));
   rc = wcsncpy_s(str2_15,sz - (rsize_t)5,(wchar_t const *)(str1_15),
                  (unsigned int)(128 * 4));
-  if (rc != 406) printf_va_1135("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)416,
-                                (unsigned int)rc);
-  if (str2_15[0] != 0) printf_va_1136("%s %u   Error rc=%u \n",
-                                      (char *)"test_wcsncpy_s",
-                                      (unsigned int)428,(unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)416,(unsigned int)rc); /* printf_va_1135 */
+  if (str2_15[0] != 0) printf("%s %u   Error rc=%u \n",
+                              (char *)"test_wcsncpy_s",(unsigned int)428,
+                              (unsigned int)rc); /* printf_va_1136 */
   testno ++;
-  printf_va_1137("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1137 */
   wmemset_s(str1_15,120,(unsigned int)20);
   wmemcpy_s(str2_15,(unsigned int)(128 * 4),(wchar_t const *)L"k" "e" "e" "p"
             " " "i" "t" " " "s" "i" "m" "p" "l" "e" ,(unsigned int)15);
   sz_orig = wcsnlen_s((wchar_t const *)(str2_15),(unsigned int)(128 * 4));
   rc = wcsncpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)(str2_15),
                  (unsigned int)(128 * 4));
-  if (rc != 0) printf_va_1138("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncpy_s",(unsigned int)444,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                      (unsigned int)444,(unsigned int)rc); /* printf_va_1138 */
   sz = wcsnlen_s((wchar_t const *)(str1_15),(unsigned int)(128 * 4));
   if (sz != sz_orig) 
-    if (sz == (rsize_t)14) printf_va_1139("%s %u (sz=%lu <> 5) Error rc=%u \n",
-                                          (char *)"test_wcsncpy_s",
-                                          (unsigned int)450,
-                                          (unsigned long)sz,(unsigned int)rc);
+    if (sz == (rsize_t)14) printf("%s %u (sz=%lu <> 5) Error rc=%u \n",
+                                  (char *)"test_wcsncpy_s",(unsigned int)450,
+                                  (unsigned long)sz,(unsigned int)rc); /* printf_va_1139 */
   rc = memcmp_s((void const *)(str1_15),(unsigned int)(128 * 4),
                 (void const *)(str2_15),sz * sizeof(wchar_t),(int *)(& ind));
-  if (ind != 0) printf_va_1140("%s %u -%ls- <> -%ls-  (size=%lu) Error rc=%u \n",
-                               (char *)"test_wcsncpy_s",(unsigned int)455,
-                               str1_15,str2_15,(unsigned long)sz,
-                               (unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls- <> -%ls-  (size=%lu) Error rc=%u \n",
+                       (char *)"test_wcsncpy_s",(unsigned int)455,str1_15,
+                       str2_15,(unsigned long)sz,(unsigned int)rc); /* printf_va_1140 */
   testno ++;
-  printf_va_1141("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1141 */
   wmemcpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)L"i" "t" ,
             (unsigned int)3);
   wmemcpy_s(str2_15,(unsigned int)(128 * 4),(wchar_t const *)L"q" "q" "w" "e"
             "q" "e" "q" "e" "q" "e" "q" ,(unsigned int)12);
   rc = wcsncpy_s(str2_15,(unsigned int)3,(wchar_t const *)(str1_15),
                  (unsigned int)(128 * 4));
-  if (rc != 0) printf_va_1142("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsncpy_s",(unsigned int)471,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                      (unsigned int)471,(unsigned int)rc); /* printf_va_1142 */
   rc = memcmp_s((void const *)(str1_15),(unsigned int)(128 * 4),
                 (void const *)(str2_15),(unsigned int)3 * sizeof(wchar_t),
                 (int *)(& ind));
-  if (ind != 0) printf_va_1143("%s %u -%ls-  Error rc=%u \n",
-                               (char *)"test_wcsncpy_s",(unsigned int)477,
-                               str1_15,(unsigned int)rc);
+  if (ind != 0) printf("%s %u -%ls-  Error rc=%u \n",
+                       (char *)"test_wcsncpy_s",(unsigned int)477,str1_15,
+                       (unsigned int)rc); /* printf_va_1143 */
   testno ++;
-  printf_va_1144("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1144 */
   wmemcpy_s(str1_15,(unsigned int)(128 * 4),(wchar_t const *)L"i" "t" ,
             (unsigned int)3);
   wmemcpy_s(str2_15,(unsigned int)(128 * 4),(wchar_t const *)L"q" "q" "w" "e"
@@ -34537,13 +34089,11 @@ int test_wcsncpy_s(void)
   sz = wcsnlen_s((wchar_t const *)(str2_15),(unsigned int)(128 * 4));
   rc = wcsncpy_s(str2_15,(unsigned int)2,(wchar_t const *)(str1_15),
                  (unsigned int)(128 * 4));
-  if (rc != 406) printf_va_1145("%s %u   Error rc=%u \n",
-                                (char *)"test_wcsncpy_s",(unsigned int)494,
-                                (unsigned int)rc);
-  if (str2_15[0] != 0) printf_va_1146("%s %u -%ls-  Error rc=%u \n",
-                                      (char *)"test_wcsncpy_s",
-                                      (unsigned int)499,str1_15,
-                                      (unsigned int)rc);
+  if (rc != 406) printf("%s %u   Error rc=%u \n",(char *)"test_wcsncpy_s",
+                        (unsigned int)494,(unsigned int)rc); /* printf_va_1145 */
+  if (str2_15[0] != 0) printf("%s %u -%ls-  Error rc=%u \n",
+                              (char *)"test_wcsncpy_s",(unsigned int)499,
+                              str1_15,(unsigned int)rc); /* printf_va_1146 */
   __retres = 0;
   return __retres;
 }
@@ -34776,70 +34326,63 @@ int test_wcsnlen_s(void)
   rsize_t tmp_4;
   rsize_t tmp_5;
   unsigned int testno = (unsigned int)0;
-  printf_va_1147("\nTesting wcsnlen_s:\n");
+  printf("\nTesting wcsnlen_s:\n"); /* printf_va_1147 */
   testno ++;
-  printf_va_1148("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1148 */
   tmp = wcsnlen_s((wchar_t const *)0,(unsigned int)(128 * 4));
   rc = (int)tmp;
-  if (rc != 0) printf_va_1149("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsnlen_s",(unsigned int)78,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsnlen_s",
+                      (unsigned int)78,(unsigned int)rc); /* printf_va_1149 */
   testno ++;
-  printf_va_1150("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1150 */
   tmp_0 = wcsnlen_s((wchar_t const *)(str1_16),
                     (unsigned int)((4UL << 10) + (unsigned long)1));
   rc = (int)tmp_0;
-  if (rc != 0) printf_va_1151("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsnlen_s",(unsigned int)88,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsnlen_s",
+                      (unsigned int)88,(unsigned int)rc); /* printf_va_1151 */
   testno ++;
-  printf_va_1152("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1152 */
   wmemcpy_s(str1_16,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" ,(unsigned int)42);
   tmp_1 = wcsnlen_s((wchar_t const *)(str1_16),(unsigned int)41);
   rc = (int)tmp_1;
-  if (rc != 40) printf_va_1153("%s %u   Error rc=%u \n",
-                               (char *)"test_wcsnlen_s",(unsigned int)100,
-                               (unsigned int)rc);
+  if (rc != 40) printf("%s %u   Error rc=%u \n",(char *)"test_wcsnlen_s",
+                       (unsigned int)100,(unsigned int)rc); /* printf_va_1153 */
   testno ++;
-  printf_va_1154("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1154 */
   wmemcpy_s(str1_16,(unsigned int)(128 * 4),(wchar_t const *)L"a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a" "a"
             "a" "a" "a" "a" ,(unsigned int)42);
   tmp_2 = wcsnlen_s((wchar_t const *)(str1_16),(unsigned int)20);
   rc = (int)tmp_2;
-  if (rc != 20) printf_va_1155("%s %u   Error rc=%u \n",
-                               (char *)"test_wcsnlen_s",(unsigned int)112,
-                               (unsigned int)rc);
+  if (rc != 20) printf("%s %u   Error rc=%u \n",(char *)"test_wcsnlen_s",
+                       (unsigned int)112,(unsigned int)rc); /* printf_va_1155 */
   testno ++;
-  printf_va_1156("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1156 */
   wmemset_s(str1_16,0,(unsigned int)42);
   tmp_3 = wcsnlen_s((wchar_t const *)(str1_16),(unsigned int)(128 * 4));
   rc = (int)tmp_3;
-  if (rc != 0) printf_va_1157("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsnlen_s",(unsigned int)124,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wcsnlen_s",
+                      (unsigned int)124,(unsigned int)rc); /* printf_va_1157 */
   testno ++;
-  printf_va_1158("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1158 */
   memset_s((void *)(str1_16),(unsigned int)'\000',(unsigned char)50);
   str1_16[0] = 65;
   tmp_4 = wcsnlen_s((wchar_t const *)(str1_16),(unsigned int)(128 * 4));
   rc = (int)tmp_4;
-  if (rc != 1) printf_va_1159("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsnlen_s",(unsigned int)138,
-                              (unsigned int)rc);
+  if (rc != 1) printf("%s %u   Error rc=%u \n",(char *)"test_wcsnlen_s",
+                      (unsigned int)138,(unsigned int)rc); /* printf_va_1159 */
   testno ++;
-  printf_va_1160("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1160 */
   wmemcpy_s(str1_16,(unsigned int)(128 * 4),(wchar_t const *)L"1" "2" ,
             (unsigned int)3);
   tmp_5 = wcsnlen_s((wchar_t const *)(str1_16),(unsigned int)(128 * 4));
   rc = (int)tmp_5;
-  if (rc != 2) printf_va_1161("%s %u   Error rc=%u \n",
-                              (char *)"test_wcsnlen_s",(unsigned int)150,
-                              (unsigned int)rc);
+  if (rc != 2) printf("%s %u   Error rc=%u \n",(char *)"test_wcsnlen_s",
+                      (unsigned int)150,(unsigned int)rc); /* printf_va_1161 */
   __retres = 0;
   return __retres;
 }
@@ -35550,61 +35093,61 @@ int test_wmemcmp_s(void)
   wchar_t mem1_6[128];
   wchar_t mem2_4[128];
   unsigned int testno = (unsigned int)0;
-  printf_va_1162("\nTesting wmemcmp_s:\n");
+  printf("\nTesting wmemcmp_s:\n"); /* printf_va_1162 */
   testno ++;
-  printf_va_1163("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1163 */
   rc = wmemcmp_s((wchar_t const *)0,(unsigned int)128,
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)(& ind));
-  if (rc != 400) printf_va_1164("%s %u  Ind=%d  Error rc=%u \n",
-                                (char *)"test_wmemcmp_s",(unsigned int)93,
-                                ind,(unsigned int)rc);
+  if (rc != 400) printf("%s %u  Ind=%d  Error rc=%u \n",
+                        (char *)"test_wmemcmp_s",(unsigned int)93,ind,
+                        (unsigned int)rc); /* printf_va_1164 */
   testno ++;
-  printf_va_1165("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1165 */
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)0,(unsigned int)128,(int *)(& ind));
-  if (rc != 400) printf_va_1166("%s %u  Ind=%d  Error rc=%u \n",
-                                (char *)"test_wmemcmp_s",(unsigned int)103,
-                                ind,(unsigned int)rc);
+  if (rc != 400) printf("%s %u  Ind=%d  Error rc=%u \n",
+                        (char *)"test_wmemcmp_s",(unsigned int)103,ind,
+                        (unsigned int)rc); /* printf_va_1166 */
   testno ++;
-  printf_va_1167("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1167 */
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)0);
-  if (rc != 400) printf_va_1168("%s %u  Ind=%d  Error rc=%u \n",
-                                (char *)"test_wmemcmp_s",(unsigned int)113,
-                                ind,(unsigned int)rc);
+  if (rc != 400) printf("%s %u  Ind=%d  Error rc=%u \n",
+                        (char *)"test_wmemcmp_s",(unsigned int)113,ind,
+                        (unsigned int)rc); /* printf_va_1168 */
   testno ++;
-  printf_va_1169("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1169 */
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)0,
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)(& ind));
-  if (rc != 401) printf_va_1170("%s %u  Ind=%d  Error rc=%u \n",
-                                (char *)"test_wmemcmp_s",(unsigned int)123,
-                                ind,(unsigned int)rc);
+  if (rc != 401) printf("%s %u  Ind=%d  Error rc=%u \n",
+                        (char *)"test_wmemcmp_s",(unsigned int)123,ind,
+                        (unsigned int)rc); /* printf_va_1170 */
   testno ++;
-  printf_va_1171("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1171 */
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)(mem2_4),(unsigned int)0,(int *)(& ind));
-  if (rc != 401) printf_va_1172("%s %u  Ind=%d  Error rc=%u \n",
-                                (char *)"test_wmemcmp_s",(unsigned int)133,
-                                ind,(unsigned int)rc);
+  if (rc != 401) printf("%s %u  Ind=%d  Error rc=%u \n",
+                        (char *)"test_wmemcmp_s",(unsigned int)133,ind,
+                        (unsigned int)rc); /* printf_va_1172 */
   testno ++;
-  printf_va_1173("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1173 */
   rc = wmemcmp_s((wchar_t const *)(mem1_6),
                  (unsigned int)((256UL << 20) + (unsigned long)1),
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)(& ind));
-  if (rc != 403) printf_va_1174("%s %u  Ind=%d  Error rc=%u \n",
-                                (char *)"test_wmemcmp_s",(unsigned int)143,
-                                ind,(unsigned int)rc);
+  if (rc != 403) printf("%s %u  Ind=%d  Error rc=%u \n",
+                        (char *)"test_wmemcmp_s",(unsigned int)143,ind,
+                        (unsigned int)rc); /* printf_va_1174 */
   testno ++;
-  printf_va_1175("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1175 */
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)(mem2_4),
                  (unsigned int)((256UL << 20) + (unsigned long)1),
                  (int *)(& ind));
-  if (rc != 403) printf_va_1176("%s %u  Ind=%d  Error rc=%u \n",
-                                (char *)"test_wmemcmp_s",(unsigned int)153,
-                                ind,(unsigned int)rc);
+  if (rc != 403) printf("%s %u  Ind=%d  Error rc=%u \n",
+                        (char *)"test_wmemcmp_s",(unsigned int)153,ind,
+                        (unsigned int)rc); /* printf_va_1176 */
   testno ++;
-  printf_va_1177("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1177 */
   i = (unsigned int)0;
   while (i < (uint32_t)128) {
     mem1_6[i] = (int)i;
@@ -35618,19 +35161,17 @@ int test_wmemcmp_s(void)
   len = (unsigned int)1;
   rc = wmemcmp_s((wchar_t const *)(mem1_6),len,(wchar_t const *)(mem2_4),len,
                  (int *)(& ind));
-  if (rc != 0) printf_va_1178("%s %u  Ind=%d  Error rc=%u \n",
-                              (char *)"test_wmemcmp_s",(unsigned int)167,ind,
-                              (unsigned int)rc);
-  if (ind != 0) printf_va_1179("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)172,
-                               ind,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Ind=%d  Error rc=%u \n",
+                      (char *)"test_wmemcmp_s",(unsigned int)167,ind,
+                      (unsigned int)rc); /* printf_va_1178 */
+  if (ind != 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)172,ind,(unsigned int)rc); /* printf_va_1179 */
   ind = memcmp((void const *)(mem1_6),(void const *)(mem2_4),
                len * (uint32_t)4);
-  if (ind != 0) printf_va_1180("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)178,
-                               ind,(unsigned int)rc);
+  if (ind != 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)178,ind,(unsigned int)rc); /* printf_va_1180 */
   testno ++;
-  printf_va_1181("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1181 */
   i = (unsigned int)0;
   while (i < (uint32_t)128) {
     mem1_6[i] = (int)i;
@@ -35644,19 +35185,17 @@ int test_wmemcmp_s(void)
   len = (unsigned int)2;
   rc = wmemcmp_s((wchar_t const *)(mem1_6),len,(wchar_t const *)(mem2_4),len,
                  (int *)(& ind));
-  if (rc != 0) printf_va_1182("%s %u  Ind=%d  Error rc=%u \n",
-                              (char *)"test_wmemcmp_s",(unsigned int)192,ind,
-                              (unsigned int)rc);
-  if (ind != 0) printf_va_1183("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)197,
-                               ind,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Ind=%d  Error rc=%u \n",
+                      (char *)"test_wmemcmp_s",(unsigned int)192,ind,
+                      (unsigned int)rc); /* printf_va_1182 */
+  if (ind != 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)197,ind,(unsigned int)rc); /* printf_va_1183 */
   ind = memcmp((void const *)(mem1_6),(void const *)(mem2_4),
                len * (uint32_t)4);
-  if (ind != 0) printf_va_1184("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)203,
-                               ind,(unsigned int)rc);
+  if (ind != 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)203,ind,(unsigned int)rc); /* printf_va_1184 */
   testno ++;
-  printf_va_1185("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1185 */
   i = (unsigned int)0;
   while (i < (uint32_t)128) {
     mem1_6[i] = (int)i;
@@ -35669,19 +35208,17 @@ int test_wmemcmp_s(void)
   }
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)(& ind));
-  if (rc != 0) printf_va_1186("%s %u  Ind=%d  Error rc=%u \n",
-                              (char *)"test_wmemcmp_s",(unsigned int)216,ind,
-                              (unsigned int)rc);
-  if (ind != 0) printf_va_1187("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)221,
-                               ind,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Ind=%d  Error rc=%u \n",
+                      (char *)"test_wmemcmp_s",(unsigned int)216,ind,
+                      (unsigned int)rc); /* printf_va_1186 */
+  if (ind != 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)221,ind,(unsigned int)rc); /* printf_va_1187 */
   ind = memcmp((void const *)(mem1_6),(void const *)(mem2_4),
                (unsigned int)(128 * 4));
-  if (ind != 0) printf_va_1188("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)227,
-                               ind,(unsigned int)rc);
+  if (ind != 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)227,ind,(unsigned int)rc); /* printf_va_1188 */
   testno ++;
-  printf_va_1189("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1189 */
   i = (unsigned int)0;
   while (i < (uint32_t)128) {
     mem1_6[i] = (int)i;
@@ -35699,14 +35236,13 @@ int test_wmemcmp_s(void)
   }
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)(& ind));
-  if (rc != 0) printf_va_1190("%s %u  Ind=%d  Error rc=%u \n",
-                              (char *)"test_wmemcmp_s",(unsigned int)242,ind,
-                              (unsigned int)rc);
-  if (ind <= 0) printf_va_1191("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)247,
-                               ind,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Ind=%d  Error rc=%u \n",
+                      (char *)"test_wmemcmp_s",(unsigned int)242,ind,
+                      (unsigned int)rc); /* printf_va_1190 */
+  if (ind <= 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)247,ind,(unsigned int)rc); /* printf_va_1191 */
   testno ++;
-  printf_va_1192("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1192 */
   i = (unsigned int)0;
   while (i < (uint32_t)128) {
     mem1_6[i] = (int)i;
@@ -35724,14 +35260,13 @@ int test_wmemcmp_s(void)
   }
   rc = wmemcmp_s((wchar_t const *)(mem2_4),(unsigned int)128,
                  (wchar_t const *)(mem1_6),(unsigned int)128,(int *)(& ind));
-  if (rc != 0) printf_va_1193("%s %u  Ind=%d  Error rc=%u \n",
-                              (char *)"test_wmemcmp_s",(unsigned int)263,ind,
-                              (unsigned int)rc);
-  if (ind >= 0) printf_va_1194("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)268,
-                               ind,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Ind=%d  Error rc=%u \n",
+                      (char *)"test_wmemcmp_s",(unsigned int)263,ind,
+                      (unsigned int)rc); /* printf_va_1193 */
+  if (ind >= 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)268,ind,(unsigned int)rc); /* printf_va_1194 */
   testno ++;
-  printf_va_1195("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1195 */
   i = (unsigned int)0;
   while (i < (uint32_t)128) {
     mem1_6[i] = (int)i;
@@ -35745,14 +35280,13 @@ int test_wmemcmp_s(void)
   (mem2_4[1]) ++;
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)(& ind));
-  if (rc != 0) printf_va_1196("%s %u  Ind=%d  Error rc=%u \n",
-                              (char *)"test_wmemcmp_s",(unsigned int)283,ind,
-                              (unsigned int)rc);
-  if (ind >= 0) printf_va_1197("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)288,
-                               ind,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Ind=%d  Error rc=%u \n",
+                      (char *)"test_wmemcmp_s",(unsigned int)283,ind,
+                      (unsigned int)rc); /* printf_va_1196 */
+  if (ind >= 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)288,ind,(unsigned int)rc); /* printf_va_1197 */
   testno ++;
-  printf_va_1198("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1198 */
   i = (unsigned int)0;
   while (i < (uint32_t)128) {
     mem1_6[i] = (int)i;
@@ -35766,14 +35300,13 @@ int test_wmemcmp_s(void)
   (mem2_4[1]) --;
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)(& ind));
-  if (rc != 0) printf_va_1199("%s %u  Ind=%d  Error rc=%u \n",
-                              (char *)"test_wmemcmp_s",(unsigned int)303,ind,
-                              (unsigned int)rc);
-  if (ind <= 0) printf_va_1200("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)308,
-                               ind,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Ind=%d  Error rc=%u \n",
+                      (char *)"test_wmemcmp_s",(unsigned int)303,ind,
+                      (unsigned int)rc); /* printf_va_1199 */
+  if (ind <= 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)308,ind,(unsigned int)rc); /* printf_va_1200 */
   testno ++;
-  printf_va_1201("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1201 */
   i = (unsigned int)0;
   while (i < (uint32_t)128) {
     mem1_6[i] = (int)i;
@@ -35787,14 +35320,13 @@ int test_wmemcmp_s(void)
   (mem2_4[128 - 1]) ++;
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)(& ind));
-  if (rc != 0) printf_va_1202("%s %u  Ind=%d  Error rc=%u \n",
-                              (char *)"test_wmemcmp_s",(unsigned int)323,ind,
-                              (unsigned int)rc);
-  if (ind >= 0) printf_va_1203("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)328,
-                               ind,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Ind=%d  Error rc=%u \n",
+                      (char *)"test_wmemcmp_s",(unsigned int)323,ind,
+                      (unsigned int)rc); /* printf_va_1202 */
+  if (ind >= 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)328,ind,(unsigned int)rc); /* printf_va_1203 */
   testno ++;
-  printf_va_1204("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1204 */
   i = (unsigned int)0;
   while (i < (uint32_t)128) {
     mem1_6[i] = (int)i;
@@ -35808,12 +35340,11 @@ int test_wmemcmp_s(void)
   (mem2_4[128 - 1]) --;
   rc = wmemcmp_s((wchar_t const *)(mem1_6),(unsigned int)128,
                  (wchar_t const *)(mem2_4),(unsigned int)128,(int *)(& ind));
-  if (rc != 0) printf_va_1205("%s %u  Ind=%d  Error rc=%u \n",
-                              (char *)"test_wmemcmp_s",(unsigned int)343,ind,
-                              (unsigned int)rc);
-  if (ind <= 0) printf_va_1206("%s %u  Ind=%d  rc=%u \n",
-                               (char *)"test_wmemcmp_s",(unsigned int)348,
-                               ind,(unsigned int)rc);
+  if (rc != 0) printf("%s %u  Ind=%d  Error rc=%u \n",
+                      (char *)"test_wmemcmp_s",(unsigned int)343,ind,
+                      (unsigned int)rc); /* printf_va_1205 */
+  if (ind <= 0) printf("%s %u  Ind=%d  rc=%u \n",(char *)"test_wmemcmp_s",
+                       (unsigned int)348,ind,(unsigned int)rc); /* printf_va_1206 */
   __retres = 0;
   return __retres;
 }
@@ -36586,65 +36117,57 @@ int test_wmemcpy_s(void)
   uint32_t i;
   rsize_t len;
   unsigned int testno = (unsigned int)0;
-  printf_va_1207("\nTesting wmemcpy_s:\n");
+  printf("\nTesting wmemcpy_s:\n"); /* printf_va_1207 */
   testno ++;
-  printf_va_1208("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1208 */
   rc = wmemcpy_s((wchar_t *)0,(unsigned int)(256 * 4),
                  (wchar_t const *)(mem2_2),(unsigned int)(256 * 4));
-  if (rc != 400) printf_va_1209("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)85,
-                                (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)85,(unsigned int)rc); /* printf_va_1209 */
   testno ++;
-  printf_va_1210("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1210 */
   rc = wmemcpy_s(mem1_3,(unsigned int)0,(wchar_t const *)(mem2_2),
                  (unsigned int)(256 * 4));
-  if (rc != 401) printf_va_1211("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)96,
-                                (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)96,(unsigned int)rc); /* printf_va_1211 */
   testno ++;
-  printf_va_1212("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1212 */
   rc = wmemcpy_s(mem1_3,(unsigned int)((256UL << 20) + (unsigned long)1),
                  (wchar_t const *)(mem2_2),(unsigned int)(256 * 4));
-  if (rc != 403) printf_va_1213("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)106,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)106,(unsigned int)rc); /* printf_va_1213 */
   testno ++;
-  printf_va_1214("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1214 */
   rc = wmemcpy_s(mem1_3,(unsigned int)(256 * 4),(wchar_t const *)0,
                  (unsigned int)(256 * 4));
-  if (rc != 400) printf_va_1215("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)116,
-                                (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)116,(unsigned int)rc); /* printf_va_1215 */
   testno ++;
-  printf_va_1216("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1216 */
   rc = wmemcpy_s(mem1_3,(unsigned int)10,(wchar_t const *)(mem2_2),
                  (unsigned int)0);
-  if (rc != 401) printf_va_1217("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)126,
-                                (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)126,(unsigned int)rc); /* printf_va_1217 */
   testno ++;
-  printf_va_1218("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1218 */
   rc = wmemcpy_s(mem1_3,(unsigned int)(256 * 4),(wchar_t const *)(mem2_2),
                  (unsigned int)((256UL << 20) + (unsigned long)1));
-  if (rc != 403) printf_va_1219("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)136,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)136,(unsigned int)rc); /* printf_va_1219 */
   testno ++;
-  printf_va_1220("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1220 */
   rc = wmemcpy_s(mem1_3,(unsigned int)(256 * 4),
                  (wchar_t const *)(& mem1_3[20]),(unsigned int)21);
-  if (rc != 404) printf_va_1221("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)146,
-                                (unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)146,(unsigned int)rc); /* printf_va_1221 */
   testno ++;
-  printf_va_1222("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1222 */
   rc = wmemcpy_s(& mem1_3[25],(unsigned int)(256 * 4),
                  (wchar_t const *)(mem1_3),(unsigned int)26);
-  if (rc != 404) printf_va_1223("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)156,
-                                (unsigned int)rc);
+  if (rc != 404) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)156,(unsigned int)rc); /* printf_va_1223 */
   testno ++;
-  printf_va_1224("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1224 */
   i = (unsigned int)0;
   while (i < (uint32_t)10) {
     mem1_3[i] = 33;
@@ -36658,22 +36181,21 @@ int test_wmemcpy_s(void)
   }
   rc = wmemcpy_s(mem1_3,(unsigned int)10,(wchar_t const *)(& mem1_3[10]),
                  (unsigned int)10);
-  if (rc != 0) printf_va_1225("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemcpy_s",(unsigned int)171,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                      (unsigned int)171,(unsigned int)rc); /* printf_va_1225 */
   else {
     if (mem1_3[0] != 40) 
-      if (mem1_3[10] != 40) printf_va_1226("%d - %d m1[0]=%d  m1[10]=%d should be 40  \n",
-                                           176,(int)i,mem1_3[0],mem1_3[10]);
+      if (mem1_3[10] != 40) printf("%d - %d m1[0]=%d  m1[10]=%d should be 40  \n",
+                                   176,(int)i,mem1_3[0],mem1_3[10]); /* printf_va_1226 */
     i = (unsigned int)1;
     while (i < (uint32_t)10) {
-      if (mem1_3[i] != 44) printf_va_1227("%d - %d m1=%d  should be 44  \n",
-                                          181,(int)i,mem1_3[i]);
+      if (mem1_3[i] != 44) printf("%d - %d m1=%d  should be 44  \n",181,
+                                  (int)i,mem1_3[i]); /* printf_va_1227 */
       i += (uint32_t)1;
     }
   }
   testno ++;
-  printf_va_1228("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1228 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4 + 1)) {
     mem1_3[i] = 33;
@@ -36686,22 +36208,20 @@ int test_wmemcpy_s(void)
   }
   len = (unsigned int)(256 * 4);
   rc = wmemcpy_s(mem1_3,len,(wchar_t const *)(mem2_2),len + (rsize_t)1);
-  if (rc == 0) printf_va_1229("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemcpy_s",(unsigned int)197,
-                              (unsigned int)rc);
+  if (rc == 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                      (unsigned int)197,(unsigned int)rc); /* printf_va_1229 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_3[i] != 0) printf_va_1230("%d - %d m1=%d  m2=%d  \n",204,
-                                         (int)i,mem1_3[i],mem2_2[i]);
+      if (mem1_3[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",204,(int)i,
+                                 mem1_3[i],mem2_2[i]); /* printf_va_1230 */
       i += (uint32_t)1;
     }
-    if (mem1_3[i] != 33) printf_va_1231("%d - %lu m1=%d  m2=%d  \n",210,
-                                        (unsigned long)len,mem1_3[len],
-                                        mem2_2[len]);
+    if (mem1_3[i] != 33) printf("%d - %lu m1=%d  m2=%d  \n",210,
+                                (unsigned long)len,mem1_3[len],mem2_2[len]); /* printf_va_1231 */
   }
   testno ++;
-  printf_va_1232("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1232 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4 + 2)) {
     mem1_3[i] = 33;
@@ -36715,22 +36235,20 @@ int test_wmemcpy_s(void)
   len = (unsigned int)((256 * 4) / 2);
   rc = wmemcpy_s(mem1_3,len,(wchar_t const *)(mem2_2),
                  (unsigned int)(256 * 4));
-  if (rc != 403) printf_va_1233("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)226,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)226,(unsigned int)rc); /* printf_va_1233 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_3[i] != 0) printf_va_1234("%d - %d m1=%d  m2=%d  \n",233,
-                                         (int)i,mem1_3[i],mem2_2[i]);
+      if (mem1_3[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",233,(int)i,
+                                 mem1_3[i],mem2_2[i]); /* printf_va_1234 */
       i += (uint32_t)1;
     }
-    if (mem1_3[len] != 33) printf_va_1235("%d - %lu m1=%d  m2=%d  \n",239,
-                                          (unsigned long)len,mem1_3[len],
-                                          mem2_2[len]);
+    if (mem1_3[len] != 33) printf("%d - %lu m1=%d  m2=%d  \n",239,
+                                  (unsigned long)len,mem1_3[len],mem2_2[len]); /* printf_va_1235 */
   }
   testno ++;
-  printf_va_1236("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1236 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4 + 2)) {
     mem1_3[i] = 33;
@@ -36743,22 +36261,20 @@ int test_wmemcpy_s(void)
   }
   len = (unsigned int)(256 * 4);
   rc = wmemcpy_s(mem1_3,len,(wchar_t const *)(mem2_2),(unsigned int)0);
-  if (rc != 401) printf_va_1237("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)254,
-                                (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)254,(unsigned int)rc); /* printf_va_1237 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_3[i] != 0) printf_va_1238("%d - %d m1=%d  m2=%d  \n",262,
-                                         (int)i,mem1_3[i],mem2_2[i]);
+      if (mem1_3[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",262,(int)i,
+                                 mem1_3[i],mem2_2[i]); /* printf_va_1238 */
       i += (uint32_t)1;
     }
-    if (mem1_3[len] != 33) printf_va_1239("%d - %lu m1=%d  m2=%d  \n",268,
-                                          (unsigned long)len,mem1_3[len],
-                                          mem2_2[len]);
+    if (mem1_3[len] != 33) printf("%d - %lu m1=%d  m2=%d  \n",268,
+                                  (unsigned long)len,mem1_3[len],mem2_2[len]); /* printf_va_1239 */
   }
   testno ++;
-  printf_va_1240("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1240 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_3[i] = 33;
@@ -36772,21 +36288,20 @@ int test_wmemcpy_s(void)
   len = (unsigned int)(256 * 4);
   rc = wmemcpy_s(mem1_3,len,(wchar_t const *)(mem2_2),
                  (unsigned int)((256UL << 20) + (unsigned long)1));
-  if (rc != 403) printf_va_1241("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)284,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)284,(unsigned int)rc); /* printf_va_1241 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_3[i] != 0) printf_va_1242("%d - %d m1=%d  m2=%d  \n",291,
-                                         (int)i,mem1_3[i],mem2_2[i]);
+      if (mem1_3[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",291,(int)i,
+                                 mem1_3[i],mem2_2[i]); /* printf_va_1242 */
       i += (uint32_t)1;
     }
-    if (mem1_3[len] == 0) printf_va_1243("%d - %d m1=%d  m2=%d  \n",297,
-                                         (int)i,mem1_3[i],mem2_2[i]);
+    if (mem1_3[len] == 0) printf("%d - %d m1=%d  m2=%d  \n",297,(int)i,
+                                 mem1_3[i],mem2_2[i]); /* printf_va_1243 */
   }
   testno ++;
-  printf_va_1244("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1244 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_3[i] = 55;
@@ -36794,11 +36309,10 @@ int test_wmemcpy_s(void)
   }
   rc = wmemcpy_s(mem1_3,(unsigned int)(256 * 4),(wchar_t const *)(mem1_3),
                  (unsigned int)(256 * 4));
-  if (rc != 0) printf_va_1245("%s %u  Error rc=%u \n",
-                              (char *)"test_wmemcpy_s",(unsigned int)312,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_wmemcpy_s",
+                      (unsigned int)312,(unsigned int)rc); /* printf_va_1245 */
   testno ++;
-  printf_va_1246("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1246 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_3[i] = 55;
@@ -36811,21 +36325,20 @@ int test_wmemcpy_s(void)
   }
   len = (unsigned int)100;
   rc = wmemcpy_s(mem1_3,len,(wchar_t const *)(& mem1_3[10]),len);
-  if (rc != 404) printf_va_1247("%s %u  Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)327,
-                                (unsigned int)rc);
+  if (rc != 404) printf("%s %u  Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)327,(unsigned int)rc); /* printf_va_1247 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_3[i] != 0) printf_va_1248("%d - %d m1=%d  m2=%d  \n",333,
-                                         (int)i,mem1_3[i],mem2_2[i]);
+      if (mem1_3[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",333,(int)i,
+                                 mem1_3[i],mem2_2[i]); /* printf_va_1248 */
       i += (uint32_t)1;
     }
-    if (mem1_3[len] == 0) printf_va_1249("%d - %d m1=%d  m2=%d  \n",339,
-                                         (int)i,mem1_3[i],mem2_2[i]);
+    if (mem1_3[len] == 0) printf("%d - %d m1=%d  m2=%d  \n",339,(int)i,
+                                 mem1_3[i],mem2_2[i]); /* printf_va_1249 */
   }
   testno ++;
-  printf_va_1250("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1250 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_3[i] = 55;
@@ -36838,19 +36351,18 @@ int test_wmemcpy_s(void)
   }
   len = (unsigned int)100;
   rc = wmemcpy_s(& mem1_3[10],len,(wchar_t const *)(mem1_3),len);
-  if (rc != 404) printf_va_1251("%s %u  Error rc=%u \n",
-                                (char *)"test_wmemcpy_s",(unsigned int)356,
-                                (unsigned int)rc);
+  if (rc != 404) printf("%s %u  Error rc=%u \n",(char *)"test_wmemcpy_s",
+                        (unsigned int)356,(unsigned int)rc); /* printf_va_1251 */
   else {
     i = (unsigned int)10;
     while (i < len + (rsize_t)10) {
-      if (mem1_3[i] != 0) printf_va_1252("%d - %d m1=%d  m2=%d  \n",362,
-                                         (int)i,mem1_3[i],mem2_2[i]);
+      if (mem1_3[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",362,(int)i,
+                                 mem1_3[i],mem2_2[i]); /* printf_va_1252 */
       i += (uint32_t)1;
     }
   }
   testno ++;
-  printf_va_1253("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1253 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_3[i] = 35;
@@ -36863,19 +36375,17 @@ int test_wmemcpy_s(void)
   }
   len = (unsigned int)5;
   rc = wmemcpy_s(mem1_3,len,(wchar_t const *)(mem2_2),len);
-  if (rc != 0) printf_va_1254("%s %u  Error rc=%u \n",
-                              (char *)"test_wmemcpy_s",(unsigned int)379,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_wmemcpy_s",
+                      (unsigned int)379,(unsigned int)rc); /* printf_va_1254 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_3[i] != 55) printf_va_1255("%d - %d m1=%d\n",385,(int)i,
-                                          mem1_3[i]);
+      if (mem1_3[i] != 55) printf("%d - %d m1=%d\n",385,(int)i,mem1_3[i]); /* printf_va_1255 */
       i += (uint32_t)1;
     }
   }
   testno ++;
-  printf_va_1256("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1256 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_3[i] = 35;
@@ -36888,14 +36398,13 @@ int test_wmemcpy_s(void)
   }
   rc = wmemcpy_s(mem1_3,(unsigned int)(256 * 4),(wchar_t const *)(mem2_2),
                  (unsigned int)((256 * 4) / 2));
-  if (rc != 0) printf_va_1257("%s %u  Error rc=%u \n",
-                              (char *)"test_wmemcpy_s",(unsigned int)401,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_wmemcpy_s",
+                      (unsigned int)401,(unsigned int)rc); /* printf_va_1257 */
   else {
     i = (unsigned int)0;
     while (i < (uint32_t)((256 * 4) / 2)) {
-      if (mem1_3[i] != 55) printf_va_1258("%d - %d m1=%d  m2=%d  \n",407,
-                                          (int)i,mem1_3[i],mem2_2[i]);
+      if (mem1_3[i] != 55) printf("%d - %d m1=%d  m2=%d  \n",407,(int)i,
+                                  mem1_3[i],mem2_2[i]); /* printf_va_1258 */
       i += (uint32_t)1;
     }
   }
@@ -37745,65 +37254,57 @@ int test_wmemmove_s(void)
   uint32_t i;
   rsize_t len;
   unsigned int testno = (unsigned int)0;
-  printf_va_1259("\nTesting wmemmove_s:\n");
+  printf("\nTesting wmemmove_s:\n"); /* printf_va_1259 */
   testno ++;
-  printf_va_1260("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1260 */
   rc = wmemmove_s((wchar_t *)0,(unsigned int)(256 * 4),
                   (wchar_t const *)(mem2_3),(unsigned int)(256 * 4));
-  if (rc != 400) printf_va_1261("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemmove_s",(unsigned int)94,
-                                (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                        (unsigned int)94,(unsigned int)rc); /* printf_va_1261 */
   testno ++;
-  printf_va_1262("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1262 */
   rc = wmemmove_s(mem1_4,(unsigned int)0,(wchar_t const *)(mem2_3),
                   (unsigned int)(256 * 4));
-  if (rc != 401) printf_va_1263("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemmove_s",(unsigned int)105,
-                                (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                        (unsigned int)105,(unsigned int)rc); /* printf_va_1263 */
   testno ++;
-  printf_va_1264("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1264 */
   rc = wmemmove_s(mem1_4,(unsigned int)((256UL << 20) + (unsigned long)1),
                   (wchar_t const *)(mem2_3),(unsigned int)(256 * 4));
-  if (rc != 403) printf_va_1265("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemmove_s",(unsigned int)115,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                        (unsigned int)115,(unsigned int)rc); /* printf_va_1265 */
   testno ++;
-  printf_va_1266("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1266 */
   rc = wmemmove_s(mem1_4,(unsigned int)(256 * 4),(wchar_t const *)0,
                   (unsigned int)(256 * 4));
-  if (rc != 400) printf_va_1267("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemmove_s",(unsigned int)125,
-                                (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                        (unsigned int)125,(unsigned int)rc); /* printf_va_1267 */
   testno ++;
-  printf_va_1268("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1268 */
   rc = wmemmove_s(mem1_4,(unsigned int)10,(wchar_t const *)(mem2_3),
                   (unsigned int)0);
-  if (rc != 401) printf_va_1269("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemmove_s",(unsigned int)135,
-                                (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                        (unsigned int)135,(unsigned int)rc); /* printf_va_1269 */
   testno ++;
-  printf_va_1270("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1270 */
   rc = wmemmove_s(mem1_4,(unsigned int)(256 * 4),(wchar_t const *)(mem2_3),
                   (unsigned int)((256UL << 20) + (unsigned long)1));
-  if (rc != 403) printf_va_1271("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemmove_s",(unsigned int)145,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                        (unsigned int)145,(unsigned int)rc); /* printf_va_1271 */
   testno ++;
-  printf_va_1272("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1272 */
   rc = wmemmove_s(mem1_4,(unsigned int)(256 * 4),
                   (wchar_t const *)(& mem1_4[20]),(unsigned int)21);
-  if (rc != 0) printf_va_1273("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)155,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)155,(unsigned int)rc); /* printf_va_1273 */
   testno ++;
-  printf_va_1274("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1274 */
   rc = wmemmove_s(& mem1_4[25],(unsigned int)(256 * 4),
                   (wchar_t const *)(mem1_4),(unsigned int)26);
-  if (rc != 0) printf_va_1275("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)165,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)165,(unsigned int)rc); /* printf_va_1275 */
   testno ++;
-  printf_va_1276("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1276 */
   i = (unsigned int)0;
   while (i < (uint32_t)10) {
     mem1_4[i] = 33;
@@ -37817,22 +37318,21 @@ int test_wmemmove_s(void)
   }
   rc = wmemmove_s(mem1_4,(unsigned int)10,(wchar_t const *)(& mem1_4[10]),
                   (unsigned int)10);
-  if (rc != 0) printf_va_1277("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)180,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)180,(unsigned int)rc); /* printf_va_1277 */
   else {
     if (mem1_4[0] != 40) 
-      if (mem1_4[10] != 40) printf_va_1278("%d - %d m1[0]=%d  m1[10]=%d should be 40  \n",
-                                           185,(int)i,mem1_4[0],mem1_4[10]);
+      if (mem1_4[10] != 40) printf("%d - %d m1[0]=%d  m1[10]=%d should be 40  \n",
+                                   185,(int)i,mem1_4[0],mem1_4[10]); /* printf_va_1278 */
     i = (unsigned int)1;
     while (i < (uint32_t)10) {
-      if (mem1_4[i] != 44) printf_va_1279("%d - %d m1=%d  should be 44  \n",
-                                          190,(int)i,mem1_4[i]);
+      if (mem1_4[i] != 44) printf("%d - %d m1=%d  should be 44  \n",190,
+                                  (int)i,mem1_4[i]); /* printf_va_1279 */
       i += (uint32_t)1;
     }
   }
   testno ++;
-  printf_va_1280("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1280 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4 + 1)) {
     mem1_4[i] = 33;
@@ -37845,22 +37345,20 @@ int test_wmemmove_s(void)
   }
   len = (unsigned int)(256 * 4);
   rc = wmemmove_s(mem1_4,len,(wchar_t const *)(mem2_3),len + (rsize_t)1);
-  if (rc == 0) printf_va_1281("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)206,
-                              (unsigned int)rc);
+  if (rc == 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)206,(unsigned int)rc); /* printf_va_1281 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_4[i] != 0) printf_va_1282("%d - %d m1=%d  m2=%d  \n",213,
-                                         (int)i,mem1_4[i],mem2_3[i]);
+      if (mem1_4[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",213,(int)i,
+                                 mem1_4[i],mem2_3[i]); /* printf_va_1282 */
       i += (uint32_t)1;
     }
-    if (mem1_4[i] != 33) printf_va_1283("%d - %lu m1=%d  m2=%d  \n",219,
-                                        (unsigned long)len,mem1_4[len],
-                                        mem2_3[len]);
+    if (mem1_4[i] != 33) printf("%d - %lu m1=%d  m2=%d  \n",219,
+                                (unsigned long)len,mem1_4[len],mem2_3[len]); /* printf_va_1283 */
   }
   testno ++;
-  printf_va_1284("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1284 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4 + 2)) {
     mem1_4[i] = 33;
@@ -37874,22 +37372,20 @@ int test_wmemmove_s(void)
   len = (unsigned int)((256 * 4) / 2);
   rc = wmemmove_s(mem1_4,len,(wchar_t const *)(mem2_3),
                   (unsigned int)(256 * 4));
-  if (rc != 403) printf_va_1285("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemmove_s",(unsigned int)235,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                        (unsigned int)235,(unsigned int)rc); /* printf_va_1285 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_4[i] != 0) printf_va_1286("%d - %d m1=%d  m2=%d  \n",242,
-                                         (int)i,mem1_4[i],mem2_3[i]);
+      if (mem1_4[i] != 0) printf("%d - %d m1=%d  m2=%d  \n",242,(int)i,
+                                 mem1_4[i],mem2_3[i]); /* printf_va_1286 */
       i += (uint32_t)1;
     }
-    if (mem1_4[len] != 33) printf_va_1287("%d - %lu m1=%d  m2=%d  \n",248,
-                                          (unsigned long)len,mem1_4[len],
-                                          mem2_3[len]);
+    if (mem1_4[len] != 33) printf("%d - %lu m1=%d  m2=%d  \n",248,
+                                  (unsigned long)len,mem1_4[len],mem2_3[len]); /* printf_va_1287 */
   }
   testno ++;
-  printf_va_1288("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1288 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4 + 2)) {
     mem1_4[i] = 33;
@@ -37902,26 +37398,23 @@ int test_wmemmove_s(void)
   }
   len = (unsigned int)(256 * 4);
   rc = wmemmove_s(mem1_4,len,(wchar_t const *)(mem2_3),len);
-  if (rc != 0) printf_va_1289("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)263,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)263,(unsigned int)rc); /* printf_va_1289 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_4[i] != mem2_3[i]) printf_va_1290("%d - %d m1=%d <> m2=%d  \n",
-                                                 271,(int)i,mem1_4[i],
-                                                 mem2_3[i]);
+      if (mem1_4[i] != mem2_3[i]) printf("%d - %d m1=%d <> m2=%d  \n",271,
+                                         (int)i,mem1_4[i],mem2_3[i]); /* printf_va_1290 */
       i += (uint32_t)1;
     }
     if (mem1_4[len] != 33) 
-      if (mem1_4[len + (rsize_t)1] != 33) printf_va_1291("%d - %lu m1[len]=%d  m1[len+1]=%d  \n",
-                                                         277,
-                                                         (unsigned long)len,
-                                                         mem1_4[len],
-                                                         mem1_4[len + (rsize_t)1]);
+      if (mem1_4[len + (rsize_t)1] != 33) printf("%d - %lu m1[len]=%d  m1[len+1]=%d  \n",
+                                                 277,(unsigned long)len,
+                                                 mem1_4[len],
+                                                 mem1_4[len + (rsize_t)1]); /* printf_va_1291 */
   }
   testno ++;
-  printf_va_1292("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1292 */
   i = (unsigned int)0;
   while (i < (uint32_t)10) {
     mem1_4[i] = 33;
@@ -37934,19 +37427,18 @@ int test_wmemmove_s(void)
   }
   len = (unsigned int)(256 * 4 - 10);
   rc = wmemmove_s(mem1_4,len,(wchar_t const *)(& mem1_4[10]),len);
-  if (rc != 0) printf_va_1293("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)293,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)293,(unsigned int)rc); /* printf_va_1293 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_4[i] != 44) printf_va_1294("%d - %d m1=%d  m2=%d  \n",300,
-                                          (int)i,mem1_4[i],mem2_3[i]);
+      if (mem1_4[i] != 44) printf("%d - %d m1=%d  m2=%d  \n",300,(int)i,
+                                  mem1_4[i],mem2_3[i]); /* printf_va_1294 */
       i += (uint32_t)1;
     }
   }
   testno ++;
-  printf_va_1295("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1295 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4 + 2)) {
     mem1_4[i] = (int)i;
@@ -37954,34 +37446,31 @@ int test_wmemmove_s(void)
   }
   len = (unsigned int)(256 * 4 - 10);
   rc = wmemmove_s(& mem1_4[10],len,(wchar_t const *)(mem1_4),len);
-  if (rc != 0) printf_va_1296("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)317,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)317,(unsigned int)rc); /* printf_va_1296 */
   else {
     i = (unsigned int)0;
     while (i < (uint32_t)10) {
-      if ((uint32_t)mem1_4[i] != i) printf_va_1297("%d - %d m1=%d  m2=%d  \n",
-                                                   324,(int)i,mem1_4[i],
-                                                   mem2_3[i]);
+      if ((uint32_t)mem1_4[i] != i) printf("%d - %d m1=%d  m2=%d  \n",324,
+                                           (int)i,mem1_4[i],mem2_3[i]); /* printf_va_1297 */
       i += (uint32_t)1;
     }
     i = (unsigned int)10;
     while (i < (uint32_t)(256 * 4)) {
-      if ((uint32_t)mem1_4[i] != i - (uint32_t)10) printf_va_1298("%d - %d m1=%d  should=%d  \n",
-                                                                  330,(int)i,
-                                                                  mem1_4[i],
-                                                                  (int)(
-                                                                  i - (uint32_t)10));
+      if ((uint32_t)mem1_4[i] != i - (uint32_t)10) printf("%d - %d m1=%d  should=%d  \n",
+                                                          330,(int)i,
+                                                          mem1_4[i],
+                                                          (int)(i - (uint32_t)10)); /* printf_va_1298 */
       i += (uint32_t)1;
     }
     if (mem1_4[256 * 4] != 256 * 4) 
-      if (mem1_4[256 * 4 + 1] != 256 * 4 + 1) printf_va_1299("%d - %d m1[LEN]=%d  mem1[LEN+1]=%d should be 1024 & 1025  \n",
-                                                             336,(int)i,
-                                                             mem1_4[256 * 4],
-                                                             mem1_4[256 * 4 + 1]);
+      if (mem1_4[256 * 4 + 1] != 256 * 4 + 1) printf("%d - %d m1[LEN]=%d  mem1[LEN+1]=%d should be 1024 & 1025  \n",
+                                                     336,(int)i,
+                                                     mem1_4[256 * 4],
+                                                     mem1_4[256 * 4 + 1]); /* printf_va_1299 */
   }
   testno ++;
-  printf_va_1300("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1300 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_4[i] = 55;
@@ -37989,11 +37478,10 @@ int test_wmemmove_s(void)
   }
   rc = wmemmove_s(mem1_4,(unsigned int)(256 * 4),(wchar_t const *)(mem1_4),
                   (unsigned int)(256 * 4));
-  if (rc != 0) printf_va_1301("%s %u  Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)351,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)351,(unsigned int)rc); /* printf_va_1301 */
   testno ++;
-  printf_va_1302("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1302 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_4[i] = 35;
@@ -38006,19 +37494,17 @@ int test_wmemmove_s(void)
   }
   len = (unsigned int)5;
   rc = wmemmove_s(mem1_4,len,(wchar_t const *)(mem2_3),len);
-  if (rc != 0) printf_va_1303("%s %u  Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)366,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)366,(unsigned int)rc); /* printf_va_1303 */
   else {
     i = (unsigned int)0;
     while (i < len) {
-      if (mem1_4[i] != 55) printf_va_1304("%d - %d m1=%d\n",372,(int)i,
-                                          mem1_4[i]);
+      if (mem1_4[i] != 55) printf("%d - %d m1=%d\n",372,(int)i,mem1_4[i]); /* printf_va_1304 */
       i += (uint32_t)1;
     }
   }
   testno ++;
-  printf_va_1305("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1305 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_4[i] = 35;
@@ -38031,19 +37517,18 @@ int test_wmemmove_s(void)
   }
   rc = wmemmove_s(mem1_4,(unsigned int)(256 * 4),(wchar_t const *)(mem2_3),
                   (unsigned int)((256 * 4) / 2));
-  if (rc != 0) printf_va_1306("%s %u  Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)388,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)388,(unsigned int)rc); /* printf_va_1306 */
   else {
     i = (unsigned int)0;
     while (i < (uint32_t)((256 * 4) / 2)) {
-      if (mem1_4[i] != 55) printf_va_1307("%d - %d m1=%d  m2=%d  \n",394,
-                                          (int)i,mem1_4[i],mem2_3[i]);
+      if (mem1_4[i] != 55) printf("%d - %d m1=%d  m2=%d  \n",394,(int)i,
+                                  mem1_4[i],mem2_3[i]); /* printf_va_1307 */
       i += (uint32_t)1;
     }
   }
   testno ++;
-  printf_va_1308("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1308 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_4[i] = 35;
@@ -38056,23 +37541,20 @@ int test_wmemmove_s(void)
   }
   rc = wmemmove_s((wchar_t *)((char *)(mem1_4) + 1),(unsigned int)(256 * 4),
                   (wchar_t const *)(mem2_3),(unsigned int)10);
-  if (rc != 0) printf_va_1309("%s %u  Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)410,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)410,(unsigned int)rc); /* printf_va_1309 */
   else {
-    if (mem1_4[0] != 0x00003723) printf_va_1310("%d - %d first char memory incorrect m1=%04x  \n",
-                                                415,(int)i,
-                                                (unsigned int)mem1_4[i]);
+    if (mem1_4[0] != 0x00003723) printf("%d - %d first char memory incorrect m1=%04x  \n",
+                                        415,(int)i,(unsigned int)mem1_4[i]); /* printf_va_1310 */
     i = (unsigned int)1;
     while (i < (uint32_t)10) {
-      if (mem1_4[i] != 0x00003700) printf_va_1311("%d - %d m1=%04x  \n",420,
-                                                  (int)i,
-                                                  (unsigned int)mem1_4[i]);
+      if (mem1_4[i] != 0x00003700) printf("%d - %d m1=%04x  \n",420,(int)i,
+                                          (unsigned int)mem1_4[i]); /* printf_va_1311 */
       i += (uint32_t)1;
     }
   }
   testno ++;
-  printf_va_1312("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1312 */
   i = (unsigned int)0;
   while (i < (uint32_t)(256 * 4)) {
     mem1_4[i] = 35;
@@ -38085,18 +37567,15 @@ int test_wmemmove_s(void)
   }
   rc = wmemmove_s((wchar_t *)((char *)(mem1_4) + 2),(unsigned int)(256 * 4),
                   (wchar_t const *)(mem2_3),(unsigned int)10);
-  if (rc != 0) printf_va_1313("%s %u  Error rc=%u \n",
-                              (char *)"test_wmemmove_s",(unsigned int)436,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u  Error rc=%u \n",(char *)"test_wmemmove_s",
+                      (unsigned int)436,(unsigned int)rc); /* printf_va_1313 */
   else {
-    if (mem1_4[0] != 0x00370023) printf_va_1314("%d - %d first char memory incorrect m1=%04x  \n",
-                                                441,(int)i,
-                                                (unsigned int)mem1_4[i]);
+    if (mem1_4[0] != 0x00370023) printf("%d - %d first char memory incorrect m1=%04x  \n",
+                                        441,(int)i,(unsigned int)mem1_4[i]); /* printf_va_1314 */
     i = (unsigned int)1;
     while (i < (uint32_t)10) {
-      if (mem1_4[i] != 0x00370000) printf_va_1315("%d - %d m1=%04x  \n",446,
-                                                  (int)i,
-                                                  (unsigned int)mem1_4[i]);
+      if (mem1_4[i] != 0x00370000) printf("%d - %d m1=%04x  \n",446,(int)i,
+                                          (unsigned int)mem1_4[i]); /* printf_va_1315 */
       i += (uint32_t)1;
     }
   }
@@ -38476,31 +37955,28 @@ int test_wmemset_s(void)
   uint32_t i;
   wchar_t value;
   unsigned int testno = (unsigned int)0;
-  printf_va_1316("\nTesting wmemset_s:\n");
+  printf("\nTesting wmemset_s:\n"); /* printf_va_1316 */
   testno ++;
-  printf_va_1317("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1317 */
   value = 34;
   rc = wmemset_s((wchar_t *)0,value,(unsigned int)256);
-  if (rc != 400) printf_va_1318("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemset_s",(unsigned int)84,
-                                (unsigned int)rc);
+  if (rc != 400) printf("%s %u   Error rc=%u \n",(char *)"test_wmemset_s",
+                        (unsigned int)84,(unsigned int)rc); /* printf_va_1318 */
   testno ++;
-  printf_va_1319("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1319 */
   value = 34;
   rc = wmemset_s(mem1_5,value,(unsigned int)0);
-  if (rc != 401) printf_va_1320("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemset_s",(unsigned int)95,
-                                (unsigned int)rc);
+  if (rc != 401) printf("%s %u   Error rc=%u \n",(char *)"test_wmemset_s",
+                        (unsigned int)95,(unsigned int)rc); /* printf_va_1320 */
   testno ++;
-  printf_va_1321("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1321 */
   value = 34;
   rc = wmemset_s(mem1_5,value,
                  (unsigned int)((256UL << 20) + (unsigned long)1));
-  if (rc != 403) printf_va_1322("%s %u   Error rc=%u \n",
-                                (char *)"test_wmemset_s",(unsigned int)107,
-                                (unsigned int)rc);
+  if (rc != 403) printf("%s %u   Error rc=%u \n",(char *)"test_wmemset_s",
+                        (unsigned int)107,(unsigned int)rc); /* printf_va_1322 */
   testno ++;
-  printf_va_1323("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1323 */
   i = (unsigned int)0;
   while (i < (uint32_t)256) {
     mem1_5[i] = 99;
@@ -38509,18 +37985,16 @@ int test_wmemset_s(void)
   len = (unsigned int)1;
   value = 34;
   rc = wmemset_s(mem1_5,value,len);
-  if (rc != 0) printf_va_1324("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemset_s",(unsigned int)122,
-                              (unsigned int)rc);
-  if (mem1_5[0] != value) printf_va_1325("%d - m1[0]=%d \n",127,mem1_5[0]);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemset_s",
+                      (unsigned int)122,(unsigned int)rc); /* printf_va_1324 */
+  if (mem1_5[0] != value) printf("%d - m1[0]=%d \n",127,mem1_5[0]); /* printf_va_1325 */
   i = (unsigned int)1;
   while (i < (uint32_t)256) {
-    if (mem1_5[i] != 99) printf_va_1326("%d - %d m1=%d \n",132,(int)i,
-                                        mem1_5[i]);
+    if (mem1_5[i] != 99) printf("%d - %d m1=%d \n",132,(int)i,mem1_5[i]); /* printf_va_1326 */
     i += (uint32_t)1;
   }
   testno ++;
-  printf_va_1327("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1327 */
   i = (unsigned int)0;
   while (i < (uint32_t)256) {
     mem1_5[i] = 99;
@@ -38529,22 +38003,20 @@ int test_wmemset_s(void)
   len = (unsigned int)2;
   value = 34;
   rc = wmemset_s(mem1_5,value,len);
-  if (rc != 0) printf_va_1328("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemset_s",(unsigned int)148,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemset_s",
+                      (unsigned int)148,(unsigned int)rc); /* printf_va_1328 */
   if (mem1_5[0] != value) goto _LOR;
   else 
     if (mem1_5[1] != value) _LOR:
-                            printf_va_1329("%d - m1[0]=%d m1[1]=%d \n",153,
-                                           mem1_5[0],mem1_5[1]);
+                            printf("%d - m1[0]=%d m1[1]=%d \n",153,mem1_5[0],
+                                   mem1_5[1]); /* printf_va_1329 */
   i = (unsigned int)2;
   while (i < (uint32_t)256) {
-    if (mem1_5[i] != 99) printf_va_1330("%d - %d m1=%d \n",158,(int)i,
-                                        mem1_5[i]);
+    if (mem1_5[i] != 99) printf("%d - %d m1=%d \n",158,(int)i,mem1_5[i]); /* printf_va_1330 */
     i += (uint32_t)1;
   }
   testno ++;
-  printf_va_1331("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1331 */
   i = (unsigned int)0;
   while (i < (uint32_t)256) {
     mem1_5[i] = 99;
@@ -38553,23 +38025,20 @@ int test_wmemset_s(void)
   len = (unsigned int)12;
   value = 34;
   rc = wmemset_s(mem1_5,value,len);
-  if (rc != 0) printf_va_1332("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemset_s",(unsigned int)175,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemset_s",
+                      (unsigned int)175,(unsigned int)rc); /* printf_va_1332 */
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_5[i] != value) printf_va_1333("%d - %d m1=%d \n",181,(int)i,
-                                           mem1_5[i]);
+    if (mem1_5[i] != value) printf("%d - %d m1=%d \n",181,(int)i,mem1_5[i]); /* printf_va_1333 */
     i += (uint32_t)1;
   }
   i = len;
   while (i < (uint32_t)256) {
-    if (mem1_5[i] != 99) printf_va_1334("%d - %d m1=%d \n",187,(int)i,
-                                        mem1_5[i]);
+    if (mem1_5[i] != 99) printf("%d - %d m1=%d \n",187,(int)i,mem1_5[i]); /* printf_va_1334 */
     i += (uint32_t)1;
   }
   testno ++;
-  printf_va_1335("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1335 */
   i = (unsigned int)0;
   while (i < (uint32_t)256) {
     mem1_5[i] = 99;
@@ -38578,17 +38047,15 @@ int test_wmemset_s(void)
   len = (unsigned int)31;
   value = 3;
   rc = wmemset_s(mem1_5,value,len);
-  if (rc != 0) printf_va_1336("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemset_s",(unsigned int)203,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemset_s",
+                      (unsigned int)203,(unsigned int)rc); /* printf_va_1336 */
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_5[i] != value) printf_va_1337("%d - %d m1=%d \n",209,(int)i,
-                                           mem1_5[i]);
+    if (mem1_5[i] != value) printf("%d - %d m1=%d \n",209,(int)i,mem1_5[i]); /* printf_va_1337 */
     i += (uint32_t)1;
   }
   testno ++;
-  printf_va_1338("Test #%d:\n",(int)testno);
+  printf("Test #%d:\n",(int)testno); /* printf_va_1338 */
   i = (unsigned int)0;
   while (i < (uint32_t)256) {
     mem1_5[i] = 99;
@@ -38597,13 +38064,11 @@ int test_wmemset_s(void)
   len = (unsigned int)133;
   value = 65;
   rc = wmemset_s(mem1_5,value,len);
-  if (rc != 0) printf_va_1339("%s %u   Error rc=%u \n",
-                              (char *)"test_wmemset_s",(unsigned int)225,
-                              (unsigned int)rc);
+  if (rc != 0) printf("%s %u   Error rc=%u \n",(char *)"test_wmemset_s",
+                      (unsigned int)225,(unsigned int)rc); /* printf_va_1339 */
   i = (unsigned int)0;
   while (i < len) {
-    if (mem1_5[i] != value) printf_va_1340("%d - %d m1=%d \n",231,(int)i,
-                                           mem1_5[i]);
+    if (mem1_5[i] != value) printf("%d - %d m1=%d \n",231,(int)i,mem1_5[i]); /* printf_va_1340 */
     i += (uint32_t)1;
   }
   __retres = 0;
diff --git a/semver/.frama-c/semver.parse/framac.ast b/semver/.frama-c/semver.parse/framac.ast
index 29b8318dcfd8e8b967b040c1e755d4c41d139d9a..5dcb1280bd25db5e4a11c3bb8ebbeb23e51f6d01 100644
--- a/semver/.frama-c/semver.parse/framac.ast
+++ b/semver/.frama-c/semver.parse/framac.ast
@@ -590,8 +590,8 @@ int sprintf_va_2(char * __restrict s, char const * __restrict format,
 static void concat_num(char *str, int x, char *sep)
 {
   char buf[50] = {(char)0};
-  if (sep == (char *)0) sprintf_va_1(buf,"%d",x);
-  else sprintf_va_2(buf,"%s%d",sep,x);
+  if (sep == (char *)0) sprintf(buf,"%d",x); /* sprintf_va_1 */
+  else sprintf(buf,"%s%d",sep,x); /* sprintf_va_2 */
   strcat(str,(char const *)(buf));
   return;
 }
@@ -613,7 +613,7 @@ int sprintf_va_3(char * __restrict s, char const * __restrict format,
 static void concat_char(char *str, char *x, char *sep)
 {
   char buf[50] = {(char)0};
-  sprintf_va_3(buf,"%s%s",sep,x);
+  sprintf(buf,"%s%s",sep,x); /* sprintf_va_3 */
   strcat(str,(char const *)(buf));
   return;
 }
@@ -829,7 +829,7 @@ int printf_va_2(char const * __restrict format);
 void test_parse_simple(void)
 {
   semver_t ver;
-  printf_va_1("\n# Test: %s\n",(char *)"parse_simple");
+  printf("\n# Test: %s\n",(char *)"parse_simple"); /* printf_va_1 */
   char buf[7] =
     {(char)'1',
      (char)'.',
@@ -844,7 +844,7 @@ void test_parse_simple(void)
   __FC_assert((ver.minor == 2) != 0,"semver_test.c",70,"ver.minor == 2");
   __FC_assert((ver.patch == 12) != 0,"semver_test.c",71,"ver.patch == 12");
   semver_free(& ver);
-  printf_va_2("OK\n");
+  printf("OK\n"); /* printf_va_2 */
   return;
 }
 
@@ -876,7 +876,7 @@ int printf_va_4(char const * __restrict format);
 
 void test_parse_major(void)
 {
-  printf_va_3("\n# Test: %s\n",(char *)"parse_major");
+  printf("\n# Test: %s\n",(char *)"parse_major"); /* printf_va_3 */
   char buf[2] = {(char)'2', (char)'\000'};
   semver_t ver =
     {.major = 0,
@@ -890,7 +890,7 @@ void test_parse_major(void)
   __FC_assert((ver.minor == 0) != 0,"semver_test.c",89,"ver.minor == 0");
   __FC_assert((ver.patch == 0) != 0,"semver_test.c",90,"ver.patch == 0");
   semver_free(& ver);
-  printf_va_4("OK\n");
+  printf("OK\n"); /* printf_va_4 */
   return;
 }
 
@@ -922,7 +922,7 @@ int printf_va_6(char const * __restrict format);
 
 void test_parse_minor(void)
 {
-  printf_va_5("\n# Test: %s\n",(char *)"parse_minor");
+  printf("\n# Test: %s\n",(char *)"parse_minor"); /* printf_va_5 */
   char buf[4] = {(char)'1', (char)'.', (char)'2', (char)'\000'};
   semver_t ver =
     {.major = 0,
@@ -936,7 +936,7 @@ void test_parse_minor(void)
   __FC_assert((ver.minor == 2) != 0,"semver_test.c",108,"ver.minor == 2");
   __FC_assert((ver.patch == 0) != 0,"semver_test.c",109,"ver.patch == 0");
   semver_free(& ver);
-  printf_va_6("OK\n");
+  printf("OK\n"); /* printf_va_6 */
   return;
 }
 
@@ -969,7 +969,7 @@ int printf_va_8(char const * __restrict format);
 void test_parse_prerelease(void)
 {
   int tmp_0;
-  printf_va_7("\n# Test: %s\n",(char *)"parse_prerelease");
+  printf("\n# Test: %s\n",(char *)"parse_prerelease"); /* printf_va_7 */
   char buf[22] =
     {(char)'1',
      (char)'.',
@@ -1008,7 +1008,7 @@ void test_parse_prerelease(void)
   __FC_assert((tmp_0 == 0) != 0,"semver_test.c",129,
               "strcmp(ver.prerelease, \"beta.alpha.1.1\") == 0");
   semver_free(& ver);
-  printf_va_8("OK\n");
+  printf("OK\n"); /* printf_va_8 */
   return;
 }
 
@@ -1041,7 +1041,7 @@ int printf_va_10(char const * __restrict format);
 void test_parse_metadata(void)
 {
   int tmp_0;
-  printf_va_9("\n# Test: %s\n",(char *)"parse_metadata");
+  printf("\n# Test: %s\n",(char *)"parse_metadata"); /* printf_va_9 */
   char buf[22] =
     {(char)'1',
      (char)'.',
@@ -1080,7 +1080,7 @@ void test_parse_metadata(void)
   __FC_assert((tmp_0 == 0) != 0,"semver_test.c",149,
               "strcmp(ver.metadata, \"20130313144700\") == 0");
   semver_free(& ver);
-  printf_va_10("OK\n");
+  printf("OK\n"); /* printf_va_10 */
   return;
 }
 
@@ -1114,7 +1114,7 @@ void test_parse_prerelerease_metadata(void)
 {
   int tmp_0;
   int tmp_1;
-  printf_va_11("\n# Test: %s\n",(char *)"parse_prerelease_metadata");
+  printf("\n# Test: %s\n",(char *)"parse_prerelease_metadata"); /* printf_va_11 */
   char buf[30] =
     {(char)'1',
      (char)'.',
@@ -1164,7 +1164,7 @@ void test_parse_prerelerease_metadata(void)
   __FC_assert((tmp_1 == 0) != 0,"semver_test.c",170,
               "strcmp(ver.metadata, \"20130313144700\") == 0");
   semver_free(& ver);
-  printf_va_12("OK\n");
+  printf("OK\n"); /* printf_va_12 */
   return;
 }
 
@@ -1196,7 +1196,7 @@ int printf_va_14(char const * __restrict format);
 
 void test_compare(void)
 {
-  printf_va_13("\n# Test: %s\n",(char *)"semver_compare");
+  printf("\n# Test: %s\n",(char *)"semver_compare"); /* printf_va_13 */
   struct test_case cases[13] =
     {{.x = (char *)"1", .y = (char *)"0", .expected = 1},
      {.x = (char *)"1", .y = (char *)"1", .expected = 0},
@@ -1212,7 +1212,7 @@ void test_compare(void)
      {.x = (char *)"1.2.2", .y = (char *)"1.1.9", .expected = 1},
      {.x = (char *)"1.2.2", .y = (char *)"1.2.9", .expected = -1}};
   suite_runner(cases,13,& semver_compare);
-  printf_va_14("OK\n");
+  printf("OK\n"); /* printf_va_14 */
   return;
 }
 
@@ -1244,7 +1244,7 @@ int printf_va_16(char const * __restrict format);
 
 void test_compare_full(void)
 {
-  printf_va_15("\n# Test: %s\n",(char *)"semver_compare_full");
+  printf("\n# Test: %s\n",(char *)"semver_compare_full"); /* printf_va_15 */
   struct test_case cases[21] =
     {{.x = (char *)"1.5.1", .y = (char *)"1.5.1-beta", .expected = 1},
      {.x = (char *)"1.5.1-beta", .y = (char *)"1.5.1", .expected = -1},
@@ -1300,7 +1300,7 @@ void test_compare_full(void)
       .y = (char *)"1.5.1-1.beta",
       .expected = 1}};
   suite_runner(cases,21,& semver_compare);
-  printf_va_16("OK\n");
+  printf("OK\n"); /* printf_va_16 */
   return;
 }
 
@@ -1332,7 +1332,7 @@ int printf_va_18(char const * __restrict format);
 
 void test_compare_spec(void)
 {
-  printf_va_17("\n# Test: %s\n",(char *)"semver_compare_spec");
+  printf("\n# Test: %s\n",(char *)"semver_compare_spec"); /* printf_va_17 */
   struct test_case cases[7] =
     {{.x = (char *)"1.0.0-alpha",
       .y = (char *)"1.0.0-alpha.1",
@@ -1350,7 +1350,7 @@ void test_compare_spec(void)
      {.x = (char *)"1.0.0-beta.11", .y = (char *)"1.0.0-rc.1", .expected = -1},
      {.x = (char *)"1.0.0-rc.1", .y = (char *)"1.0.0", .expected = -1}};
   suite_runner(cases,7,& semver_compare);
-  printf_va_18("OK\n");
+  printf("OK\n"); /* printf_va_18 */
   return;
 }
 
@@ -1382,7 +1382,7 @@ int printf_va_20(char const * __restrict format);
 
 void test_compare_gt(void)
 {
-  printf_va_19("\n# Test: %s\n",(char *)"semver_gt");
+  printf("\n# Test: %s\n",(char *)"semver_gt"); /* printf_va_19 */
   struct test_case cases[15] =
     {{.x = (char *)"1", .y = (char *)"0", .expected = 1},
      {.x = (char *)"1", .y = (char *)"3", .expected = 0},
@@ -1400,7 +1400,7 @@ void test_compare_gt(void)
      {.x = (char *)"1.1.5", .y = (char *)"1.1.9", .expected = 0},
      {.x = (char *)"1.2.2", .y = (char *)"1.2.9", .expected = 0}};
   suite_runner(cases,15,& semver_gt);
-  printf_va_20("OK\n");
+  printf("OK\n"); /* printf_va_20 */
   return;
 }
 
@@ -1432,7 +1432,7 @@ int printf_va_22(char const * __restrict format);
 
 void test_compare_lt(void)
 {
-  printf_va_21("\n# Test: %s\n",(char *)"semver_lt");
+  printf("\n# Test: %s\n",(char *)"semver_lt"); /* printf_va_21 */
   struct test_case cases[9] =
     {{.x = (char *)"1", .y = (char *)"0", .expected = 0},
      {.x = (char *)"1", .y = (char *)"3", .expected = 1},
@@ -1444,7 +1444,7 @@ void test_compare_lt(void)
      {.x = (char *)"1.1.5", .y = (char *)"1.1.9", .expected = 1},
      {.x = (char *)"1.2.2", .y = (char *)"1.2.9", .expected = 1}};
   suite_runner(cases,9,& semver_lt);
-  printf_va_22("OK\n");
+  printf("OK\n"); /* printf_va_22 */
   return;
 }
 
@@ -1476,7 +1476,7 @@ int printf_va_24(char const * __restrict format);
 
 void test_compare_eq(void)
 {
-  printf_va_23("\n# Test: %s\n",(char *)"semver_eq");
+  printf("\n# Test: %s\n",(char *)"semver_eq"); /* printf_va_23 */
   struct test_case cases[11] =
     {{.x = (char *)"1", .y = (char *)"0", .expected = 0},
      {.x = (char *)"1", .y = (char *)"3", .expected = 0},
@@ -1490,7 +1490,7 @@ void test_compare_eq(void)
      {.x = (char *)"1.2.2", .y = (char *)"1.2.9", .expected = 0},
      {.x = (char *)"1.0.0", .y = (char *)"1.0.0", .expected = 1}};
   suite_runner(cases,11,& semver_eq);
-  printf_va_24("OK\n");
+  printf("OK\n"); /* printf_va_24 */
   return;
 }
 
@@ -1522,7 +1522,7 @@ int printf_va_26(char const * __restrict format);
 
 void test_compare_neq(void)
 {
-  printf_va_25("\n# Test: %s\n",(char *)"semver_neq");
+  printf("\n# Test: %s\n",(char *)"semver_neq"); /* printf_va_25 */
   struct test_case cases[11] =
     {{.x = (char *)"1", .y = (char *)"0", .expected = 1},
      {.x = (char *)"1", .y = (char *)"3", .expected = 1},
@@ -1536,7 +1536,7 @@ void test_compare_neq(void)
      {.x = (char *)"1.2.2", .y = (char *)"1.2.9", .expected = 1},
      {.x = (char *)"1.0.0", .y = (char *)"1.0.0", .expected = 0}};
   suite_runner(cases,11,& semver_neq);
-  printf_va_26("OK\n");
+  printf("OK\n"); /* printf_va_26 */
   return;
 }
 
@@ -1568,7 +1568,7 @@ int printf_va_28(char const * __restrict format);
 
 void test_compare_gte(void)
 {
-  printf_va_27("\n# Test: %s\n",(char *)"semver_gte");
+  printf("\n# Test: %s\n",(char *)"semver_gte"); /* printf_va_27 */
   struct test_case cases[11] =
     {{.x = (char *)"1", .y = (char *)"0", .expected = 1},
      {.x = (char *)"1", .y = (char *)"3", .expected = 0},
@@ -1582,7 +1582,7 @@ void test_compare_gte(void)
      {.x = (char *)"1.2.2", .y = (char *)"1.2.9", .expected = 0},
      {.x = (char *)"1.0.0", .y = (char *)"1.0.0", .expected = 1}};
   suite_runner(cases,11,& semver_gte);
-  printf_va_28("OK\n");
+  printf("OK\n"); /* printf_va_28 */
   return;
 }
 
@@ -1614,7 +1614,7 @@ int printf_va_30(char const * __restrict format);
 
 void test_compare_lte(void)
 {
-  printf_va_29("\n# Test: %s\n",(char *)"semver_lte");
+  printf("\n# Test: %s\n",(char *)"semver_lte"); /* printf_va_29 */
   struct test_case cases[11] =
     {{.x = (char *)"1", .y = (char *)"0", .expected = 0},
      {.x = (char *)"1", .y = (char *)"3", .expected = 1},
@@ -1628,7 +1628,7 @@ void test_compare_lte(void)
      {.x = (char *)"1.2.2", .y = (char *)"1.2.9", .expected = 1},
      {.x = (char *)"1.0.0", .y = (char *)"1.0.0", .expected = 1}};
   suite_runner(cases,11,& semver_lte);
-  printf_va_30("OK\n");
+  printf("OK\n"); /* printf_va_30 */
   return;
 }
 
@@ -1661,7 +1661,7 @@ int printf_va_32(char const * __restrict format);
 void test_satisfies(void)
 {
   int i;
-  printf_va_31("\n# Test: %s\n",(char *)"semver_satisfies");
+  printf("\n# Test: %s\n",(char *)"semver_satisfies"); /* printf_va_31 */
   struct test_case_match cases[82] =
     {{.x = (char *)"1", .y = (char *)"0", .op = (char *)">=", .expected = 1},
      {.x = (char *)"1", .y = (char *)"3", .op = (char *)">=", .expected = 0},
@@ -1954,7 +1954,7 @@ void test_satisfies(void)
     }
     i ++;
   }
-  printf_va_32("OK\n");
+  printf("OK\n"); /* printf_va_32 */
   return;
 }
 
@@ -1988,7 +1988,7 @@ void test_render(void)
 {
   int tmp;
   int tmp_0;
-  printf_va_33("\n# Test: %s\n",(char *)"render");
+  printf("\n# Test: %s\n",(char *)"render"); /* printf_va_33 */
   semver_t ver =
     {.major = 1,
      .minor = 5,
@@ -2013,7 +2013,7 @@ void test_render(void)
   tmp_0 = strcmp((char const *)(str2),"1.5.8-alpha.1+1232323");
   __FC_assert((tmp_0 == 0) != 0,"semver_test.c",520,
               "strcmp((char *) str2, \"1.5.8-alpha.1+1232323\") == 0");
-  printf_va_34("OK\n");
+  printf("OK\n"); /* printf_va_34 */
   return;
 }
 
@@ -2049,7 +2049,7 @@ void test_numeric(void)
   int tmp_0;
   int tmp_1;
   int tmp_2;
-  printf_va_35("\n# Test: %s\n",(char *)"numeric");
+  printf("\n# Test: %s\n",(char *)"numeric"); /* printf_va_35 */
   semver_t v0 =
     {.major = 0,
      .minor = 5,
@@ -2086,7 +2086,7 @@ void test_numeric(void)
   tmp_2 = semver_numeric(& v3);
   __FC_assert((tmp_2 == 1025) != 0,"semver_test.c",539,
               "semver_numeric(&v3) == 1025");
-  printf_va_36("OK\n");
+  printf("OK\n"); /* printf_va_36 */
   return;
 }
 
@@ -2118,7 +2118,7 @@ int printf_va_38(char const * __restrict format);
 
 void test_bump(void)
 {
-  printf_va_37("\n# Test: %s\n",(char *)"bump");
+  printf("\n# Test: %s\n",(char *)"bump"); /* printf_va_37 */
   semver_t ver =
     {.major = 1,
      .minor = 5,
@@ -2146,7 +2146,7 @@ void test_bump(void)
   semver_bump(& ver3);
   __FC_assert((ver3.major == 1) != 0,"semver_test.c",564,"ver3.major == 1");
   semver_free(& ver3);
-  printf_va_38("OK\n");
+  printf("OK\n"); /* printf_va_38 */
   return;
 }
 
@@ -2178,7 +2178,7 @@ int printf_va_40(char const * __restrict format);
 
 void test_bump_minor(void)
 {
-  printf_va_39("\n# Test: %s\n",(char *)"bump_minor");
+  printf("\n# Test: %s\n",(char *)"bump_minor"); /* printf_va_39 */
   semver_t ver =
     {.major = 1,
      .minor = 5,
@@ -2197,7 +2197,7 @@ void test_bump_minor(void)
   semver_bump_minor(& ver2);
   __FC_assert((ver2.minor == 1) != 0,"semver_test.c",581,"ver2.minor == 1");
   semver_free(& ver2);
-  printf_va_40("OK\n");
+  printf("OK\n"); /* printf_va_40 */
   return;
 }
 
@@ -2229,7 +2229,7 @@ int printf_va_42(char const * __restrict format);
 
 void test_bump_patch(void)
 {
-  printf_va_41("\n# Test: %s\n",(char *)"bump_patch");
+  printf("\n# Test: %s\n",(char *)"bump_patch"); /* printf_va_41 */
   semver_t ver =
     {.major = 1,
      .minor = 5,
@@ -2248,7 +2248,7 @@ void test_bump_patch(void)
   semver_bump_patch(& ver2);
   __FC_assert((ver2.patch == 1) != 0,"semver_test.c",598,"ver2.patch == 1");
   semver_free(& ver2);
-  printf_va_42("OK\n");
+  printf("OK\n"); /* printf_va_42 */
   return;
 }
 
@@ -2280,7 +2280,7 @@ int printf_va_44(char const * __restrict format);
 
 void test_free(void)
 {
-  printf_va_43("\n# Test: %s\n",(char *)"free");
+  printf("\n# Test: %s\n",(char *)"free"); /* printf_va_43 */
   semver_t ver =
     {.major = 0,
      .minor = 0,
@@ -2305,7 +2305,7 @@ void test_free(void)
   semver_free(& ver2);
   __FC_assert((ver2.prerelease == (char *)0) != 0,"semver_test.c",624,
               "ver2.prerelease == NULL");
-  printf_va_44("OK\n");
+  printf("OK\n"); /* printf_va_44 */
   return;
 }
 
@@ -2338,7 +2338,7 @@ int printf_va_46(char const * __restrict format);
 void test_valid_chars(void)
 {
   int valid;
-  printf_va_45("\n# Test: %s\n",(char *)"valid_chars");
+  printf("\n# Test: %s\n",(char *)"valid_chars"); /* printf_va_45 */
   valid = semver_is_valid("1");
   __FC_assert((valid == 1) != 0,"semver_test.c",640,"valid == 1");
   valid = semver_is_valid("159");
@@ -2349,7 +2349,7 @@ void test_valid_chars(void)
   __FC_assert((valid == 0) != 0,"semver_test.c",649,"valid == 0");
   valid = semver_is_valid("&3@(");
   __FC_assert((valid == 0) != 0,"semver_test.c",652,"valid == 0");
-  printf_va_46("OK\n");
+  printf("OK\n"); /* printf_va_46 */
   return;
 }
 
@@ -2384,7 +2384,7 @@ void test_clean(void)
   int error;
   int tmp;
   int tmp_0;
-  printf_va_47("\n# Test: %s\n",(char *)"clean");
+  printf("\n# Test: %s\n",(char *)"clean"); /* printf_va_47 */
   char str[6] =
     {(char)'1', (char)'.', (char)'2', (char)'.', (char)'3', (char)'\000'};
   error = semver_clean(str);
@@ -2427,7 +2427,7 @@ void test_clean(void)
   __FC_assert((tmp_0 == 0) != 0,"semver_test.c",670,
               "strcmp(str2, \"1.2.3-beta.alpha+1234\") == 0");
   __FC_assert((error == 0) != 0,"semver_test.c",671,"error == 0");
-  printf_va_48("OK\n");
+  printf("OK\n"); /* printf_va_48 */
   return;
 }
 
diff --git a/solitaire/.frama-c/solitaire.parse/framac.ast b/solitaire/.frama-c/solitaire.parse/framac.ast
index 48b073b9de4a72d81e76b40597f4e6a6e804d22a..3e96a13fe77843654192296f0df01674ff462ca4 100644
--- a/solitaire/.frama-c/solitaire.parse/framac.ast
+++ b/solitaire/.frama-c/solitaire.parse/framac.ast
@@ -366,7 +366,7 @@ static void key_deck(char *key)
         state.spare = tmp;
         if (verbose) {
           print_deck();
-          printf_va_1(" after %c\n",(int)*key);
+          printf(" after %c\n",(int)*key); /* printf_va_1 */
         }
       }
     key ++;
@@ -397,7 +397,7 @@ static char encrypt_char(char char_in)
   char_out = (char)('A' + (((int)char_in - 'A') + lastout) % 26);
   if (verbose) {
     print_deck();
-    printf_va_2(" %c -> %c\n",(int)char_in,(int)char_out);
+    printf(" %c -> %c\n",(int)char_in,(int)char_out); /* printf_va_2 */
   }
   return char_out;
 }
@@ -463,7 +463,7 @@ int main(int argc, char **argv)
   int slow_mode = 0;
   av ++;
   argc --;
-  if (argc < 2) printf_va_3("Usage: [flags] key message|len\n");
+  if (argc < 2) printf("Usage: [flags] key message|len\n"); /* printf_va_3 */
   /*@ loop unroll 3; */
   while (argc > 2) {
     int tmp_1;
@@ -474,7 +474,7 @@ int main(int argc, char **argv)
       tmp_0 = strcmp((char const *)*av,"-s");
       if (tmp_0 == 0) slow_mode = 1;
       else {
-        printf_va_4("Unrecognised flag: %s\n",*av);
+        printf("Unrecognised flag: %s\n",*av); /* printf_va_4 */
         exit(-1);
       }
     }
@@ -510,7 +510,7 @@ int main(int argc, char **argv)
   else {
     int i_0;
     if (rounds <= (long)0) {
-      printf_va_5("Rounds number must be greater than zero\n");
+      printf("Rounds number must be greater than zero\n"); /* printf_va_5 */
       exit(-1);
     }
     if (verbose) goto _LOR;
@@ -526,7 +526,7 @@ int main(int argc, char **argv)
         }
       }
       else cycle_deck((int)rounds);
-    printf_va_6("Coincidences: %d / %ld\n",cocount,rounds - (long)1);
+    printf("Coincidences: %d / %ld\n",cocount,rounds - (long)1); /* printf_va_6 */
   }
   __retres = 0;
   return __retres;
diff --git a/tweetnacl-usable/.frama-c/tweetnacl-usable.parse/framac.ast b/tweetnacl-usable/.frama-c/tweetnacl-usable.parse/framac.ast
index 75cf42cfb3eb6dcd4e0ccb195f20db094f58483c..b94082cc0ffd37845f495a7423901bedb405258a 100644
--- a/tweetnacl-usable/.frama-c/tweetnacl-usable.parse/framac.ast
+++ b/tweetnacl-usable/.frama-c/tweetnacl-usable.parse/framac.ast
@@ -154,10 +154,10 @@ void hexdump(char *data, int len)
   i = 0;
   /*@ loop unroll 105; */
   while (i < len) {
-    printf_va_1("%02X",(unsigned int)((int)((unsigned char)*(data + i))));
+    printf("%02X",(unsigned int)((int)((unsigned char)*(data + i)))); /* printf_va_1 */
     i ++;
   }
-  printf_va_2("\n");
+  printf("\n"); /* printf_va_2 */
   return;
 }
 
@@ -304,17 +304,17 @@ int main(void)
   char *message =
     (char *)"This is a cross-platform test of crypto_box/crypto_box_open in TweetNaCl.";
   randombytes(nonce,(unsigned long long)24);
-  printf_va_3("Nonce: \n");
+  printf("Nonce: \n"); /* printf_va_3 */
   hexdump((char *)(nonce),24);
   crypto_box_curve25519xsalsa20poly1305_tweet_keypair(pk,sk);
   crypto_box_curve25519xsalsa20poly1305_tweet_keypair(pk2,sk2);
-  printf_va_4("Public key: \n");
+  printf("Public key: \n"); /* printf_va_4 */
   hexdump((char *)(pk),32);
-  printf_va_5("\nSecret key: \n");
+  printf("\nSecret key: \n"); /* printf_va_5 */
   hexdump((char *)(sk),32);
-  printf_va_6("Public key2: \n");
+  printf("Public key2: \n"); /* printf_va_6 */
   hexdump((char *)(pk2),32);
-  printf_va_7("\nSecret key2: \n");
+  printf("\nSecret key2: \n"); /* printf_va_7 */
   hexdump((char *)(sk2),32);
   tmp = strlen((char const *)message);
   padded_mlen = (int)(tmp + (size_t)32);
@@ -333,9 +333,9 @@ int main(void)
                                                       (unsigned char const *)(nonce),
                                                       (unsigned char const *)(pk2),
                                                       (unsigned char const *)(sk));
-  printf_va_8("crypto_box returned: %d\n",tmp_4);
+  printf("crypto_box returned: %d\n",tmp_4); /* printf_va_8 */
   free((void *)padded_message);
-  printf_va_9("\nCipher text: \n");
+  printf("\nCipher text: \n"); /* printf_va_9 */
   hexdump((char *)ciphertext,padded_mlen);
   tmp_5 = crypto_box_curve25519xsalsa20poly1305_tweet_open((u8 *)decryptedmessage,
                                                            (unsigned char const *)ciphertext,
@@ -343,11 +343,11 @@ int main(void)
                                                            (unsigned char const *)(nonce),
                                                            (unsigned char const *)(pk),
                                                            (unsigned char const *)(sk2));
-  printf_va_10("crypto_box_open returned: %d\n",tmp_5);
+  printf("crypto_box_open returned: %d\n",tmp_5); /* printf_va_10 */
   free((void *)ciphertext);
-  printf_va_11("\nDecrypted text: \n");
+  printf("\nDecrypted text: \n"); /* printf_va_11 */
   hexdump(decryptedmessage,padded_mlen);
-  printf_va_12("%s\n",decryptedmessage + 32);
+  printf("%s\n",decryptedmessage + 32); /* printf_va_12 */
   free((void *)decryptedmessage);
   __retres = 0;
   return __retres;
@@ -2190,8 +2190,8 @@ void randombytes(unsigned char *ptr, unsigned long long length)
   }
   else failed = (char)1;
   if (failed) {
-    fprintf_va_1(__fc_stderr,
-                 "Generating random data failed. Please report this to https://github.com/ultramancool\n");
+    fprintf(__fc_stderr,
+            "Generating random data failed. Please report this to https://github.com/ultramancool\n"); /* fprintf_va_1 */
     exit(1);
   }
   return;