Changeset 08e103d4 in mainline for kernel/generic/src/lib

Timestamp:

2019-02-05T18:26:05Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

1d2f85e

Parents:

d066259

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-05 16:16:55)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-05 18:26:05)

Message:

Use clearer naming for string length functions

This and the following commit change the names of functions, as well as
their documentation, to use unambiguous terms "bytes" and "code points"
instead of ambiguous terms "size", "length", and "characters".

File:

• kernel/generic/src/lib/str.c (modified) (13 diffs)

kernel/generic/src/lib/str.c

@@ -288 +288 @@
  *
  */
-size_t str_size(const char *str)
+size_t str_bytes(const char *str)
 {
         size_t size = 0;
@@ -308 +308 @@
  *
  */
-size_t wstr_size(const wchar_t *str)
-{
-        return (wstr_length(str) * sizeof(wchar_t));
+size_t wstr_bytes(const wchar_t *str)
+{
+        return (wstr_code_points(str) * sizeof(wchar_t));
 }
 
@@ -326 +326 @@
  *
  */
-size_t str_lsize(const char *str, size_t max_len)
+size_t str_lbytes(const char *str, size_t max_len)
 {
         size_t len = 0;
@@ -354 +354 @@
  *
  */
-size_t wstr_lsize(const wchar_t *str, size_t max_len)
-{
-        return (wstr_nlength(str, max_len * sizeof(wchar_t)) * sizeof(wchar_t));
+size_t wstr_lbytes(const wchar_t *str, size_t max_len)
+{
+        return (wstr_ncode_points(str, max_len * sizeof(wchar_t)) * sizeof(wchar_t));
 }
 
@@ -366 +366 @@
  *
  */
-size_t str_length(const char *str)
+size_t str_code_points(const char *str)
 {
         size_t len = 0;
@@ -384 +384 @@
  *
  */
-size_t wstr_length(const wchar_t *wstr)
+size_t wstr_code_points(const wchar_t *wstr)
 {
         size_t len = 0;
@@ -402 +402 @@
  *
  */
-size_t str_nlength(const char *str, size_t size)
+size_t str_ncode_points(const char *str, size_t size)
 {
         size_t len = 0;
@@ -421 +421 @@
  *
  */
-size_t wstr_nlength(const wchar_t *str, size_t size)
+size_t wstr_ncode_points(const wchar_t *str, size_t size)
 {
         size_t len = 0;
@@ -508 +508 @@
  * Do a char-by-char comparison of two NULL-terminated strings.
  * The strings are considered equal iff
- * min(str_length(s1), max_len) == min(str_length(s2), max_len)
+ * min(str_code_points(s1), max_len) == min(str_code_points(s2), max_len)
  * and both strings consist of the same sequence of characters,
  * up to max_len characters.
@@ -690 +690 @@
 bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos)
 {
-        size_t len = wstr_length(str);
+        size_t len = wstr_code_points(str);
 
         if ((pos > len) || (pos + 1 > max_pos))
@@ -718 +718 @@
 bool wstr_remove(wchar_t *str, size_t pos)
 {
-        size_t len = wstr_length(str);
+        size_t len = wstr_code_points(str);
 
         if (pos >= len)
@@ -748 +748 @@
 char *str_dup(const char *src)
 {
-        size_t size = str_size(src) + 1;
+        size_t size = str_bytes(src) + 1;
         char *dest = malloc(size);
         if (!dest)
@@ -779 +779 @@
 char *str_ndup(const char *src, size_t n)
 {
-        size_t size = str_size(src);
+        size_t size = str_bytes(src);
         if (size > n)
                 size = n;