Changeset 08e103d4 in mainline for uspace/lib/pcut/src

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/pcut/src

Files:

• assert.c (modified) (1 diff)
• internal.h (modified) (1 diff)
• main.c (modified) (1 diff)
• os/helenos.c (modified) (1 diff)
• os/stdc.c (modified) (1 diff)
• report/report.c (modified) (2 diffs)

uspace/lib/pcut/src/assert.c

@@ -70 +70 @@
 
         pcut_snprintf(current_buffer, MAX_MESSAGE_LENGTH, "%s:%d: ", filename, line);
-        offset = pcut_str_size(current_buffer);
+        offset = pcut_str_bytes(current_buffer);
 
         if (offset + 1 < MAX_MESSAGE_LENGTH) {

uspace/lib/pcut/src/internal.h

@@ -166 +166 @@
  * @return Size of @p s in bytes.
  */
-int pcut_str_size(const char *s);
+int pcut_str_bytes(const char *s);
 
 /** Convert string to integer.

uspace/lib/pcut/src/main.c

@@ -62 +62 @@
  */
 int pcut_is_arg_with_number(const char *arg, const char *opt, int *value) {
-        int opt_len = pcut_str_size(opt);
+        int opt_len = pcut_str_bytes(opt);
         if (! pcut_str_start_equals(arg, opt, opt_len)) {
                 return 0;

uspace/lib/pcut/src/os/helenos.c

@@ -55 +55 @@
 }
 
-int pcut_str_size(const char *s) {
-        return str_size(s);
+int pcut_str_bytes(const char *s) {
+        return str_bytes(s);
 }
 

uspace/lib/pcut/src/os/stdc.c

@@ -46 +46 @@
 }
 
-int pcut_str_size(const char *s) {
+int pcut_str_bytes(const char *s) {
         return strlen(s);
 }

uspace/lib/pcut/src/report/report.c

@@ -78 +78 @@
                 return;
         }
-        if (pcut_str_size(msg) == 0) {
+        if (pcut_str_bytes(msg) == 0) {
                 return;
         }
@@ -130 +130 @@
 
                 /* Determine the length of the text after the zeros. */
-                message_length = pcut_str_size(full_output);
+                message_length = pcut_str_bytes(full_output);
 
                 if (cont_zeros_count < 2) {