Changeset 08e103d4 in mainline for kernel/generic/src/printf/printf_core.c

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/printf/printf_core.c (modified) (5 diffs)

kernel/generic/src/printf/printf_core.c

@@ -156 +156 @@
 {
         if (str == NULL)
-                return printf_putnchars(nullstr, str_size(nullstr), ps);
-
-        return ps->str_write((void *) str, str_size(str), ps->data);
+                return printf_putnchars(nullstr, str_bytes(nullstr), ps);
+
+        return ps->str_write((void *) str, str_bytes(str), ps->data);
 }
 
@@ -285 +285 @@
 
         /* Print leading spaces. */
-        size_t strw = str_length(str);
+        size_t strw = str_code_points(str);
         if ((precision == 0) || (precision > strw))
                 precision = strw;
@@ -301 +301 @@
         /* Part of @a str fitting into the alloted space. */
         int retval;
-        size_t size = str_lsize(str, precision);
+        size_t size = str_lbytes(str, precision);
         if ((retval = printf_putnchars(str, size, ps)) < 0)
                 return -counter;
@@ -333 +333 @@
 
         /* Print leading spaces. */
-        size_t strw = wstr_length(str);
+        size_t strw = wstr_code_points(str);
         if ((precision == 0) || (precision > strw))
                 precision = strw;
@@ -349 +349 @@
         /* Part of @a wstr fitting into the alloted space. */
         int retval;
-        size_t size = wstr_lsize(str, precision);
+        size_t size = wstr_lbytes(str, precision);
         if ((retval = printf_wputnchars(str, size, ps)) < 0)
                 return -counter;