Changeset 08e103d4 in mainline for uspace/lib/c/include

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/include

Files:

• io/klog.h (modified) (1 diff)
• stdio.h (modified) (1 diff)
• str.h (modified) (1 diff)

uspace/lib/c/include/io/klog.h

@@ -51 +51 @@
         errno_t _rc = ENOMEM; \
         if (asprintf(&_s, fmt, ##__VA_ARGS__) >= 0) { \
-                _rc = klog_write((lvl), _s, str_size(_s)); \
+                _rc = klog_write((lvl), _s, str_bytes(_s)); \
                 free(_s); \
         }; \

uspace/lib/c/include/stdio.h

@@ -204 +204 @@
 };
 
-extern int vprintf_length(const char *, va_list);
-extern int printf_length(const char *, ...)
+extern int vprintf_code_points(const char *, va_list);
+extern int printf_code_points(const char *, ...)
     _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern FILE *fdopen(int, const char *);

uspace/lib/c/include/str.h

@@ -68 +68 @@
 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 wstr_size(const wchar_t *str);
+extern size_t str_bytes(const char *str);
+extern size_t wstr_bytes(const wchar_t *str);
 
-extern size_t str_nsize(const char *str, size_t max_size);
-extern size_t wstr_nsize(const wchar_t *str, size_t max_size);
+extern size_t str_nbytes(const char *str, size_t max_size);
+extern size_t wstr_nbytes(const wchar_t *str, size_t max_size);
 
-extern size_t str_lsize(const char *str, size_t max_len);
-extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
+extern size_t str_lbytes(const char *str, size_t max_len);
+extern size_t wstr_lbytes(const wchar_t *str, size_t max_len);
 
-extern size_t str_length(const char *str);
-extern size_t wstr_length(const wchar_t *wstr);
+extern size_t str_code_points(const char *str);
+extern size_t wstr_code_points(const wchar_t *wstr);
 
-extern size_t str_nlength(const char *str, size_t size);
-extern size_t wstr_nlength(const wchar_t *str, size_t size);
+extern size_t str_ncode_points(const char *str, size_t size);
+extern size_t wstr_ncode_points(const wchar_t *str, size_t size);
 
 extern size_t chr_width(wchar_t ch);