Harmonize UTF-8 parameter names
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/814aea8d Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/814aea8d Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/814aea8d Branch: refs/heads/master Commit: 814aea8df126be99b2f8b701dc374959e2c02c20 Parents: b8c722b Author: Nick Wellnhofer <[email protected]> Authored: Mon Jan 11 19:13:17 2016 +0100 Committer: Nick Wellnhofer <[email protected]> Committed: Wed Feb 3 15:35:36 2016 +0100 ---------------------------------------------------------------------- runtime/core/Clownfish/CharBuf.cfh | 4 ++-- runtime/core/Clownfish/Hash.cfh | 6 +++--- runtime/core/Clownfish/String.cfh | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/814aea8d/runtime/core/Clownfish/CharBuf.cfh ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/CharBuf.cfh b/runtime/core/Clownfish/CharBuf.cfh index 20af51f..1b61879 100644 --- a/runtime/core/Clownfish/CharBuf.cfh +++ b/runtime/core/Clownfish/CharBuf.cfh @@ -36,13 +36,13 @@ public final class Clownfish::CharBuf nickname CB /** Concatenate the passed-in string onto the end of the CharBuf. */ public void - Cat_Utf8(CharBuf *self, const char *ptr, size_t size); + Cat_Utf8(CharBuf *self, const char *utf8, size_t size); /** Concatenate the supplied text onto the end of the CharBuf. Don't * check for UTF-8 validity. */ public void - Cat_Trusted_Utf8(CharBuf *self, const char *ptr, size_t size); + Cat_Trusted_Utf8(CharBuf *self, const char *utf8, size_t size); /** Concatenate the contents of `string` onto the end of the * caller. http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/814aea8d/runtime/core/Clownfish/Hash.cfh ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/Hash.cfh b/runtime/core/Clownfish/Hash.cfh index c0f9bc2..f653bfe 100644 --- a/runtime/core/Clownfish/Hash.cfh +++ b/runtime/core/Clownfish/Hash.cfh @@ -58,7 +58,7 @@ public final class Clownfish::Hash inherits Clownfish::Obj { Store(Hash *self, String *key, decremented nullable Obj *value); public void - Store_Utf8(Hash *self, const char *str, size_t len, + Store_Utf8(Hash *self, const char *utf8, size_t size, decremented nullable Obj *value); /** Fetch the value associated with `key`. @@ -69,7 +69,7 @@ public final class Clownfish::Hash inherits Clownfish::Obj { Fetch(Hash *self, String *key); public nullable Obj* - Fetch_Utf8(Hash *self, const char *key, size_t key_len); + Fetch_Utf8(Hash *self, const char *utf8, size_t size); /** Attempt to delete a key-value pair from the hash. * @@ -80,7 +80,7 @@ public final class Clownfish::Hash inherits Clownfish::Obj { Delete(Hash *self, String *key); public incremented nullable Obj* - Delete_Utf8(Hash *self, const char *key, size_t key_len); + Delete_Utf8(Hash *self, const char *utf8, size_t size); /** Indicate whether the supplied `key` is present. */ http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/814aea8d/runtime/core/Clownfish/String.cfh ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/String.cfh b/runtime/core/Clownfish/String.cfh index aa415a2..3d13311 100644 --- a/runtime/core/Clownfish/String.cfh +++ b/runtime/core/Clownfish/String.cfh @@ -122,13 +122,13 @@ public final class Clownfish::String nickname Str * character data after checking for validity. */ public incremented String* - Cat_Utf8(String *self, const char *ptr, size_t size); + Cat_Utf8(String *self, const char *utf8, size_t size); /** Return the concatenation of the String and the supplied UTF-8 * character data, skipping validity checks. */ public incremented String* - Cat_Trusted_Utf8(String *self, const char *ptr, size_t size); + Cat_Trusted_Utf8(String *self, const char *utf8, size_t size); public int64_t To_I64(String *self); @@ -149,7 +149,7 @@ public final class Clownfish::String nickname Str /** Test whether the String starts with `prefix`. */ public bool - Starts_With_Utf8(String *self, const char *prefix, size_t size); + Starts_With_Utf8(String *self, const char *utf8, size_t size); /** Test whether the String ends with `suffix`. */ @@ -159,7 +159,7 @@ public final class Clownfish::String nickname Str /** Test whether the String ends with `suffix`. */ public bool - Ends_With_Utf8(String *self, const char *suffix, size_t size); + Ends_With_Utf8(String *self, const char *utf8, size_t size); /** Test whether the String contains `substring`. */ @@ -169,7 +169,7 @@ public final class Clownfish::String nickname Str /** Test whether the String contains `substring`. */ public bool - Contains_Utf8(String *self, const char *ptr, size_t size); + Contains_Utf8(String *self, const char *utf8, size_t size); /** Return a [](StringIterator) pointing to the first occurrence of the * substring within the String, or [](@null) if the substring does not @@ -183,12 +183,12 @@ public final class Clownfish::String nickname Str * match. */ public incremented nullable StringIterator* - Find_Utf8(String *self, const char *ptr, size_t size); + Find_Utf8(String *self, const char *utf8, size_t size); /** Test whether the String matches the supplied UTF-8 character data. */ public bool - Equals_Utf8(String *self, const char *ptr, size_t size); + Equals_Utf8(String *self, const char *utf8, size_t size); /** Return the number of Unicode code points the String contains. */ @@ -375,7 +375,7 @@ public final class Clownfish::StringIterator nickname StrIter /** Test whether the content after the iterator starts with `prefix`. */ public bool - Starts_With_Utf8(StringIterator *self, const char *prefix, size_t size); + Starts_With_Utf8(StringIterator *self, const char *utf8, size_t size); /** Test whether the content before the iterator ends with * `suffix`. @@ -386,7 +386,7 @@ public final class Clownfish::StringIterator nickname StrIter /** Test whether the content before the iterator ends with `suffix`. */ public bool - Ends_With_Utf8(StringIterator *self, const char *suffix, size_t size); + Ends_With_Utf8(StringIterator *self, const char *utf8, size_t size); public void Destroy(StringIterator *self);
