Changeset e28175d in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• uspace/app/sysinst/sysinst.c (modified) (4 diffs)

uspace/app/sysinst/sysinst.c

@@ -38 +38 @@
 #include <block.h>
 #include <byteorder.h>
-#include <cap.h>
+#include <capa.h>
 #include <errno.h>
 #include <fdisk.h>
@@ -98 +98 @@
         fdisk_part_spec_t pspec;
         fdisk_part_info_t pinfo;
-        cap_spec_t cap;
+        capa_spec_t capa;
         service_id_t sid;
         errno_t rc;
@@ -137 +137 @@
         printf("sysinst_label_dev(): create partition\n");
 
-        rc = fdisk_part_get_max_avail(fdev, spc_pri, &cap);
+        rc = fdisk_part_get_max_avail(fdev, spc_pri, &capa);
         if (rc != EOK) {
                 printf("Error getting available capacity: %s.\n", str_error(rc));
@@ -144 +144 @@
 
         fdisk_pspec_init(&pspec);
-        pspec.capacity = cap;
+        pspec.capacity = capa;
         pspec.pkind = lpk_primary;
         pspec.fstype = fs_ext4; /* Cannot be changed without modifying core.img */