Changeset 08e103d4 in mainline for uspace/lib/c
- Timestamp:
- 2019-02-05T18:26:05Z (6 years ago)
- 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)
- Location:
- uspace/lib/c
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/arg_parse.c
rd066259 r08e103d4 40 40 return 0; 41 41 42 if (str_lcmp(arg, along, str_ length(along)) == 0)43 return str_ length(along);42 if (str_lcmp(arg, along, str_code_points(along)) == 0) 43 return str_code_points(along); 44 44 45 45 return -1; -
uspace/lib/c/generic/cap.c
rd066259 r08e103d4 285 285 for (i = 0; i < CU_LIMIT; i++) { 286 286 if (str_lcasecmp(eptr, cu_str[i], 287 str_ length(cu_str[i])) == 0) {288 p = eptr + str_ size(cu_str[i]);287 str_code_points(cu_str[i])) == 0) { 288 p = eptr + str_bytes(cu_str[i]); 289 289 while (*p == ' ') 290 290 ++p; -
uspace/lib/c/generic/clipboard.c
rd066259 r08e103d4 100 100 errno_t clipboard_put_str(const char *str) 101 101 { 102 size_t size = str_ size(str);102 size_t size = str_bytes(str); 103 103 104 104 if (size == 0) { -
uspace/lib/c/generic/devman.c
rd066259 r08e103d4 182 182 ipc_call_t answer; 183 183 aid_t req = async_send_2(exch, DEVMAN_DRIVER_REGISTER, 0, 0, &answer); 184 errno_t retval = async_data_write_start(exch, name, str_ size(name));184 errno_t retval = async_data_write_start(exch, name, str_bytes(name)); 185 185 186 186 devman_exchange_end(exch); … … 222 222 aid_t req = async_send_3(exch, DEVMAN_ADD_FUNCTION, (sysarg_t) ftype, 223 223 devh, match_count, &answer); 224 errno_t retval = async_data_write_start(exch, name, str_ size(name));224 errno_t retval = async_data_write_start(exch, name, str_bytes(name)); 225 225 if (retval != EOK) { 226 226 devman_exchange_end(exch); … … 234 234 match_id->score, &answer2); 235 235 retval = async_data_write_start(exch, match_id->id, 236 str_ size(match_id->id));236 str_bytes(match_id->id)); 237 237 if (retval != EOK) { 238 238 devman_exchange_end(exch); … … 273 273 devman_handle, &answer); 274 274 errno_t retval = async_data_write_start(exch, cat_name, 275 str_ size(cat_name));275 str_bytes(cat_name)); 276 276 277 277 devman_exchange_end(exch); … … 375 375 &answer); 376 376 errno_t retval = async_data_write_start(exch, pathname, 377 str_ size(pathname));377 str_bytes(pathname)); 378 378 379 379 devman_exchange_end(exch); … … 644 644 aid_t req = async_send_0(exch, DEVMAN_DRIVER_GET_HANDLE, &answer); 645 645 errno_t retval = async_data_write_start(exch, drvname, 646 str_ size(drvname));646 str_bytes(drvname)); 647 647 648 648 devman_exchange_end(exch); -
uspace/lib/c/generic/dnsr.c
rd066259 r08e103d4 75 75 &answer); 76 76 77 errno_t rc = async_data_write_start(exch, name, str_ size(name));77 errno_t rc = async_data_write_start(exch, name, str_bytes(name)); 78 78 if (rc != EOK) { 79 79 async_exchange_end(exch); -
uspace/lib/c/generic/getopt.c
rd066259 r08e103d4 366 366 has_equal++; 367 367 } else 368 current_argv_len = str_ size(current_argv);368 current_argv_len = str_bytes(current_argv); 369 369 370 370 for (i = 0; long_options[i].name; i++) { 371 371 /* find matching long option */ 372 372 if (str_lcmp(current_argv, long_options[i].name, 373 str_n length(current_argv, current_argv_len)))373 str_ncode_points(current_argv, current_argv_len))) 374 374 continue; 375 375 376 if (str_ size(long_options[i].name) ==376 if (str_bytes(long_options[i].name) == 377 377 (unsigned)current_argv_len) { 378 378 /* exact match */ -
uspace/lib/c/generic/inetcfg.c
rd066259 r08e103d4 149 149 } 150 150 151 rc = async_data_write_start(exch, name, str_ size(name));151 rc = async_data_write_start(exch, name, str_bytes(name)); 152 152 153 153 async_exchange_end(exch); … … 234 234 ipc_call_t answer; 235 235 aid_t req = async_send_1(exch, INETCFG_ADDR_GET_ID, link_id, &answer); 236 errno_t retval = async_data_write_start(exch, name, str_ size(name));236 errno_t retval = async_data_write_start(exch, name, str_bytes(name)); 237 237 238 238 async_exchange_end(exch); … … 347 347 } 348 348 349 rc = async_data_write_start(exch, name, str_ size(name));349 rc = async_data_write_start(exch, name, str_bytes(name)); 350 350 351 351 async_exchange_end(exch); … … 444 444 ipc_call_t answer; 445 445 aid_t req = async_send_0(exch, INETCFG_SROUTE_GET_ID, &answer); 446 errno_t retval = async_data_write_start(exch, name, str_ size(name));446 errno_t retval = async_data_write_start(exch, name, str_bytes(name)); 447 447 448 448 async_exchange_end(exch); -
uspace/lib/c/generic/io/asprintf.c
rd066259 r08e103d4 43 43 static int asprintf_str_write(const char *str, size_t count, void *unused) 44 44 { 45 return str_n length(str, count);45 return str_ncode_points(str, count); 46 46 } 47 47 48 48 static int asprintf_wstr_write(const wchar_t *str, size_t count, void *unused) 49 49 { 50 return wstr_n length(str, count);50 return wstr_ncode_points(str, count); 51 51 } 52 52 53 int vprintf_ length(const char *fmt, va_list args)53 int vprintf_code_points(const char *fmt, va_list args) 54 54 { 55 55 printf_spec_t ps = { … … 62 62 } 63 63 64 int printf_ length(const char *fmt, ...)64 int printf_code_points(const char *fmt, ...) 65 65 { 66 66 va_list args; 67 67 va_start(args, fmt); 68 int ret = vprintf_ length(fmt, args);68 int ret = vprintf_code_points(fmt, args); 69 69 va_end(args); 70 70 -
uspace/lib/c/generic/io/io.c
rd066259 r08e103d4 774 774 int fputs(const char *str, FILE *stream) 775 775 { 776 (void) fwrite(str, str_ size(str), 1, stream);776 (void) fwrite(str, str_bytes(str), 1, stream); 777 777 if (ferror(stream)) 778 778 return EOF; -
uspace/lib/c/generic/io/kio.c
rd066259 r08e103d4 137 137 wr = 0; 138 138 (void) kio_write(str, size, &wr); 139 return str_n length(str, wr);139 return str_ncode_points(str, wr); 140 140 } 141 141 -
uspace/lib/c/generic/io/log.c
rd066259 r08e103d4 89 89 aid_t reg_msg = async_send_2(exchange, LOGGER_WRITER_MESSAGE, 90 90 log, level, NULL); 91 errno_t rc = async_data_write_start(exchange, message, str_ size(message));91 errno_t rc = async_data_write_start(exchange, message, str_bytes(message)); 92 92 errno_t reg_msg_rc; 93 93 async_wait_for(reg_msg, ®_msg_rc); … … 144 144 char *end_ptr; 145 145 int level_int = strtol(name, &end_ptr, 0); 146 if ((end_ptr == name) || (str_ length(end_ptr) != 0))146 if ((end_ptr == name) || (str_code_points(end_ptr) != 0)) 147 147 return EINVAL; 148 148 if (level_int < 0) … … 199 199 aid_t reg_msg = async_send_1(exchange, LOGGER_WRITER_CREATE_LOG, 200 200 parent, &answer); 201 errno_t rc = async_data_write_start(exchange, name, str_ size(name));201 errno_t rc = async_data_write_start(exchange, name, str_bytes(name)); 202 202 errno_t reg_msg_rc; 203 203 async_wait_for(reg_msg, ®_msg_rc); -
uspace/lib/c/generic/io/logctl.c
rd066259 r08e103d4 110 110 aid_t reg_msg = async_send_1(exchange, LOGGER_CONTROL_SET_LOG_LEVEL, 111 111 new_level, NULL); 112 rc = async_data_write_start(exchange, logname, str_ size(logname));112 rc = async_data_write_start(exchange, logname, str_bytes(logname)); 113 113 errno_t reg_msg_rc; 114 114 async_wait_for(reg_msg, ®_msg_rc); -
uspace/lib/c/generic/io/printf_core.c
rd066259 r08e103d4 204 204 { 205 205 if (str == NULL) 206 return printf_putnchars(nullstr, str_ size(nullstr), ps);207 208 return ps->str_write((void *) str, str_ size(str), ps->data);206 return printf_putnchars(nullstr, str_bytes(nullstr), ps); 207 208 return ps->str_write((void *) str, str_bytes(str), ps->data); 209 209 } 210 210 … … 332 332 return printf_putstr(nullstr, ps); 333 333 334 size_t strw = str_ length(str);334 size_t strw = str_code_points(str); 335 335 336 336 /* Precision unspecified - print everything. */ … … 350 350 /* Part of @a str fitting into the alloted space. */ 351 351 int retval; 352 size_t size = str_l size(str, precision);352 size_t size = str_lbytes(str, precision); 353 353 if ((retval = printf_putnchars(str, size, ps)) < 0) 354 354 return -counter; … … 381 381 return printf_putstr(nullstr, ps); 382 382 383 size_t strw = wstr_ length(str);383 size_t strw = wstr_code_points(str); 384 384 385 385 /* Precision not specified - print everything. */ … … 399 399 /* Part of @a wstr fitting into the alloted space. */ 400 400 int retval; 401 size_t size = wstr_l size(str, precision);401 size_t size = wstr_lbytes(str, precision); 402 402 if ((retval = printf_wputnchars(str, size, ps)) < 0) 403 403 return -counter; -
uspace/lib/c/generic/io/vprintf.c
rd066259 r08e103d4 45 45 { 46 46 size_t wr = fwrite(str, 1, size, (FILE *) stream); 47 return str_n length(str, wr);47 return str_ncode_points(str, wr); 48 48 } 49 49 -
uspace/lib/c/generic/loader.c
rd066259 r08e103d4 57 57 { 58 58 return (errno_t) __SYSCALL2(SYS_PROGRAM_SPAWN_LOADER, 59 (sysarg_t) name, str_ size(name));59 (sysarg_t) name, str_bytes(name)); 60 60 } 61 61 … … 125 125 str_cpy(cwd, MAX_PATH_LEN + 1, "/"); 126 126 127 size_t len = str_ length(cwd);127 size_t len = str_code_points(cwd); 128 128 129 129 async_exch_t *exch = async_exchange_begin(ldr->sess); … … 161 161 aid_t req = async_send_0(exch, LOADER_SET_PROGRAM, &answer); 162 162 163 errno_t rc = async_data_write_start(exch, name, str_ size(name) + 1);163 errno_t rc = async_data_write_start(exch, name, str_bytes(name) + 1); 164 164 if (rc == EOK) { 165 165 async_exch_t *vfs_exch = vfs_exchange_begin(); … … 226 226 size_t buffer_size = 0; 227 227 while (*ap != NULL) { 228 buffer_size += str_ size(*ap) + 1;228 buffer_size += str_bytes(*ap) + 1; 229 229 ap++; 230 230 } … … 240 240 while (*ap != NULL) { 241 241 str_cpy(dp, buffer_size - (dp - arg_buf), *ap); 242 dp += str_ size(*ap) + 1;242 dp += str_bytes(*ap) + 1; 243 243 ap++; 244 244 } … … 280 280 aid_t req = async_send_0(exch, LOADER_ADD_INBOX, NULL); 281 281 282 errno_t rc = async_data_write_start(exch, name, str_ size(name) + 1);282 errno_t rc = async_data_write_start(exch, name, str_bytes(name) + 1); 283 283 if (rc == EOK) { 284 284 rc = vfs_pass_handle(vfs_exch, file, exch); -
uspace/lib/c/generic/loc.c
rd066259 r08e103d4 246 246 ipc_call_t answer; 247 247 aid_t req = async_send_2(exch, LOC_SERVER_REGISTER, 0, 0, &answer); 248 errno_t retval = async_data_write_start(exch, name, str_ size(name));248 errno_t retval = async_data_write_start(exch, name, str_bytes(name)); 249 249 250 250 if (retval != EOK) { … … 279 279 ipc_call_t answer; 280 280 aid_t req = async_send_0(exch, LOC_SERVICE_REGISTER, &answer); 281 errno_t retval = async_data_write_start(exch, fqsn, str_ size(fqsn));281 errno_t retval = async_data_write_start(exch, fqsn, str_bytes(fqsn)); 282 282 283 283 if (retval != EOK) { … … 340 340 aid_t req = async_send_2(exch, LOC_SERVICE_GET_ID, flags, 0, 341 341 &answer); 342 errno_t retval = async_data_write_start(exch, fqdn, str_ size(fqdn));342 errno_t retval = async_data_write_start(exch, fqdn, str_bytes(fqdn)); 343 343 344 344 loc_exchange_end(exch); … … 473 473 aid_t req = async_send_2(exch, LOC_NAMESPACE_GET_ID, flags, 0, 474 474 &answer); 475 errno_t retval = async_data_write_start(exch, name, str_ size(name));475 errno_t retval = async_data_write_start(exch, name, str_bytes(name)); 476 476 477 477 loc_exchange_end(exch); … … 522 522 aid_t req = async_send_0(exch, LOC_CATEGORY_GET_ID, 523 523 &answer); 524 errno_t retval = async_data_write_start(exch, name, str_ size(name));524 errno_t retval = async_data_write_start(exch, name, str_bytes(name)); 525 525 526 526 loc_exchange_end(exch); -
uspace/lib/c/generic/rtld/module.c
rd066259 r08e103d4 196 196 m->local = true; 197 197 198 if (str_ size(name) > NAME_BUF_SIZE - 2) {198 if (str_bytes(name) > NAME_BUF_SIZE - 2) { 199 199 printf("soname too long. increase NAME_BUF_SIZE\n"); 200 200 exit(1); -
uspace/lib/c/generic/str.c
rd066259 r08e103d4 332 332 * 333 333 */ 334 size_t str_ size(const char *str)334 size_t str_bytes(const char *str) 335 335 { 336 336 size_t size = 0; … … 352 352 * 353 353 */ 354 size_t wstr_ size(const wchar_t *str)355 { 356 return (wstr_ length(str) * sizeof(wchar_t));354 size_t wstr_bytes(const wchar_t *str) 355 { 356 return (wstr_code_points(str) * sizeof(wchar_t)); 357 357 } 358 358 … … 370 370 * 371 371 */ 372 size_t str_l size(const char *str, size_t max_len)372 size_t str_lbytes(const char *str, size_t max_len) 373 373 { 374 374 size_t len = 0; … … 396 396 * 397 397 */ 398 size_t str_n size(const char *str, size_t max_size)398 size_t str_nbytes(const char *str, size_t max_size) 399 399 { 400 400 size_t size = 0; … … 417 417 * 418 418 */ 419 size_t wstr_n size(const wchar_t *str, size_t max_size)420 { 421 return (wstr_n length(str, max_size) * sizeof(wchar_t));419 size_t wstr_nbytes(const wchar_t *str, size_t max_size) 420 { 421 return (wstr_ncode_points(str, max_size) * sizeof(wchar_t)); 422 422 } 423 423 … … 435 435 * 436 436 */ 437 size_t wstr_l size(const wchar_t *str, size_t max_len)438 { 439 return (wstr_n length(str, max_len * sizeof(wchar_t)) * sizeof(wchar_t));437 size_t wstr_lbytes(const wchar_t *str, size_t max_len) 438 { 439 return (wstr_ncode_points(str, max_len * sizeof(wchar_t)) * sizeof(wchar_t)); 440 440 } 441 441 … … 447 447 * 448 448 */ 449 size_t str_ length(const char *str)449 size_t str_code_points(const char *str) 450 450 { 451 451 size_t len = 0; … … 465 465 * 466 466 */ 467 size_t wstr_ length(const wchar_t *wstr)467 size_t wstr_code_points(const wchar_t *wstr) 468 468 { 469 469 size_t len = 0; … … 483 483 * 484 484 */ 485 size_t str_n length(const char *str, size_t size)485 size_t str_ncode_points(const char *str, size_t size) 486 486 { 487 487 size_t len = 0; … … 502 502 * 503 503 */ 504 size_t wstr_n length(const wchar_t *str, size_t size)504 size_t wstr_ncode_points(const wchar_t *str, size_t size) 505 505 { 506 506 size_t len = 0; … … 616 616 * Do a char-by-char comparison of two NULL-terminated strings. 617 617 * The strings are considered equal iff 618 * min(str_ length(s1), max_len) == min(str_length(s2), max_len)618 * min(str_code_points(s1), max_len) == min(str_code_points(s2), max_len) 619 619 * and both strings consist of the same sequence of characters, 620 620 * up to max_len characters. … … 716 716 * Do a char-by-char comparison of two NULL-terminated strings. 717 717 * The strings are considered equal iff 718 * min(str_ length(s1), max_len) == min(str_length(s2), max_len)718 * min(str_code_points(s1), max_len) == min(str_code_points(s2), max_len) 719 719 * and both strings consist of the same sequence of characters, 720 720 * up to max_len characters. … … 879 879 void str_append(char *dest, size_t size, const char *src) 880 880 { 881 size_t dstr_ size;882 883 dstr_ size = str_size(dest);884 if (dstr_ size>= size)881 size_t dstr_bytes; 882 883 dstr_bytes = str_bytes(dest); 884 if (dstr_bytes >= size) 885 885 return; 886 886 887 str_cpy(dest + dstr_ size, size - dstr_size, src);887 str_cpy(dest + dstr_bytes, size - dstr_bytes, src); 888 888 } 889 889 … … 1178 1178 wchar_t *str_to_awstr(const char *str) 1179 1179 { 1180 size_t len = str_ length(str);1180 size_t len = str_code_points(str); 1181 1181 1182 1182 wchar_t *wstr = calloc(len + 1, sizeof(wchar_t)); … … 1221 1221 size_t off = 0; 1222 1222 1223 if (str_lcmp(hs, n, str_ length(n)) == 0)1223 if (str_lcmp(hs, n, str_code_points(n)) == 0) 1224 1224 return (char *)hs; 1225 1225 1226 1226 while (str_decode(hs, &off, STR_NO_LIMIT) != 0) { 1227 if (str_lcmp(hs + off, n, str_ length(n)) == 0)1227 if (str_lcmp(hs + off, n, str_code_points(n)) == 0) 1228 1228 return (char *)(hs + off); 1229 1229 } … … 1270 1270 size_t off = 0; 1271 1271 size_t pos = 0; 1272 size_t str_sz = str_ size(str);1272 size_t str_sz = str_bytes(str); 1273 1273 1274 1274 while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) { … … 1325 1325 bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos) 1326 1326 { 1327 size_t len = wstr_ length(str);1327 size_t len = wstr_code_points(str); 1328 1328 1329 1329 if ((pos > len) || (pos + 1 > max_pos)) … … 1353 1353 bool wstr_remove(wchar_t *str, size_t pos) 1354 1354 { 1355 size_t len = wstr_ length(str);1355 size_t len = wstr_code_points(str); 1356 1356 1357 1357 if (pos >= len) … … 1383 1383 char *str_dup(const char *src) 1384 1384 { 1385 size_t size = str_ size(src) + 1;1385 size_t size = str_bytes(src) + 1; 1386 1386 char *dest = malloc(size); 1387 1387 if (!dest) … … 1414 1414 char *str_ndup(const char *src, size_t n) 1415 1415 { 1416 size_t size = str_ size(src);1416 size_t size = str_bytes(src); 1417 1417 if (size > n) 1418 1418 size = n; … … 1445 1445 return NULL; 1446 1446 1447 size_t len = str_ size(s);1447 size_t len = str_bytes(s); 1448 1448 size_t cur; 1449 1449 size_t tmp; -
uspace/lib/c/generic/sysinfo.c
rd066259 r08e103d4 52 52 { 53 53 return (errno_t) __SYSCALL3(SYS_SYSINFO_GET_KEYS_SIZE, (sysarg_t) path, 54 (sysarg_t) str_ size(path), (sysarg_t) size);54 (sysarg_t) str_bytes(path), (sysarg_t) size); 55 55 } 56 56 … … 93 93 size_t sz; 94 94 ret = (errno_t) __SYSCALL5(SYS_SYSINFO_GET_KEYS, (sysarg_t) path, 95 (sysarg_t) str_ size(path), (sysarg_t) data, (sysarg_t) *size,95 (sysarg_t) str_bytes(path), (sysarg_t) data, (sysarg_t) *size, 96 96 (sysarg_t) &sz); 97 97 if (ret == EOK) { … … 115 115 { 116 116 return (sysinfo_item_val_type_t) __SYSCALL2(SYS_SYSINFO_GET_VAL_TYPE, 117 (sysarg_t) path, (sysarg_t) str_ size(path));117 (sysarg_t) path, (sysarg_t) str_bytes(path)); 118 118 } 119 119 … … 130 130 { 131 131 return (errno_t) __SYSCALL3(SYS_SYSINFO_GET_VALUE, (sysarg_t) path, 132 (sysarg_t) str_ size(path), (sysarg_t) value);132 (sysarg_t) str_bytes(path), (sysarg_t) value); 133 133 } 134 134 … … 145 145 { 146 146 return (errno_t) __SYSCALL3(SYS_SYSINFO_GET_DATA_SIZE, (sysarg_t) path, 147 (sysarg_t) str_ size(path), (sysarg_t) size);147 (sysarg_t) str_bytes(path), (sysarg_t) size); 148 148 } 149 149 … … 187 187 size_t sz; 188 188 ret = (errno_t) __SYSCALL5(SYS_SYSINFO_GET_DATA, (sysarg_t) path, 189 (sysarg_t) str_ size(path), (sysarg_t) data, (sysarg_t) *size,189 (sysarg_t) str_bytes(path), (sysarg_t) data, (sysarg_t) *size, 190 190 (sysarg_t) &sz); 191 191 if (ret == EOK) { … … 223 223 while (pos < total_size) { 224 224 /* Process each property with sanity checks */ 225 size_t cur_size = str_n size(data + pos, total_size - pos);225 size_t cur_size = str_nbytes(data + pos, total_size - pos); 226 226 if (((char *) data)[pos + cur_size] != 0) 227 227 break; -
uspace/lib/c/generic/task.c
rd066259 r08e103d4 75 75 assert(name); 76 76 77 return (errno_t) __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_ size(name));77 return (errno_t) __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_bytes(name)); 78 78 } 79 79 -
uspace/lib/c/generic/thread/thread.c
rd066259 r08e103d4 122 122 123 123 errno_t rc = (errno_t) __SYSCALL4(SYS_THREAD_CREATE, (sysarg_t) uarg, 124 (sysarg_t) name, (sysarg_t) str_ size(name), (sysarg_t) tid);124 (sysarg_t) name, (sysarg_t) str_bytes(name), (sysarg_t) tid); 125 125 126 126 if (rc != EOK) { -
uspace/lib/c/generic/tmpfile.c
rd066259 r08e103d4 62 62 errno_t rc; 63 63 64 tsize = str_ size(templ);64 tsize = str_bytes(templ); 65 65 if (tsize < 6) 66 66 return -1; -
uspace/lib/c/generic/vfs/vfs.c
rd066259 r08e103d4 181 181 182 182 fibril_mutex_lock(&cwd_mutex); 183 size_t size = str_ size(path);183 size_t size = str_bytes(path); 184 184 if (*path != '/') { 185 185 if (cwd_path == NULL) { … … 382 382 383 383 rc = async_data_write_start(exch, (void *) fs_name, 384 str_ size(fs_name));384 str_bytes(fs_name)); 385 385 386 386 async_wait_for(req, &rc); … … 630 630 &answer); 631 631 632 rc1 = async_data_write_start(exch, (void *) opts, str_ size(opts));632 rc1 = async_data_write_start(exch, (void *) opts, str_bytes(opts)); 633 633 if (rc1 == EOK) { 634 634 rc1 = async_data_write_start(exch, (void *) fs_name, 635 str_ size(fs_name));635 str_bytes(fs_name)); 636 636 } 637 637 … … 1180 1180 1181 1181 req = async_send_2(exch, VFS_IN_UNLINK, parent, expect, NULL); 1182 rc = async_data_write_start(exch, child, str_ size(child));1182 rc = async_data_write_start(exch, child, str_bytes(child)); 1183 1183 1184 1184 vfs_exchange_end(exch); … … 1271 1271 ipc_call_t answer; 1272 1272 aid_t req = async_send_2(exch, VFS_IN_WALK, parent, flags, &answer); 1273 errno_t rc = async_data_write_start(exch, path, str_ size(path));1273 errno_t rc = async_data_write_start(exch, path, str_bytes(path)); 1274 1274 vfs_exchange_end(exch); 1275 1275 -
uspace/lib/c/generic/vol.c
rd066259 r08e103d4 328 328 aid_t req = async_send_0(exch, VOL_PART_INSERT_BY_PATH, &answer); 329 329 330 retval = async_data_write_start(exch, path, str_ size(path));330 retval = async_data_write_start(exch, path, str_bytes(path)); 331 331 if (retval != EOK) { 332 332 async_exchange_end(exch); … … 395 395 aid_t req = async_send_2(exch, VOL_PART_MKFS, sid, fstype, &answer); 396 396 397 retval = async_data_write_start(exch, label, str_ size(label));397 retval = async_data_write_start(exch, label, str_bytes(label)); 398 398 if (retval != EOK) { 399 399 async_exchange_end(exch); … … 402 402 } 403 403 404 retval = async_data_write_start(exch, mountp, str_ size(mountp));404 retval = async_data_write_start(exch, mountp, str_bytes(mountp)); 405 405 if (retval != EOK) { 406 406 async_exchange_end(exch); … … 437 437 &answer); 438 438 439 retval = async_data_write_start(exch, mountp, str_ size(mountp));439 retval = async_data_write_start(exch, mountp, str_bytes(mountp)); 440 440 if (retval != EOK) { 441 441 async_exchange_end(exch); -
uspace/lib/c/include/io/klog.h
rd066259 r08e103d4 51 51 errno_t _rc = ENOMEM; \ 52 52 if (asprintf(&_s, fmt, ##__VA_ARGS__) >= 0) { \ 53 _rc = klog_write((lvl), _s, str_ size(_s)); \53 _rc = klog_write((lvl), _s, str_bytes(_s)); \ 54 54 free(_s); \ 55 55 }; \ -
uspace/lib/c/include/stdio.h
rd066259 r08e103d4 204 204 }; 205 205 206 extern int vprintf_ length(const char *, va_list);207 extern int printf_ length(const char *, ...)206 extern int vprintf_code_points(const char *, va_list); 207 extern int printf_code_points(const char *, ...) 208 208 _HELENOS_PRINTF_ATTRIBUTE(1, 2); 209 209 extern FILE *fdopen(int, const char *); -
uspace/lib/c/include/str.h
rd066259 r08e103d4 68 68 extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz); 69 69 70 extern size_t str_ size(const char *str);71 extern size_t wstr_ size(const wchar_t *str);70 extern size_t str_bytes(const char *str); 71 extern size_t wstr_bytes(const wchar_t *str); 72 72 73 extern size_t str_n size(const char *str, size_t max_size);74 extern size_t wstr_n size(const wchar_t *str, size_t max_size);73 extern size_t str_nbytes(const char *str, size_t max_size); 74 extern size_t wstr_nbytes(const wchar_t *str, size_t max_size); 75 75 76 extern size_t str_l size(const char *str, size_t max_len);77 extern size_t wstr_l size(const wchar_t *str, size_t max_len);76 extern size_t str_lbytes(const char *str, size_t max_len); 77 extern size_t wstr_lbytes(const wchar_t *str, size_t max_len); 78 78 79 extern size_t str_ length(const char *str);80 extern size_t wstr_ length(const wchar_t *wstr);79 extern size_t str_code_points(const char *str); 80 extern size_t wstr_code_points(const wchar_t *wstr); 81 81 82 extern size_t str_n length(const char *str, size_t size);83 extern size_t wstr_n length(const wchar_t *str, size_t size);82 extern size_t str_ncode_points(const char *str, size_t size); 83 extern size_t wstr_ncode_points(const wchar_t *str, size_t size); 84 84 85 85 extern size_t chr_width(wchar_t ch);
Note:
See TracChangeset
for help on using the changeset viewer.