firmware-utils/ptgen: fix partition guid and name

[project/firmware-utils.git] / src / ptgen.c

diff --git a/src/ptgen.c b/src/ptgen.c
index 93c2d32a3ffcfc7d9d2b86de91861443d223e25a..d50c12b71432bd3ce9282af2f77ac1d1b4e7e919 100644 (file)
--- a/src/ptgen.c
+++ b/src/ptgen.c
@@ -311,7 +311,7 @@ static int gen_ptable(uint32_t signature, int nr)
                if (parts[i].start != 0) {
                        if (parts[i].start * 2 < start) {
                                fprintf(stderr, "Invalid start %ld for partition %d!\n",
-                                       parts[i].start, i, start);
+                                       parts[i].start, i);
                                return ret;
                        }
                        start = parts[i].start * 2;
@@ -398,7 +398,7 @@ static int gen_gptable(uint32_t signature, guid_t guid, unsigned nr)
                if (parts[i].start != 0) {
                        if (parts[i].start * 2 < start) {
                                fprintf(stderr, "Invalid start %ld for partition %d!\n",
-                                       parts[i].start, i, start);
+                                       parts[i].start, i);
                                return ret;
                        }
                        start = parts[i].start * 2;
@@ -529,7 +529,8 @@ static guid_t type_to_guid_and_name(unsigned char type, char **name)
 
        switch (type) {
                case 0xef:
-                       *name = "EFI System Partition";
+                       if(*name == NULL)
+                               *name = "EFI System Partition";
                        guid = GUID_PARTITION_SYSTEM;
                        break;
                case 0x83:
@@ -586,6 +587,7 @@ int main (int argc, char **argv)
                                *(p++) = 0;
                                parts[part].start = to_kbytes(p);
                        }
+                       part_guid = type_to_guid_and_name(type, &name);
                        parts[part].size = to_kbytes(optarg);
                        parts[part].required = required;
                        parts[part].name = name;
@@ -598,7 +600,6 @@ int main (int argc, char **argv)
                         */
                        name = NULL;
                        required = 0;
-                       part_guid = type_to_guid_and_name(type, &name);
                        break;
                case 'N':
                        name = optarg;