Changeset 6c4eedf in mainline for uspace/app/fdisk/fdisk.c
- Timestamp:
- 2017-09-13T20:14:49Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 120d5bc
- Parents:
- 1d40c93d
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/fdisk/fdisk.c
r1d40c93d r6c4eedf 35 35 */ 36 36 37 #include <cap.h> 37 38 #include <errno.h> 38 39 #include <nchoice.h> … … 151 152 nchoice_t *choice = NULL; 152 153 char *svcname = NULL; 153 fdisk_cap_t cap;154 cap_spec_t cap; 154 155 fdisk_dev_info_t *sdev; 155 156 char *scap = NULL; … … 200 201 } 201 202 202 fdisk_cap_simplify(&cap);203 204 rc = fdisk_cap_format(&cap, &scap);203 cap_simplify(&cap); 204 205 rc = cap_format(&cap, &scap); 205 206 if (rc != EOK) { 206 207 assert(rc == ENOMEM); … … 445 446 int rc; 446 447 fdisk_part_spec_t pspec; 447 fdisk_cap_t cap;448 fdisk_cap_t mcap;448 cap_spec_t cap; 449 cap_spec_t mcap; 449 450 vol_label_supp_t vlsupp; 450 451 vol_fstype_t fstype = 0; … … 466 467 } 467 468 468 fdisk_cap_simplify(&mcap);469 470 rc = fdisk_cap_format(&mcap, &smcap);469 cap_simplify(&mcap); 470 471 rc = cap_format(&mcap, &smcap); 471 472 if (rc != EOK) { 472 473 rc = ENOMEM; … … 490 491 goto error; 491 492 492 rc = fdisk_cap_parse(scap, &cap);493 rc = cap_parse(scap, &cap); 493 494 if (rc == EOK) 494 495 break; … … 586 587 } 587 588 588 fdisk_cap_simplify(&pinfo.capacity);589 590 rc = fdisk_cap_format(&pinfo.capacity, &scap);589 cap_simplify(&pinfo.capacity); 590 591 rc = cap_format(&pinfo.capacity, &scap); 591 592 if (rc != EOK) { 592 593 printf("Out of memory.\n"); … … 703 704 fdisk_part_t *part; 704 705 fdisk_part_info_t pinfo; 705 fdisk_cap_t cap;706 fdisk_cap_t mcap;706 cap_spec_t cap; 707 cap_spec_t mcap; 707 708 fdisk_dev_flags_t dflags; 708 709 char *sltype = NULL; … … 738 739 } 739 740 740 fdisk_cap_simplify(&cap);741 742 rc = fdisk_cap_format(&cap, &sdcap);741 cap_simplify(&cap); 742 743 rc = cap_format(&cap, &sdcap); 743 744 if (rc != EOK) { 744 745 printf("Out of memory.\n"); … … 792 793 } 793 794 794 fdisk_cap_simplify(&pinfo.capacity);795 796 rc = fdisk_cap_format(&pinfo.capacity, &scap);795 cap_simplify(&pinfo.capacity); 796 797 rc = cap_format(&pinfo.capacity, &scap); 797 798 if (rc != EOK) { 798 799 printf("Out of memory.\n"); … … 849 850 } 850 851 851 fdisk_cap_simplify(&mcap);852 853 rc = fdisk_cap_format(&mcap, &smcap);852 cap_simplify(&mcap); 853 854 rc = cap_format(&mcap, &smcap); 854 855 if (rc != EOK) { 855 856 rc = ENOMEM; … … 871 872 } 872 873 873 fdisk_cap_simplify(&mcap);874 875 rc = fdisk_cap_format(&mcap, &smcap);874 cap_simplify(&mcap); 875 876 rc = cap_format(&mcap, &smcap); 876 877 if (rc != EOK) { 877 878 rc = ENOMEM; … … 896 897 } 897 898 898 fdisk_cap_simplify(&mcap);899 900 rc = fdisk_cap_format(&mcap, &smcap);899 cap_simplify(&mcap); 900 901 rc = cap_format(&mcap, &smcap); 901 902 if (rc != EOK) { 902 903 rc = ENOMEM; … … 914 915 } 915 916 916 fdisk_cap_simplify(&mcap);917 918 rc = fdisk_cap_format(&mcap, &smcap);917 cap_simplify(&mcap); 918 919 rc = cap_format(&mcap, &smcap); 919 920 if (rc != EOK) { 920 921 rc = ENOMEM;
Note:
See TracChangeset
for help on using the changeset viewer.