cstr V4: Changed cstr functions to take pointers to self, not values. This is consistent with the rest of the containers. csview will still use values, as it is designed to be passed by value.

7 files changed, 14 insertions, 14 deletions

diff --git a/examples/astar.c b/examples/astar.c
index 7d90bf35..cb498b11 100644
--- a/examples/astar.c
+++ b/examples/astar.c
@@ -37,7 +37,7 @@ point_equal(const point* a, const point* b)
 point
 point_from(const cstr* maze, const char* c, int width)
 {
-    int index = cstr_find(*maze, c);
+    int index = cstr_find(maze, c);
     return point_init(index % width, index / width, width);
 }
 
@@ -156,7 +156,7 @@ main(void)
         "#   #                   #           #               #               #   #\n"
         "#########################################################################\n"), cstr_drop(&maze))
     {
-        int width = cstr_find(maze, "\n") + 1;
+        int width = cstr_find(&maze, "\n") + 1;
         c_autovar (cdeq_point path = astar(&maze, width), cdeq_point_drop(&path))
         {
             c_foreach (it, cdeq_point, path) cstr_data(&maze)[point_index(it.ref)] = 'x';
diff --git a/examples/cstr_match.c b/examples/cstr_match.c
index 6927ed80..317ff986 100644
--- a/examples/cstr_match.c
+++ b/examples/cstr_match.c
@@ -5,18 +5,18 @@
 int main()
 {
     c_autovar (cstr ss = cstr_new("The quick brown fox jumps over the lazy dog.JPG"), cstr_drop(&ss)) {
-        size_t pos = cstr_find_at(ss, 0, "brown");
+        size_t pos = cstr_find_at(&ss, 0, "brown");
         printf("%" PRIuMAX " [%s]\n", pos, pos == cstr_npos ? "<NULL>" : cstr_str(&ss) + pos);
-        printf("equals: %d\n", cstr_equals(ss, "The quick brown fox jumps over the lazy dog.JPG"));
-        printf("contains: %d\n", cstr_contains(ss, "umps ove"));
-        printf("starts_with: %d\n", cstr_starts_with(ss, "The quick brown"));
-        printf("ends_with: %d\n", cstr_ends_with(ss, ".jpg"));
-        printf("ends_with: %d\n", cstr_ends_with(ss, ".JPG"));
+        printf("equals: %d\n", cstr_equals(&ss, "The quick brown fox jumps over the lazy dog.JPG"));
+        printf("contains: %d\n", cstr_contains(&ss, "umps ove"));
+        printf("starts_with: %d\n", cstr_starts_with(&ss, "The quick brown"));
+        printf("ends_with: %d\n", cstr_ends_with(&ss, ".jpg"));
+        printf("ends_with: %d\n", cstr_ends_with(&ss, ".JPG"));
 
         cstr s1 = cstr_new("hell😀 w😀rl🐨");
         csview ch1 = cstr_u8_chr(&s1, 7);
         csview ch2 = cstr_u8_chr(&s1, 10);
-        printf("%s\nsize: %" PRIuMAX ", %" PRIuMAX "\n", cstr_str(&s1), cstr_u8_size(s1), cstr_size(s1));
+        printf("%s\nsize: %" PRIuMAX ", %" PRIuMAX "\n", cstr_str(&s1), cstr_u8_size(&s1), cstr_size(&s1));
         printf("ch1: %.*s\n", c_ARGsv(ch1));
         printf("ch2: %.*s\n", c_ARGsv(ch2));
     }
diff --git a/examples/demos.c b/examples/demos.c
index 052c4e32..cd715d46 100644
--- a/examples/demos.c
+++ b/examples/demos.c
@@ -19,7 +19,7 @@ void stringdemo1()
         cstr_take(&cs, cstr_from_fmt("%s *** %s", cstr_str(&cs), cstr_str(&cs)));
         printf("%s.\n", cstr_str(&cs));
 
-        printf("find \"four\": %s\n", cstr_str(&cs) + cstr_find(cs, "four"));
+        printf("find \"four\": %s\n", cstr_str(&cs) + cstr_find(&cs, "four"));
 
         // reassign:
         cstr_assign(&cs, "one two three four five six seven");
diff --git a/examples/music_arc.c b/examples/music_arc.c
index d933d125..02470b0f 100644
--- a/examples/music_arc.c
+++ b/examples/music_arc.c
@@ -40,7 +40,7 @@ void example3()
         }) SongVec_emplace(&vec, *v);
 
         c_foreach (s, SongVec, vec)
-            if (!cstr_equals(s.ref->get->artist, "Bob Dylan"))
+            if (!cstr_equals(&s.ref->get->artist, "Bob Dylan"))
                 SongVec_push_back(&vec2, SongArc_clone(*s.ref));
 
         SongVec_emplace(&vec2, Song_from("Michael Jackson", "Billie Jean"));
diff --git a/examples/regex1.c b/examples/regex1.c
index 5981e878..c8b3a4f5 100644
--- a/examples/regex1.c
+++ b/examples/regex1.c
@@ -19,7 +19,7 @@ int main(int argc, char* argv[])
             cstr_getline(&input, stdin);
 
             // Exit when the user inputs q
-            if (cstr_equals(input, "q"))
+            if (cstr_equals(&input, "q"))
                 break;
 
             if (cregex_is_match(cstr_str(&input), &float_expr))
diff --git a/examples/sso_map.c b/examples/sso_map.c
index a32a9a3d..43bcb40b 100644
--- a/examples/sso_map.c
+++ b/examples/sso_map.c
@@ -11,7 +11,7 @@ int main()
 
         c_forpair (k, v, cmap_str, m)
             printf("%s: '%s' Len=%" PRIuMAX ", Is long: %s\n", 
-                   cstr_str(_.k), cstr_str(_.v), cstr_size(*_.v),
+                   cstr_str(_.k), cstr_str(_.v), cstr_size(_.v),
                    cstr_is_long(_.v)?"true":"false");
     }
 }
diff --git a/examples/sso_substr.c b/examples/sso_substr.c
index b47512ea..098d9b4b 100644
--- a/examples/sso_substr.c
+++ b/examples/sso_substr.c
@@ -6,7 +6,7 @@ int main ()
 {
     cstr str = cstr_new("We think in generalities, but we live in details.");
     csview sv1 = cstr_substr_ex(&str, 3, 5);               // "think"
-    size_t pos = cstr_find(str, "live");                   // position of "live"
+    size_t pos = cstr_find(&str, "live");                  // position of "live"
     csview sv2 = cstr_substr_ex(&str, pos, 4);             // "live"
     csview sv3 = cstr_slice_ex(&str, -8, -1);              // "details"
     printf("%.*s, %.*s, %.*s\n", c_ARGsv(sv1), c_ARGsv(sv2), c_ARGsv(sv3));