development branch for 4.2

Removed uses of c_auto and c_with in documentation examples and code examples. Still using c_defer a few places.
Renamed c11/fmt.h to c11/print.h.
Some additions in ccommon.h, e.g. c_const_cast(T, x).
Improved docs.

1 files changed, 28 insertions, 27 deletions

diff --git a/misc/examples/hashmap.c b/misc/examples/hashmap.c
index f59ed824..47a3bcff 100644
--- a/misc/examples/hashmap.c
+++ b/misc/examples/hashmap.c
@@ -17,32 +17,33 @@ const char* call(const char* number) {
 }
 
 int main(void) {
-    c_auto (cmap_str, contacts)
-    {
-        cmap_str_emplace(&contacts, "Daniel", "798-1364");
-        cmap_str_emplace(&contacts, "Ashley", "645-7689");
-        cmap_str_emplace(&contacts, "Katie", "435-8291");
-        cmap_str_emplace(&contacts, "Robert", "956-1745");
-
-        const cmap_str_value* v;
-        if ((v = cmap_str_get(&contacts, "Daniel")))
-            printf("Calling Daniel: %s\n", call(cstr_str(&v->second)));
-        else
-            printf("Don't have Daniel's number.");
-
-        cmap_str_emplace_or_assign(&contacts, "Daniel", "164-6743");
-
-        if ((v = cmap_str_get(&contacts, "Ashley")))
-            printf("Calling Ashley: %s\n", call(cstr_str(&v->second)));
-        else
-            printf("Don't have Ashley's number.");
-
-        cmap_str_erase(&contacts, "Ashley");
-
-        puts("");
-        c_forpair (contact, number, cmap_str, contacts) {
-            printf("Calling %s: %s\n", cstr_str(_.contact), call(cstr_str(_.number)));
-        }
-        puts("");
+    cmap_str contacts = {0};
+
+    cmap_str_emplace(&contacts, "Daniel", "798-1364");
+    cmap_str_emplace(&contacts, "Ashley", "645-7689");
+    cmap_str_emplace(&contacts, "Katie", "435-8291");
+    cmap_str_emplace(&contacts, "Robert", "956-1745");
+
+    const cmap_str_value* v;
+    if ((v = cmap_str_get(&contacts, "Daniel")))
+        printf("Calling Daniel: %s\n", call(cstr_str(&v->second)));
+    else
+        printf("Don't have Daniel's number.");
+
+    cmap_str_emplace_or_assign(&contacts, "Daniel", "164-6743");
+
+    if ((v = cmap_str_get(&contacts, "Ashley")))
+        printf("Calling Ashley: %s\n", call(cstr_str(&v->second)));
+    else
+        printf("Don't have Ashley's number.");
+
+    cmap_str_erase(&contacts, "Ashley");
+
+    puts("");
+    c_forpair (contact, number, cmap_str, contacts) {
+        printf("Calling %s: %s\n", cstr_str(_.contact), call(cstr_str(_.number)));
     }
+    puts("");
+
+    cmap_str_drop(&contacts);
 }