Changeset 08e103d4 in mainline for uspace/dist/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/dist/src/c/demos

Files:

• edit/edit.c (modified) (6 diffs)
• edit/search.c (modified) (1 diff)
• edit/sheet.c (modified) (1 diff)
• tetris/screen.c (modified) (1 diff)
• tetris/tetris.c (modified) (1 diff)

uspace/dist/src/c/demos/edit/edit.c

@@ -637 +637 @@
         asprintf(&str, "%s: %s", prompt, init_value);
         status_display(str);
-        console_set_pos(con, 1 + str_length(str), scr_rows - 1);
+        console_set_pos(con, 1 + str_code_points(str), scr_rows - 1);
         free(str);
 
         console_set_style(con, STYLE_INVERTED);
 
-        max_len = min(INFNAME_MAX_LEN, scr_columns - 4 - str_length(prompt));
+        max_len = min(INFNAME_MAX_LEN, scr_columns - 4 - str_code_points(prompt));
         str_to_wstr(buffer, max_len + 1, init_value);
-        nc = wstr_length(buffer);
+        nc = wstr_code_points(buffer);
         done = false;
 
@@ -747 +747 @@
         do {
                 sheet_copy_out(doc.sh, &sp, epos, buf, BUF_SIZE, &bep);
-                bytes = str_size(buf);
+                bytes = str_bytes(buf);
 
                 n_written = fwrite(buf, 1, bytes, f);
@@ -783 +783 @@
                 sheet_copy_out(doc.sh, &sp, epos, &buf[bpos], buf_size - bpos,
                     &bep);
-                bytes = str_size(&buf[bpos]);
+                bytes = str_bytes(&buf[bpos]);
                 bpos += bytes;
                 sp = bep;
@@ -893 +893 @@
 
                 console_set_pos(con, 0, i);
-                size = str_size(row_buf);
+                size = str_bytes(row_buf);
                 pos = 0;
                 s_column = pane.sh_column;
@@ -1012 +1012 @@
                 /* Compute position where we overwrite with '..\0' */
                 if (fnw >= nextra + 2) {
-                        p = fname + str_lsize(fname, fnw - nextra - 2);
+                        p = fname + str_lbytes(fname, fnw - nextra - 2);
                 } else {
                         p = fname;
@@ -1609 +1609 @@
 {
         size_t offset = 0;
-        return str_decode(str, &offset, str_size(str));
+        return str_decode(str, &offset, str_bytes(str));
 }
 

uspace/dist/src/c/demos/edit/search.c

@@ -55 +55 @@
         }
 
-        search->pattern_length = wstr_length(p);
+        search->pattern_length = wstr_code_points(p);
 
         if (reverse) {

uspace/dist/src/c/demos/edit/sheet.c

@@ -107 +107 @@
         char *newp;
 
-        sz = str_size(str);
+        sz = str_bytes(str);
         if (sh->text_size + sz > sh->dbuf_size) {
                 /* Enlarge data buffer. */

uspace/dist/src/c/demos/tetris/screen.c

@@ -321 +321 @@
 void scr_msg(char *s, bool set)
 {
-        int l = str_size(s);
+        int l = str_bytes(s);
 
         moveto(Rows - 2, ((Cols - l) >> 1) - 1);

uspace/dist/src/c/demos/tetris/tetris.c

@@ -270 +270 @@
                         break;
                 case 'k':
-                        if (str_size(keys = optarg) != 6)
+                        if (str_bytes(keys = optarg) != 6)
                                 usage();
                         break;