Backported fixes on issues #60 and #62 to STC 4.2. Note that cbits now uses long long for indices and sizes in the API, which is easier to print with "%lld", and is at least 64 bits.

3 files changed, 9 insertions, 9 deletions

diff --git a/misc/examples/bits.c b/misc/examples/bits.c
index 1323d4e7..e0a11346 100644
--- a/misc/examples/bits.c
+++ b/misc/examples/bits.c
@@ -9,18 +9,18 @@ int main(void)
         cbits_drop(&set),
         cbits_drop(&s2)
     ){
-        printf("count %" c_ZI ", %" c_ZI "\n", cbits_count(&set), cbits_size(&set));
+        printf("count %lld, %lld\n", cbits_count(&set), cbits_size(&set));
         cbits s1 = cbits_from("1110100110111");
         char buf[256];
         cbits_to_str(&s1, buf, 0, 255);
-        printf("buf: %s: %" c_ZI "\n", buf, cbits_count(&s1));
+        printf("buf: %s: %lld\n", buf, cbits_count(&s1));
         cbits_drop(&s1);
 
         cbits_reset(&set, 9);
         cbits_resize(&set, 43, false);
         printf(" str: %s\n", cbits_to_str(&set, buf, 0, 255));
 
-        printf("%4" c_ZI ": ", cbits_size(&set));
+        printf("%4lld: ", cbits_size(&set));
         c_forrange (i, cbits_size(&set))
             printf("%d", cbits_test(&set, i));
         puts("");
@@ -30,12 +30,12 @@ int main(void)
         cbits_resize(&set, 93, false);
         cbits_resize(&set, 102, true);
         cbits_set_value(&set, 99, false);
-        printf("%4" c_ZI ": ", cbits_size(&set));
+        printf("%4lld: ", cbits_size(&set));
         c_forrange (i, cbits_size(&set))
             printf("%d", cbits_test(&set, i));
 
         puts("\nIterate:");
-        printf("%4" c_ZI ": ", cbits_size(&set));
+        printf("%4lld: ", cbits_size(&set));
         c_forrange (i, cbits_size(&set))
             printf("%d", cbits_test(&set, i));
         puts("");
@@ -58,7 +58,7 @@ int main(void)
         puts("");
 
         cbits_set_all(&set, false);
-        printf("%4" c_ZI ": ", cbits_size(&set));
+        printf("%4lld: ", cbits_size(&set));
         c_forrange (i, cbits_size(&set))
             printf("%d", cbits_test(&set, i));
         puts("");
diff --git a/misc/examples/bits2.c b/misc/examples/bits2.c
index b002af3c..913bd185 100644
--- a/misc/examples/bits2.c
+++ b/misc/examples/bits2.c
@@ -9,10 +9,10 @@ int main()
 {
     Bits s1 = Bits_from("1110100110111");
     
-    printf("size %" c_ZI "\n", Bits_size(&s1));
+    printf("size %lld\n", Bits_size(&s1));
     char buf[256];
     Bits_to_str(&s1, buf, 0, 256);
-    printf("buf: %s: count=%" c_ZI "\n", buf, Bits_count(&s1));
+    printf("buf: %s: count=%lld\n", buf, Bits_count(&s1));
 
     Bits_reset(&s1, 8);
     printf(" s1: %s\n", Bits_to_str(&s1, buf, 0, 256));
diff --git a/misc/examples/intrusive.c b/misc/examples/intrusive.c
index 0d503575..0f153589 100644
--- a/misc/examples/intrusive.c
+++ b/misc/examples/intrusive.c
@@ -16,7 +16,7 @@ void printList(List list) {
 int main() {
     List list = {0};
     c_forlist (i, int, {6, 9, 3, 1, 7, 4, 5, 2, 8})
-        List_push_back_node(&list, c_new(List_node, {0, *i.ref}));
+        List_push_back_node(&list, c_new(List_node, {.value=*i.ref}));
 
     printList(list);