Changeset 08e103d4 in mainline for uspace/app

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

Files:

• bdsh/cmds/modules/cp/cp.c (modified) (2 diffs)
• bdsh/cmds/modules/ls/ls.c (modified) (3 diffs)
• bdsh/cmds/modules/printf/printf.c (modified) (1 diff)
• bdsh/cmds/modules/rm/rm.c (modified) (1 diff)
• bdsh/compl.c (modified) (2 diffs)
• bdsh/tok.c (modified) (1 diff)
• date/date.c (modified) (2 diffs)
• edit/edit.c (modified) (6 diffs)
• edit/search.c (modified) (1 diff)
• edit/sheet.c (modified) (1 diff)
• fdisk/fdisk.c (modified) (2 diffs)
• hbench/env.c (modified) (2 diffs)
• hbench/main.c (modified) (1 diff)
• kio/kio.c (modified) (1 diff)
• lprint/lprint.c (modified) (2 diffs)
• netecho/netecho.c (modified) (1 diff)
• nic/nic.c (modified) (1 diff)
• sbi/src/builtin/bi_string.c (modified) (2 diffs)
• sbi/src/lex.c (modified) (1 diff)
• sbi/src/os/helenos.c (modified) (4 diffs)
• sbi/src/os/os.h (modified) (1 diff)
• sbi/src/os/posix.c (modified) (1 diff)
• sportdmp/sportdmp.c (modified) (1 diff)
• sysinfo/sysinfo.c (modified) (2 diffs)
• taskdump/elf_core.c (modified) (2 diffs)
• tester/hw/serial/serial1.c (modified) (1 diff)
• tester/tester.c (modified) (1 diff)
• tetris/screen.c (modified) (1 diff)
• tetris/tetris.c (modified) (1 diff)
• tmon/tests.c (modified) (1 diff)
• usbinfo/list.c (modified) (1 diff)
• wavplay/wave.c (modified) (1 diff)
• websrv/websrv.c (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -188 +188 @@
         dentry_type_t dest_type = get_type(dest);
 
-        const size_t src_len = str_size(src);
+        const size_t src_len = str_bytes(src);
 
         if (src_type == TYPE_FILE) {
@@ -214 +214 @@
                         dest_type = get_type(dest_path);
                 } else if (dest_type == TYPE_NONE) {
-                        if (dest_path[str_size(dest_path) - 1] == '/') {
+                        if (dest_path[str_bytes(dest_path) - 1] == '/') {
                                 /* e.g. cp /textdemo /data/dirnotexists/ */
 

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -174 +174 @@
 
                 /* fill the name field */
-                tosort[nbdirs].name = (char *) malloc(str_size(dp->d_name) + 1);
+                tosort[nbdirs].name = (char *) malloc(str_bytes(dp->d_name) + 1);
                 if (!tosort[nbdirs].name) {
                         cli_error(CL_ENOMEM, "ls: failed to scan %s", d);
@@ -180 +180 @@
                 }
 
-                str_cpy(tosort[nbdirs].name, str_size(dp->d_name) + 1, dp->d_name);
+                str_cpy(tosort[nbdirs].name, str_bytes(dp->d_name) + 1, dp->d_name);
                 len = snprintf(buff, PATH_MAX - 1, "%s/%s", d, tosort[nbdirs].name);
                 buff[len] = '\0';
@@ -264 +264 @@
                 memset(subdir_path, 0, PATH_MAX);
 
-                if (str_size(subdir_path) + str_size(path) + 1 <= PATH_MAX)
+                if (str_bytes(subdir_path) + str_bytes(path) + 1 <= PATH_MAX)
                         str_append(subdir_path, PATH_MAX, path);
-                if (path[str_size(path) - 1] != '/' &&
-                    str_size(subdir_path) + str_size(trailing_slash) + 1 <= PATH_MAX)
+                if (path[str_bytes(path) - 1] != '/' &&
+                    str_bytes(subdir_path) + str_bytes(trailing_slash) + 1 <= PATH_MAX)
                         str_append(subdir_path, PATH_MAX, trailing_slash);
-                if (str_size(subdir_path) +
-                    str_size(dir_list[i].name) + 1 <= PATH_MAX)
+                if (str_bytes(subdir_path) +
+                    str_bytes(dir_list[i].name) + 1 <= PATH_MAX)
                         str_append(subdir_path, PATH_MAX, dir_list[i].name);
 

uspace/app/bdsh/cmds/modules/printf/printf.c

@@ -135 +135 @@
 
         fmt = argv[1];
-        fmt_sz = str_size(fmt);
+        fmt_sz = str_bytes(fmt);
         pos = 0;
         carg = 2;

uspace/app/bdsh/cmds/modules/rm/rm.c

@@ -302 +302 @@
         i = optind;
         while (NULL != argv[i]) {
-                len = str_size(argv[i]) + 2;
+                len = str_bytes(argv[i]) + 2;
                 buff = (char *) realloc(buff, len);
                 if (buff == NULL) {

uspace/app/bdsh/compl.c

@@ -160 +160 @@
          * XXX: handle strings, etc.
          */
-        pref_size = str_lsize(stext, pos - *cstart);
+        pref_size = str_lbytes(stext, pos - *cstart);
         prefix = malloc(pref_size + 1);
         if (prefix == NULL) {
@@ -237 +237 @@
         }
 
-        cs->prefix_len = str_length(cs->prefix);
+        cs->prefix_len = str_code_points(cs->prefix);
 
         tok_fini(&tok);

uspace/app/bdsh/tok.c

@@ -65 +65 @@
 
         /* Prepare a buffer where all the token strings will be stored */
-        size_t len = str_size(input) + max_tokens + 1;
+        size_t len = str_bytes(input) + max_tokens + 1;
         char *tmp = malloc(len);
 

uspace/app/date/date.c

@@ -203 +203 @@
         uint32_t tmp;
 
-        if (str_size(wdate) != 10) /* str_size("DD/MM/YYYY") == 10 */
+        if (str_bytes(wdate) != 10) /* str_bytes("DD/MM/YYYY") == 10 */
                 return EINVAL;
 
@@ -236 +236 @@
 {
         errno_t rc;
-        size_t len = str_size(wtime);
+        size_t len = str_bytes(wtime);
         bool sec_present = len == 8;
         uint32_t tmp;
 
-        /* str_size("HH:MM") == 5 */
-        /* str_size("HH:MM:SS") == 8 */
+        /* str_bytes("HH:MM") == 5 */
+        /* str_bytes("HH:MM:SS") == 8 */
         if (len != 8 && len != 5)
                 return EINVAL;

uspace/app/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/app/edit/search.c

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

uspace/app/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/app/fdisk/fdisk.c

@@ -617 +617 @@
                         }
 
-                        if (str_size(pinfo.label) > 0)
+                        if (str_bytes(pinfo.label) > 0)
                                 label = pinfo.label;
                         else
@@ -1010 +1010 @@
                 }
 
-                if (str_size(pinfo.label) > 0)
+                if (str_bytes(pinfo.label) > 0)
                         label = pinfo.label;
                 else

uspace/app/hbench/env.c

@@ -49 +49 @@
 {
         param_t *param = hash_table_get_inst(item, param_t, link);
-        return str_size(param->key);
+        return str_bytes(param->key);
 }
 
@@ -55 +55 @@
 {
         char *key_str = key;
-        return str_size(key_str);
+        return str_bytes(key_str);
 }
 

uspace/app/hbench/main.c

@@ -291 +291 @@
         size_t len = 0;
         for (size_t i = 0; i < benchmark_count; i++) {
-                size_t len_now = str_length(benchmarks[i]->name);
+                size_t len_now = str_code_points(benchmarks[i]->name);
                 if (len_now > len)
                         len = len_now;

uspace/app/kio/kio.c

@@ -245 +245 @@
                 }
 
-                kio_command(str, str_size(str));
+                kio_command(str, str_bytes(str));
                 free(str);
         }

uspace/app/lprint/lprint.c

@@ -100 +100 @@
                 ++argv;
 
-                rc = chardev_write(chardev, msg, str_size(msg), &nbytes);
+                rc = chardev_write(chardev, msg, str_bytes(msg), &nbytes);
                 if (rc != EOK) {
                         printf(NAME ": Failed sending data.\n");
@@ -108 +108 @@
                 sep = argc > 0 ? " " : "\n";
 
-                rc = chardev_write(chardev, sep, str_size(sep), &nbytes);
+                rc = chardev_write(chardev, sep, str_bytes(sep), &nbytes);
                 if (rc != EOK) {
                         printf(NAME ": Failed sending data.\n");

uspace/app/netecho/netecho.c

@@ -139 +139 @@
 
         while (*msgs != NULL) {
-                rc = comm_send(*msgs, str_size(*msgs));
+                rc = comm_send(*msgs, str_bytes(*msgs));
                 if (rc != EOK) {
                         printf("[Failed sending data]\n");

uspace/app/nic/nic.c

@@ -452 +452 @@
         }
 
-        if (str_size(str) != 17) {
+        if (str_bytes(str) != 17) {
                 printf("Invalid MAC address specified");
                 return EINVAL;

uspace/app/sbi/src/builtin/bi_string.c

@@ -86 +86 @@
         assert(self_value_var->vc == vc_string);
         str = self_value_var->u.string_v->value;
-        str_l = os_str_length(str);
+        str_l = os_str_code_points(str);
 
 #ifdef DEBUG_RUN_TRACE
@@ -131 +131 @@
         assert(self_value_var->vc == vc_string);
         str = self_value_var->u.string_v->value;
-        str_l = os_str_length(str);
+        str_l = os_str_code_points(str);
 
         /* Get argument @a start. */

uspace/app/sbi/src/lex.c

@@ -597 +597 @@
         lex_char_string_core(lex, cs_chr);
 
-        len = os_str_length(strlit_buf);
+        len = os_str_code_points(strlit_buf);
         if (len != 1) {
                 printf("Character literal should contain one character, "

uspace/app/sbi/src/os/helenos.c

@@ -60 +60 @@
         char *str;
 
-        a_size = str_size(a);
-        b_size = str_size(b);
+        a_size = str_bytes(a);
+        b_size = str_bytes(b);
 
         str = malloc(a_size + b_size + 1);
@@ -96 +96 @@
         wchar_t c;
 
-        assert(start + length <= str_length(str));
+        assert(start + length <= str_code_points(str));
 
         offset = 0;
@@ -106 +106 @@
         }
 
-        size = str_lsize(str, length);
+        size = str_lbytes(str, length);
         slice = str_ndup(str + offset, size);
 
@@ -128 +128 @@
  * @return      Number of characters in @a str.
  */
-size_t os_str_length(const char *str)
-{
-        return str_length(str);
+size_t os_str_code_points(const char *str)
+{
+        return str_code_points(str);
 }
 

uspace/app/sbi/src/os/os.h

@@ -36 +36 @@
 int os_str_cmp(const char *a, const char *b);
 char *os_str_dup(const char *str);
-size_t os_str_length(const char *str);
+size_t os_str_code_points(const char *str);
 errno_t os_str_get_char(const char *str, int index, int *out_char);
 char *os_chr_to_astr(wchar_t chr);

uspace/app/sbi/src/os/posix.c

@@ -124 +124 @@
  * @return      Number of characters in @a str.
  */
-size_t os_str_length(const char *str)
+size_t os_str_code_points(const char *str)
 {
         return strlen(str);

uspace/app/sportdmp/sportdmp.c

@@ -54 +54 @@
 
         if (argc > arg && str_test_prefix(argv[arg], "--baud=")) {
-                size_t arg_offset = str_lsize(argv[arg], 7);
+                size_t arg_offset = str_lbytes(argv[arg], 7);
                 char *arg_str = argv[arg] + arg_offset;
-                if (str_length(arg_str) == 0) {
+                if (str_code_points(arg_str) == 0) {
                         fprintf(stderr, "--baud requires an argument\n");
                         syntax_print();

uspace/app/sysinfo/sysinfo.c

@@ -129 +129 @@
         while (pos < size) {
                 /* Process each key with sanity checks */
-                size_t cur_size = str_nsize(keys + pos, size - pos);
+                size_t cur_size = str_nbytes(keys + pos, size - pos);
                 if (keys[pos + cur_size] != 0)
                         break;
 
-                size_t path_size = str_size(path) + cur_size + 2;
+                size_t path_size = str_bytes(path) + cur_size + 2;
                 char *cur_path = (char *) malloc(path_size);
                 if (cur_path == NULL)
@@ -143 +143 @@
                         print_spaces(spaces);
                         printf(".%s\n", keys + pos);
-                        length = str_length(keys + pos) + 1;
+                        length = str_code_points(keys + pos) + 1;
 
                         snprintf(cur_path, path_size, "%s.%s", path, keys + pos);
                 } else {
                         printf("%s\n", keys + pos);
-                        length = str_length(keys + pos);
+                        length = str_code_points(keys + pos);
 
                         snprintf(cur_path, path_size, "%s", keys + pos);

uspace/app/taskdump/elf_core.c

@@ -177 +177 @@
         p_hdr[0].p_paddr = 0;
         p_hdr[0].p_filesz = sizeof(elf_note_t) +
-            ALIGN_UP((str_size("CORE") + 1), word_size) +
+            ALIGN_UP((str_bytes("CORE") + 1), word_size) +
             ALIGN_UP(sizeof(elf_prstatus_t), word_size);
         p_hdr[0].p_memsz = 0;
@@ -230 +230 @@
          * Write note header
          */
-        note.namesz = str_size("CORE") + 1;
+        note.namesz = str_bytes("CORE") + 1;
         note.descsz = sizeof(elf_prstatus_t);
         note.type = NT_PRSTATUS;

uspace/app/tester/hw/serial/serial1.c

@@ -198 +198 @@
         TPRINTF("Trying to write EOT banner to the serial device\n");
 
-        size_t eot_size = str_size(EOT);
+        size_t eot_size = str_bytes(EOT);
         rc = chardev_write(chardev, (void *) EOT, eot_size, &nwritten);
 

uspace/app/tester/tester.c

@@ -142 +142 @@
         test_t *test;
         for (test = tests; test->name != NULL; test++) {
-                if (str_length(test->name) > len)
-                        len = str_length(test->name);
+                if (str_code_points(test->name) > len)
+                        len = str_code_points(test->name);
         }
 

uspace/app/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/app/tetris/tetris.c

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

uspace/app/tmon/tests.c

@@ -130 +130 @@
 
         if (params->transfer_size) {
-                char *str_size = tmon_format_size(params->transfer_size, "%.3f %s");
-                printf("Transfer size: %s\n", str_size);
-                free(str_size);
+                char *str_bytes = tmon_format_size(params->transfer_size, "%.3f %s");
+                printf("Transfer size: %s\n", str_bytes);
+                free(str_bytes);
         } else {
                 printf("Transfer size: (max. transfer size)\n");

uspace/app/usbinfo/list.c

@@ -98 +98 @@
         /* Get handle of parent device */
         devman_handle_t fh;
-        path[str_size(path) - str_size(name) - 1] = '\0';
+        path[str_bytes(path) - str_bytes(name) - 1] = '\0';
         rc = devman_fun_get_handle(path, &fh, IPC_FLAG_BLOCKING);
         if (rc != EOK) {

uspace/app/wavplay/wave.c

@@ -151 +151 @@
 {
         assert(header);
-#define COPY_STR(dst, src)   memcpy(dst, src, str_size(src))
+#define COPY_STR(dst, src)   memcpy(dst, src, str_bytes(src))
 
         COPY_STR(&header->chunk_id, CHUNK_ID);

uspace/app/websrv/websrv.c

@@ -227 +227 @@
 static errno_t send_response(tcp_conn_t *conn, const char *msg)
 {
-        size_t response_size = str_size(msg);
+        size_t response_size = str_bytes(msg);
 
         if (verbose)
@@ -322 +322 @@
         char *end_uri = str_chr(uri, ' ');
         if (end_uri == NULL) {
-                end_uri = reqline + str_size(reqline) - 2;
+                end_uri = reqline + str_bytes(reqline) - 2;
                 assert(*end_uri == '\r');
         }