Changeset 46577995 in mainline for kernel/generic/src/console
- Timestamp:
- 2018-01-04T20:50:52Z (8 years ago)
- Children:
- e211ea04
- Parents:
- facacc71
- git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)
- git-committer:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)
- Location:
- kernel/generic/src/console
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/console/cmd.c
rfacacc71 r46577995 972 972 sysarg_t (*fnc)(void); 973 973 fncptr_t fptr; 974 int rc;974 errno_t rc; 975 975 976 976 symbol = (char *) argv->buffer; … … 1033 1033 sysarg_t arg1 = argv[1].intval; 1034 1034 fncptr_t fptr; 1035 int rc;1035 errno_t rc; 1036 1036 1037 1037 symbol = (char *) argv->buffer; … … 1070 1070 sysarg_t arg2 = argv[2].intval; 1071 1071 fncptr_t fptr; 1072 int rc;1072 errno_t rc; 1073 1073 1074 1074 symbol = (char *) argv->buffer; … … 1107 1107 sysarg_t arg3 = argv[3].intval; 1108 1108 fncptr_t fptr; 1109 int rc;1109 errno_t rc; 1110 1110 1111 1111 symbol = (char *) argv->buffer; … … 1182 1182 uint32_t arg1 = argv[1].intval; 1183 1183 bool pointer = false; 1184 int rc;1184 errno_t rc; 1185 1185 1186 1186 if (((char *) argv->buffer)[0] == '*') { -
kernel/generic/src/console/console.c
rfacacc71 r46577995 391 391 * 392 392 */ 393 sys arg_t sys_kio(int cmd, const void *buf, size_t size)393 sys_errno_t sys_kio(int cmd, const void *buf, size_t size) 394 394 { 395 395 char *data; 396 int rc;396 errno_t rc; 397 397 398 398 switch (cmd) { … … 408 408 409 409 if (size > PAGE_SIZE) 410 return (sys arg_t) ELIMIT;410 return (sys_errno_t) ELIMIT; 411 411 412 412 if (size > 0) { 413 413 data = (char *) malloc(size + 1, 0); 414 414 if (!data) 415 return (sys arg_t) ENOMEM;415 return (sys_errno_t) ENOMEM; 416 416 417 417 rc = copy_from_uspace(data, buf, size); 418 418 if (rc) { 419 419 free(data); 420 return (sys arg_t) rc;420 return (sys_errno_t) rc; 421 421 } 422 422 data[size] = 0; -
kernel/generic/src/console/kconsole.c
rfacacc71 r46577995 563 563 564 564 uintptr_t symaddr; 565 int rc = symtab_addr_lookup(symname, &symaddr);566 switch ( rc) {567 case ENOENT:565 errno_t rc = symtab_addr_lookup(symname, &symaddr); 566 switch ((case_errno_t) rc) { 567 case (case_errno_t) ENOENT: 568 568 printf("Symbol %s not found.\n", symname); 569 569 return false; 570 case EOVERFLOW:570 case (case_errno_t) EOVERFLOW: 571 571 printf("Duplicate symbol %s.\n", symname); 572 572 symtab_print_search(symname); 573 573 return false; 574 case ENOTSUP:574 case (case_errno_t) ENOTSUP: 575 575 printf("No symbol information available.\n"); 576 576 return false; 577 case EOK:577 case (case_errno_t) EOK: 578 578 if (isaddr) 579 579 *result = (sysarg_t) symaddr; … … 591 591 uint64_t value; 592 592 char *end; 593 int rc = str_uint64_t(text, &end, 0, false, &value);593 errno_t rc = str_uint64_t(text, &end, 0, false, &value); 594 594 if (end != text + len) 595 595 rc = EINVAL; 596 switch ( rc) {597 case EINVAL:596 switch ((case_errno_t) rc) { 597 case (case_errno_t) EINVAL: 598 598 printf("Invalid number '%s'.\n", text); 599 599 return false; 600 case EOVERFLOW:600 case (case_errno_t) EOVERFLOW: 601 601 printf("Integer overflow in '%s'.\n", text); 602 602 return false; 603 case EOK:603 case (case_errno_t) EOK: 604 604 *result = (sysarg_t) value; 605 605 if (isptr)
Note:
See TracChangeset
for help on using the changeset viewer.