Changeset 08e103d4 in mainline for kernel/generic/src/console/kconsole.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/console/kconsole.c (modified) (16 diffs)

kernel/generic/src/console/kconsole.c

@@ -167 +167 @@
 {
         link_t **startpos = (link_t **) ctx;
-        size_t namelen = str_length(name);
+        size_t namelen = str_code_points(name);
 
         spinlock_lock(&cmd_lock);
@@ -178 +178 @@
 
                 const char *curname = hlp->name;
-                if (str_length(curname) < namelen)
+                if (str_code_points(curname) < namelen)
                         continue;
 
@@ -187 +187 @@
 
                         spinlock_unlock(&cmd_lock);
-                        return (curname + str_lsize(curname, namelen));
+                        return (curname + str_lbytes(curname, namelen));
                 }
         }
@@ -233 +233 @@
 
         while ((hint = hints_enum(name, NULL, &pos))) {
-                if ((found == 0) || (str_length(hint) > str_length(output)))
+                if ((found == 0) || (str_code_points(hint) > str_code_points(output)))
                         str_cpy(output, MAX_CMDLINE, hint);
 
@@ -249 +249 @@
         }
 
-        if ((found > 1) && (str_length(output) != 0)) {
+        if ((found > 1) && (str_code_points(output) != 0)) {
                 printf("\n");
                 pos = NULL;
@@ -358 +358 @@
                                 putwchar('\b');
                                 printf("%ls ", current + position);
-                                print_cc('\b', wstr_length(current) - position + 1);
+                                print_cc('\b', wstr_code_points(current) - position + 1);
                                 continue;
                         }
@@ -440 +440 @@
                                 printf("%s> ", prompt);
                                 printf("%ls", current);
-                                position += str_length(tmp);
-                                print_cc('\b', wstr_length(current) - position);
+                                position += str_code_points(tmp);
+                                print_cc('\b', wstr_code_points(current) - position);
                                 continue;
                         }
@@ -448 +448 @@
 
                         printf("%ls", current + position);
-                        position += str_length(tmp);
-                        print_cc('\b', wstr_length(current) - position);
-
-                        if (position == wstr_length(current)) {
+                        position += str_code_points(tmp);
+                        print_cc('\b', wstr_code_points(current) - position);
+
+                        if (position == wstr_code_points(current)) {
                                 /* Insert a space after the last completed argument */
                                 if (wstr_linsert(current, ' ', position, MAX_CMDLINE)) {
@@ -472 +472 @@
                 if (ch == U_RIGHT_ARROW) {
                         /* Right */
-                        if (position < wstr_length(current)) {
+                        if (position < wstr_code_points(current)) {
                                 putwchar(current[position]);
                                 position++;
@@ -482 +482 @@
                         /* Up, down */
                         print_cc('\b', position);
-                        print_cc(' ', wstr_length(current));
-                        print_cc('\b', wstr_length(current));
+                        print_cc(' ', wstr_code_points(current));
+                        print_cc('\b', wstr_code_points(current));
 
                         if (ch == U_UP_ARROW) {
@@ -498 +498 @@
                         current = history[history_pos];
                         printf("%ls", current);
-                        position = wstr_length(current);
+                        position = wstr_code_points(current);
                         continue;
                 }
@@ -512 +512 @@
                         /* End */
                         printf("%ls", current + position);
-                        position = wstr_length(current);
+                        position = wstr_code_points(current);
                         continue;
                 }
@@ -518 +518 @@
                 if (ch == U_DELETE) {
                         /* Delete */
-                        if (position == wstr_length(current))
+                        if (position == wstr_code_points(current))
                                 continue;
 
                         if (wstr_remove(current, position)) {
                                 printf("%ls ", current + position);
-                                print_cc('\b', wstr_length(current) - position + 1);
+                                print_cc('\b', wstr_code_points(current) - position + 1);
                         }
                         continue;
@@ -531 +531 @@
                         printf("%ls", current + position);
                         position++;
-                        print_cc('\b', wstr_length(current) - position);
-                }
-        }
-
-        if (wstr_length(current) > 0) {
+                        print_cc('\b', wstr_code_points(current) - position);
+                }
+        }
+
+        if (wstr_code_points(current) > 0) {
                 history_pos++;
                 history_pos = history_pos % KCONSOLE_HISTORY;
@@ -690 +690 @@
 
                 if (str_lcmp(hlp->name, cmdline + start,
-                    max(str_length(hlp->name),
-                    str_nlength(cmdline + start, (size_t) (end - start)))) == 0) {
+                    max(str_code_points(hlp->name),
+                    str_ncode_points(cmdline + start, (size_t) (end - start)))) == 0) {
                         cmd = hlp;
                         break;
@@ -826 +826 @@
         while (true) {
                 wchar_t *tmp = clever_readline((char *) prompt, stdin, buffer);
-                size_t len = wstr_length(tmp);
+                size_t len = wstr_code_points(tmp);
                 if (!len)
                         continue;