Changeset 08e103d4 in mainline for uspace/lib/clui/tinput.c

Timestamp:

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

• uspace/lib/clui/tinput.c (modified) (7 diffs)

uspace/lib/clui/tinput.c

@@ -203 +203 @@
 
         ti->prompt_coord = row0 * ti->con_cols + col0;
-        ti->text_coord = ti->prompt_coord + str_length(ti->prompt);
+        ti->text_coord = ti->prompt_coord + str_code_points(ti->prompt);
 
         tinput_display_prompt(ti);
@@ -243 +243 @@
 static void tinput_insert_string(tinput_t *ti, const char *str)
 {
-        size_t ilen = min(str_length(str), INPUT_MAX_SIZE - ti->nc);
+        size_t ilen = min(str_code_points(str), INPUT_MAX_SIZE - ti->nc);
         if (ilen == 0)
                 return;
@@ -467 +467 @@
 {
         str_to_wstr(ti->buffer, INPUT_MAX_SIZE, str);
-        ti->nc = wstr_length(ti->buffer);
+        ti->nc = wstr_code_points(ti->buffer);
         ti->pos = ti->nc;
         ti->sel_start = ti->pos;
@@ -579 +579 @@
         ti->hpos += offs;
 
-        int pad = (int) ti->nc - str_length(ti->history[ti->hpos]);
+        int pad = (int) ti->nc - str_code_points(ti->history[ti->hpos]);
         if (pad < 0)
                 pad = 0;
@@ -727 +727 @@
                 size_t cplen;
 
-                cplen = str_length(compl[0]);
+                cplen = str_code_points(compl[0]);
                 for (i = 1; i < cnum; i++)
                         cplen = min(cplen, common_pref_len(compl[0], compl[i]));
 
                 /* Compute how many bytes we should skip. */
-                size_t istart = str_lsize(compl[0], ti->pos - cstart);
+                size_t istart = str_lbytes(compl[0], ti->pos - cstart);
 
                 if (cplen > istart) {
@@ -739 +739 @@
                         /* Copy remainder of common prefix. */
                         char *cpref = str_ndup(compl[0] + istart,
-                            str_lsize(compl[0], cplen - istart));
+                            str_lbytes(compl[0], cplen - istart));
 
                         /* Insert it. */
@@ -759 +759 @@
 
                 /* Compute how many bytes of completion string we should skip. */
-                size_t istart = str_lsize(compl[0], ti->pos - cstart);
+                size_t istart = str_lbytes(compl[0], ti->pos - cstart);
 
                 /* Insert remainder of completion string at current position. */