safethrow in DtsodV24_deserialize and sprintf_s on windows

tests/main.c

@@ -1,12 +1,12 @@
 #include "tests.h"
 
 void test_all(){
-    test_searchtree();
     test_autoarr();
-    test_hashtable();
     test_string();
-    test_dtsod();
     test_safethrow();
+    test_searchtree();
+    test_hashtable();
+    test_dtsod();
     printf("\e[96m---------------------------------------\e[0m\n");
 }
 

tests/test_dtsod.c

@@ -33,18 +33,21 @@ void test_dtsod(){
     optime(__func__,1,({
         printf("\e[96m-------------[test_dtsod]-------------\n");
         Hashtable* dtsod;
-        char* s=cptr_copy(text);
 
-        optime("deserialize",1,(dtsod=DtsodV24_deserialize(s)));
-        free(s);
+        optime("deserialize",1,({
+            tryLast(DtsodV24_deserialize(text),r) 
+                dtsod=r.value.VoidPtr;
+        }));
         print_dtsod(dtsod);
 
+        char* s;
         optime("serialize",1,(s=DtsodV24_serialize(dtsod)));
         Hashtable_free(dtsod);
         printf("\e[92m%s",s);
 
         optime("reserialize",10,({
-            dtsod=DtsodV24_deserialize(s);
+            tryLast(DtsodV24_deserialize(s),r) 
+                dtsod=r.value.VoidPtr;
             free(s);
             s=DtsodV24_serialize(dtsod);
             Hashtable_free(dtsod);

tests/test_hashtable.c

@@ -39,7 +39,10 @@ void printrowgraph(Hashtable* ht){
 void fill(Hashtable* ht){
     for(uint32 i=0;i<100000;i++){
         char* key=malloc(12);
-        sprintf(key,"key__%u",i);
+        IFWIN(
+            sprintf_s(key,12,"key_%u",i),
+            sprintf(key,"key_%u",i)
+        );
         Hashtable_add(ht,key,Uni(UInt64,i));
     }
 }
@@ -48,7 +51,10 @@ Unitype gett(Hashtable* ht){
     char* key=malloc(12);
     Unitype u;
     for(uint32 i=0;i<100000;i++){
-        sprintf(key,"key__%u",i);
+        IFWIN(
+            sprintf_s(key,12,"key_%u",i),
+            sprintf(key,"key_%u",i)
+        );
         u=Hashtable_get(ht,key);
     }
     free(key);

tests/test_safethrow.c

@@ -14,19 +14,19 @@ Maybe throw_errcode(){
 
 Maybe test_maybe(){
     printf("\e[94mdont_throw returns \e[92m");
-    throwNext(dont_throw(),rez0)
+    tryLast(dont_throw(),rez0)
         printMaybe(rez0);
     printf("\n");
-    throwNext(throw_error(),rez1)
+    try(throw_error(),rez1)
         printMaybe(rez1);
     throw("test_maybe failed");
     return MaybeNull;
 }
 
 
-Maybe c(){ throwNext(throw_errcode(),_) return MaybeNull; }
-Maybe b(){ throwNext(c(),_) return MaybeNull; }
-Maybe a(){ throwNext(b(),_) return MaybeNull; }
+Maybe c(){ try(throw_errcode(),_) return MaybeNull; }
+Maybe b(){ try(c(),_) return MaybeNull; }
+Maybe a(){ try(b(),_) return MaybeNull; }
 
 void test_safethrow(){
     printf("\e[96m-----------[test_safethrow]-----------\n");