Changeset 08e103d4 in mainline for boot/generic

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".

Location:

boot/generic

Files:

• include/str.h (modified) (1 diff)
• src/printf_core.c (modified) (3 diffs)
• src/str.c (modified) (3 diffs)

boot/generic/include/str.h

@@ -48 +48 @@
 extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz);
 
-extern size_t str_size(const char *str);
-extern size_t str_lsize(const char *str, size_t max_len);
-extern size_t str_length(const char *str);
+extern size_t str_bytes(const char *str);
+extern size_t str_lbytes(const char *str, size_t max_len);
+extern size_t str_code_points(const char *str);
 
 extern bool ascii_check(wchar_t ch);

boot/generic/src/printf_core.c

@@ -138 +138 @@
 {
         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);
 }
 
@@ -213 +213 @@
 
         /* Print leading spaces. */
-        size_t strw = str_length(str);
+        size_t strw = str_code_points(str);
         if ((precision == 0) || (precision > strw))
                 precision = strw;
@@ -229 +229 @@
         /* 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;

boot/generic/src/str.c

@@ -279 +279 @@
  *
  */
-size_t str_size(const char *str)
+size_t str_bytes(const char *str)
 {
         size_t size = 0;
@@ -302 +302 @@
  *
  */
-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;
@@ -324 +324 @@
  *
  */
-size_t str_length(const char *str)
+size_t str_code_points(const char *str)
 {
         size_t len = 0;