From df9592756f903938c18c7d91d766680bb4005dc7 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Fri, 26 Aug 2011 13:09:41 -0400 Subject: [PATCH] Revert "partutil: Explicitly use PART_TYPE_UNKNOWN" This reverts commit 5d07c97811138fa1542dd09f3178dad812b81a23. --- src/helpers/partutil.c | 4 ++-- src/helpers/partutil.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/helpers/partutil.c b/src/helpers/partutil.c index ecec84c..63d3422 100644 --- a/src/helpers/partutil.c +++ b/src/helpers/partutil.c @@ -1410,7 +1410,7 @@ part_add_change_partition (char *device_file, DEBUG ("In part_add_partition: device_file=%s, start=%lld, size=%lld, type=%s", device_file, start, size, type); } - scheme = PART_TYPE_UNKNOWN; + scheme = -1; if (is_change) { PartitionTable *p; @@ -1456,7 +1456,7 @@ part_add_change_partition (char *device_file, /* now that we know the partitoning scheme, sanity check type and flags */ switch (scheme) { - case PART_TYPE_UNKNOWN: + case -1: /* unknown partition table format; error out if any type, label or flags are given */ if ((flags != NULL && flags[0] != NULL)) { diff --git a/src/helpers/partutil.h b/src/helpers/partutil.h index ffa4a22..cbd8c9b 100644 --- a/src/helpers/partutil.h +++ b/src/helpers/partutil.h @@ -32,7 +32,6 @@ /* Partition schemes understood by this library */ typedef enum { - PART_TYPE_UNKNOWN = -1, PART_TYPE_MSDOS = 0, PART_TYPE_MSDOS_EXTENDED = 1, PART_TYPE_APPLE = 2, -- 2.7.4