Changeset 08e103d4 in mainline for uspace/lib/c/generic/io

Timestamp:

2019-02-05T18:26:05Z (7 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:

uspace/lib/c/generic/io

Files:

• asprintf.c (modified) (2 diffs)
• io.c (modified) (1 diff)
• kio.c (modified) (1 diff)
• log.c (modified) (3 diffs)
• logctl.c (modified) (1 diff)
• printf_core.c (modified) (5 diffs)
• vprintf.c (modified) (1 diff)

uspace/lib/c/generic/io/asprintf.c

@@ -43 +43 @@
 static int asprintf_str_write(const char *str, size_t count, void *unused)
 {
-        return str_nlength(str, count);
+        return str_ncode_points(str, count);
 }
 
 static int asprintf_wstr_write(const wchar_t *str, size_t count, void *unused)
 {
-        return wstr_nlength(str, count);
+        return wstr_ncode_points(str, count);
 }
 
-int vprintf_length(const char *fmt, va_list args)
+int vprintf_code_points(const char *fmt, va_list args)
 {
         printf_spec_t ps = {
@@ -62 +62 @@
 }
 
-int printf_length(const char *fmt, ...)
+int printf_code_points(const char *fmt, ...)
 {
         va_list args;
         va_start(args, fmt);
-        int ret = vprintf_length(fmt, args);
+        int ret = vprintf_code_points(fmt, args);
         va_end(args);
 

uspace/lib/c/generic/io/io.c

@@ -774 +774 @@
 int fputs(const char *str, FILE *stream)
 {
-        (void) fwrite(str, str_size(str), 1, stream);
+        (void) fwrite(str, str_bytes(str), 1, stream);
         if (ferror(stream))
                 return EOF;

uspace/lib/c/generic/io/kio.c

@@ -137 +137 @@
         wr = 0;
         (void) kio_write(str, size, &wr);
-        return str_nlength(str, wr);
+        return str_ncode_points(str, wr);
 }
 

uspace/lib/c/generic/io/log.c

@@ -89 +89 @@
         aid_t reg_msg = async_send_2(exchange, LOGGER_WRITER_MESSAGE,
             log, level, NULL);
-        errno_t rc = async_data_write_start(exchange, message, str_size(message));
+        errno_t rc = async_data_write_start(exchange, message, str_bytes(message));
         errno_t reg_msg_rc;
         async_wait_for(reg_msg, &reg_msg_rc);
@@ -144 +144 @@
         char *end_ptr;
         int level_int = strtol(name, &end_ptr, 0);
-        if ((end_ptr == name) || (str_length(end_ptr) != 0))
+        if ((end_ptr == name) || (str_code_points(end_ptr) != 0))
                 return EINVAL;
         if (level_int < 0)
@@ -199 +199 @@
         aid_t reg_msg = async_send_1(exchange, LOGGER_WRITER_CREATE_LOG,
             parent, &answer);
-        errno_t rc = async_data_write_start(exchange, name, str_size(name));
+        errno_t rc = async_data_write_start(exchange, name, str_bytes(name));
         errno_t reg_msg_rc;
         async_wait_for(reg_msg, &reg_msg_rc);

uspace/lib/c/generic/io/logctl.c

@@ -110 +110 @@
         aid_t reg_msg = async_send_1(exchange, LOGGER_CONTROL_SET_LOG_LEVEL,
             new_level, NULL);
-        rc = async_data_write_start(exchange, logname, str_size(logname));
+        rc = async_data_write_start(exchange, logname, str_bytes(logname));
         errno_t reg_msg_rc;
         async_wait_for(reg_msg, &reg_msg_rc);

uspace/lib/c/generic/io/printf_core.c

@@ -204 +204 @@
 {
         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);
 }
 
@@ -332 +332 @@
                 return printf_putstr(nullstr, ps);
 
-        size_t strw = str_length(str);
+        size_t strw = str_code_points(str);
 
         /* Precision unspecified - print everything. */
@@ -350 +350 @@
         /* 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;
@@ -381 +381 @@
                 return printf_putstr(nullstr, ps);
 
-        size_t strw = wstr_length(str);
+        size_t strw = wstr_code_points(str);
 
         /* Precision not specified - print everything. */
@@ -399 +399 @@
         /* 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;

uspace/lib/c/generic/io/vprintf.c

@@ -45 +45 @@
 {
         size_t wr = fwrite(str, 1, size, (FILE *) stream);
-        return str_nlength(str, wr);
+        return str_ncode_points(str, wr);
 }