Changed stdout to have alias 1 instead of 0, and stderr=2.

4 files changed, 39 insertions, 39 deletions

diff --git a/README.md b/README.md
index 580d00d9..a7007c24 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ int main(void) {
     cvec_i_push_back(&vec, 2);

 

     c_foreach (i, cvec_i, vec)

-        c_print(0, " {}", *i.val);

+        c_print(1, " {}", *i.val);

     cvec_i_del(&vec);

 }

 ```

@@ -61,7 +61,7 @@ int main(void) {
     cvec_u_push_back(&vec, (User) {cstr_from("admin"), 0}); // cstr_from() allocates string memory

     cvec_u_push_back(&vec, (User) {cstr_from("usera"), 1});

     c_foreach (i, cvec_u, vec)

-        c_print(0, "{}: {}\n", i.val->name.str, i.val->id);

+        c_print(1, "{}: {}\n", i.val->name.str, i.val->id);

     cvec_u_del(&vec); // free everything

 }

 ```

@@ -211,7 +211,7 @@ int main() {
         bignums.data[i] /= i; // make them smaller

 

     c_foreach (i, cvec_ix, bignums)

-        c_print(0, " {}", *i.val);

+        c_print(1, " {}", *i.val);

     cvec_ix_del(&bignums);

 }

 // Output:

@@ -234,10 +234,10 @@ int main() {
     cstr_t tmp = cstr_from_fmt("%d elements so far", cvec_str_size(names));

     cvec_str_push_back(&names, tmp); // tmp is moved to names, do not del() it.

 

-    c_print(0, "{}\n", names.data[1].str); // Access the second element

+    c_print(1, "{}\n", names.data[1].str); // Access the second element

 

     c_foreach (i, cvec_str, names)

-        c_print(0, "item: {}\n", i.val->str);

+        c_print(1, "item: {}\n", i.val->str);

     cvec_str_del(&names);

 }

 // Output:

@@ -252,13 +252,13 @@ item: 2 elements so far
 

 int main() {

     cstr_t s1 = cstr_from("one-nine-three-seven-five");

-    c_print(0, "{}.\n", s1.str);

+    c_print(1, "{}.\n", s1.str);

 

     cstr_insert(&s1, 3, "-two");

-    c_print(0, "{}.\n", s1.str);

+    c_print(1, "{}.\n", s1.str);

 

     cstr_erase(&s1, 7, 5); // -nine

-    c_print(0, "{}.\n", s1.str);

+    c_print(1, "{}.\n", s1.str);

 

     cstr_replace(&s1, cstr_find(&s1, "seven"), 5, "four");

     c_print(stderr, "{}.\n", s1.str);

@@ -270,7 +270,7 @@ int main() {
 

     cstr_t full_path cstr_init;

     c_print(&full_path, "{}/{}.{}", "directory", "filename", "ext");

-    c_print(1, "{}\n", full_path.str); // 1 = stderr

+    c_print(2, "{}\n", full_path.str); // 2 = stderr

 

     c_del(cstr, &s1, &full_path);

 }

@@ -297,7 +297,7 @@ int main() {
     cmap_ii_put(&nums, 8, 64); // similar to insert_or_assign()

     cmap_ii_emplace(&nums, 11, 121);

 

-    c_print(0, "{}\n", cmap_ii_find(&nums, 8)->second);

+    c_print(1, "{}\n", cmap_ii_find(&nums, 8)->second);

     cmap_ii_del(&nums);

 

     // -- map of str --

@@ -307,9 +307,9 @@ int main() {
     cmap_str_emplace(&strings, "Sunny", "afternoon");

     c_push_items(&strings, cmap_str, { {"Eleven", "XI"}, {"Six", "VI"} });

 

-    c_print(0, "size = {}\n", cmap_str_size(strings));

+    c_print(1, "size = {}\n", cmap_str_size(strings));

     c_foreach (i, cmap_str, strings)

-        c_print(0, "{}: {}\n", i.val->first.str, i.val->second.str);

+        c_print(1, "{}: {}\n", i.val->first.str, i.val->second.str);

     cmap_str_del(&strings); // frees all strings and map.

 }

 // Output:

@@ -338,7 +338,7 @@ int main() {
 

     // iterate the set of cstr_t values:

     c_foreach (i, cset_str, words)

-        c_print(0, "{} ", i.val->str);

+        c_print(1, "{} ", i.val->str);

     cset_str_del(&words);

 }

 // Output:

@@ -365,13 +365,13 @@ int main() {
 

     printf("initial: ");

     c_foreach (i, clist_fx, list)

-        c_print(0, " {:.16}", *i.val);

+        c_print(1, " {:.16}", *i.val);

 

     clist_fx_sort(&list); // mergesort O(n*log n)

 

     printf("\nsorted: ");

     c_foreach (i, clist_fx, list)

-        c_print(0, " {:10f}", *i.val);

+        c_print(1, " {:10f}", *i.val);

 

     clist_fx_del(&list);

 }

@@ -403,7 +403,7 @@ int main()
 

     // Extract and disply the fifty smallest.

     c_forrange (50) {

-        c_print(0, "{} ", *cpqueue_i_top(&heap));

+        c_print(1, "{} ", *cpqueue_i_top(&heap));

         cpqueue_i_pop(&heap);

     }

     cpqueue_i_del(&heap);

@@ -431,7 +431,7 @@ int main() {
         cqueue_i_pop(&queue);

 

     c_foreach (i, cqueue_i, queue)

-        c_print(0, " {}", *i.val);

+        c_print(1, " {}", *i.val);

 

     cqueue_i_del(&queue);

 }

@@ -571,10 +571,10 @@ void display_hist(cvec_mi hist, int scale, int mean, int stddev)
         int k = (int) (i.val->second * stddev * scale * 25ull / 10 / n);

         if (k > 0) {

             cstr_take(&bar, cstr_with_size(k, '*'));

-            c_print(0, "{:4} {}\n", i.val->first, bar.str);

+            c_print(1, "{:4} {}\n", i.val->first, bar.str);

         }

     }

-    c_print(0, "Normal distribution with mean={}, stddev={}. '*' = {:.0f} samples out of {}.\n",

+    c_print(1, "Normal distribution with mean={}, stddev={}. '*' = {:.0f} samples out of {}.\n",

            mean, stddev, n / (2.5 * stddev * scale), n);

     cstr_del(&bar);

 }

diff --git a/examples/benchmark.c b/examples/benchmark.c
index 01295054..f831f417 100644
--- a/examples/benchmark.c
+++ b/examples/benchmark.c
@@ -151,7 +151,7 @@ int rr = RR;
         erased += M##_ERASE(X, RAND(rr)); \

     } \

     difference = clock() - before; \

-    c_print(0, #M ": time: {:5.02f}, sum: {}, erased {}, size: {}, buckets: {:8}\n", \

+    c_print(1, #M ": time: {:5.02f}, sum: {}, erased {}, size: {}, buckets: {:8}\n", \

            (float) difference / CLOCKS_PER_SEC, checksum, erased, (size_t) M##_SIZE(X), (size_t) M##_BUCKETS(X)); \

     M##_CLEAR(X); \

 }

@@ -166,7 +166,7 @@ int rr = RR;
     for (size_t i = 0; i < N2; ++i) \

         erased += M##_ERASE(X, i); \

     difference = clock() - before; \

-    c_print(0, #M ": time: {:5.02f}, erased {}, size: {}, buckets: {:8}\n", \

+    c_print(1, #M ": time: {:5.02f}, erased {}, size: {}, buckets: {:8}\n", \

            (float) difference / CLOCKS_PER_SEC, erased, (size_t) M##_SIZE(X), (size_t) M##_BUCKETS(X)); \

     M##_CLEAR(X); \

 }

@@ -183,7 +183,7 @@ int rr = RR;
     for (size_t i = 0; i < N3; ++i) \

         erased += M##_ERASE(X, RAND(rr)); \

     difference = clock() - before; \

-    c_print(0, #M ": time: {:5.02f}, erased {}, size: {}, buckets: {:8}\n", \

+    c_print(1, #M ": time: {:5.02f}, erased {}, size: {}, buckets: {:8}\n", \

            (float) difference / CLOCKS_PER_SEC, erased, (size_t) M##_SIZE(X), (size_t) M##_BUCKETS(X)); \

     M##_CLEAR(X); \

 }

@@ -199,7 +199,7 @@ int rr = RR;
     for (int k=0; k<5; k++) M##_FOR (X, i) \

         sum += M##_ITEM(X, i); \

     difference = clock() - before; \

-    c_print(0, #M ": time: {:5.02f}, sum {}, size: {}, buckets: {:8}\n", \

+    c_print(1, #M ": time: {:5.02f}, sum {}, size: {}, buckets: {:8}\n", \

            (float) difference / CLOCKS_PER_SEC, sum, (size_t) M##_SIZE(X), (size_t) M##_BUCKETS(X)); \

     M##_CLEAR(X); \

 }

@@ -219,16 +219,16 @@ int main(int argc, char* argv[])
 {

     rr = argc == 2 ? atoi(argv[1]) : RR;

     seed = time(NULL);

-    c_print(0, "\nRandom keys are in range [0, 2^{}), seed = {}:\n",  rr, seed);

-    c_print(0, "\nUnordered maps: {} repeats of Insert random key + try to remove a random key:\n", N1);

+    c_print(1, "\nRandom keys are in range [0, 2^{}), seed = {}:\n",  rr, seed);

+    c_print(1, "\nUnordered maps: {} repeats of Insert random key + try to remove a random key:\n", N1);

     RUN_TEST(1)

 

-    c_print(0, "\nUnordered maps: Insert {} index keys, then remove them in same order:\n", N2);

+    c_print(1, "\nUnordered maps: Insert {} index keys, then remove them in same order:\n", N2);

     RUN_TEST(2)

 

-    c_print(0, "\nUnordered maps: Insert {} random keys, then remove them in same order:\n", N3);

+    c_print(1, "\nUnordered maps: Insert {} random keys, then remove them in same order:\n", N3);

     RUN_TEST(3)

 

-    c_print(0, "\nUnordered maps: Iterate {} random keys:\n", N4);

+    c_print(1, "\nUnordered maps: Iterate {} random keys:\n", N4);

     RUNX_TEST(4)

 }

diff --git a/examples/share_ptr.c b/examples/share_ptr.c
index 923d4535..481cfdd6 100644
--- a/examples/share_ptr.c
+++ b/examples/share_ptr.c
@@ -11,7 +11,7 @@ Person* Person_make(Person* p, const char* name, const char* last) {
     return p;

 }

 void Person_del(Person* p) {

-    c_print(0, "del: {}\n", p->name.str);

+    c_print(1, "del: {}\n", p->name.str);

     c_del(cstr, &p->name, &p->last);

 }

 int Person_compare(const Person* p, const Person* q) {

@@ -40,7 +40,7 @@ int main() {
         cvec_pe_push_back(&vec, csptr_pe_share(p)); // Don't forget to share!

     }

     c_foreach (i, clist_pe, queue)

-        c_print(0, " {}\n", i.val->get->name.str);

+        c_print(1, " {}\n", i.val->get->name.str);

 

     puts("Sort and pop 3:");

     clist_pe_sort(&queue);

@@ -52,18 +52,18 @@ int main() {
 

     puts("Sorted queue:");

     c_foreach (i, clist_pe, queue)

-        c_print(0, " {}\n", i.val->get->name.str);

+        c_print(1, " {}\n", i.val->get->name.str);

     puts("Sorted vec:");

     c_foreach (i, cvec_pe, vec)

-        c_print(0, " {}\n", i.val->get->name.str);

+        c_print(1, " {}\n", i.val->get->name.str);

 

     Person lost; Person_make(&lost, "Name 5", "Last 5");

     csptr_pe ptmp = {&lost, NULL}; // share pointer without counter - OK.

     clist_pe_iter_t lit = clist_pe_find(&queue, ptmp);

     Person_del(&lost);

-    if (lit.val) c_print(0, "Found: {}\n", lit.val->get->name.str);

+    if (lit.val) c_print(1, "Found: {}\n", lit.val->get->name.str);

 

-    c_print(0, "use {}\n", *joe.use_count);

+    c_print(1, "use {}\n", *joe.use_count);

     csptr_pe_del(&joe);

 

     puts("Destroy queue:");

diff --git a/stc/cfmt.h b/stc/cfmt.h
index 0f60a098..d2fd5feb 100644
--- a/stc/cfmt.h
+++ b/stc/cfmt.h
@@ -34,13 +34,13 @@ int main() {
     time_t rawtime = time(NULL);

     struct tm* tm = localtime(&rawtime);

     unsigned char r = 123, g = 214, b = 90, w = 110;

-    c_print(0, "Date: {} {}\n", c_ftime("%Y-%m-%d %X %Z", tm), test);

-    c_print(0, "Color: ({} {} {}), {}\n", r, g, b, flag);

-    c_print(0, "{:10}, {:10}, {:.2f}\n", 42, 43, 3.141592267);

+    c_print(1, "Date: {} {}\n", c_ftime("%Y-%m-%d %X %Z", tm), test);

+    c_print(1, "Color: ({} {} {}), {}\n", r, g, b, flag);

+    c_print(1, "{:10}, {:10}, {:.2f}\n", 42, 43, 3.141592267);

     c_print(stdout, "{:10} {:10} {:10}\n", z, z, w);

     c_print(stderr, "100%: {} {:.*} {}\n", string.str, 4, pi, x);

     c_print(&string, "Precision: {} {:.16} {}", string.str, pi, x);

-    c_print(0, "{}\nvector: ({}, {}, {})\n", string.str, 3.2, 3.3, 4.2/3.2);

+    c_print(1, "{}\nvector: ({}, {}, {})\n", string.str, 3.2, 3.3, 4.2/3.2);

     cstr_del(&string);

 }

 */

@@ -178,7 +178,7 @@ STC_DEF void
 _cfmt_printf(int s, const char* fmt, ...) {

     va_list args;

     va_start(args, fmt);

-    vfprintf(s ? stderr : stdout, fmt, args);

+    vfprintf(s == 1 ? stdout : stderr, fmt, args);

     va_end(args);

 }