diff options
| author | Davidlohr Bueso | 2012-07-22 19:05:01 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-07-23 17:31:06 +0200 |
| commit | 79c8a145ddff98d9c5bc70e67c5a861f67c50484 (patch) | |
| tree | db36e3870a18fa7ae76fe42cafb96428eebb678f /fdisks/fdisk.c | |
| parent | fdisk: rename cxt->mbr buffer to cxt->firstsector (diff) | |
| download | kernel-qcow2-util-linux-79c8a145ddff98d9c5bc70e67c5a861f67c50484.tar.gz kernel-qcow2-util-linux-79c8a145ddff98d9c5bc70e67c5a861f67c50484.tar.xz kernel-qcow2-util-linux-79c8a145ddff98d9c5bc70e67c5a861f67c50484.zip | |
fdisk: API: add to label operations to context
The context structure is the fdisk API's main data type as it keeps all data
together. Add the label structure to it, so that the pt-specific operations can
be called from the context.
[kzak@redhat.com: - merge with latest changes
- don't allocate the label, use const pointer]
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Diffstat (limited to 'fdisks/fdisk.c')
| -rw-r--r-- | fdisks/fdisk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c index 010431d27..0c837a315 100644 --- a/fdisks/fdisk.c +++ b/fdisks/fdisk.c @@ -68,7 +68,7 @@ int MBRbuffer_changed; struct menulist_descr { char command; /* command key */ char *description; /* command description */ - enum labeltype label[2]; /* disklabel types associated with main and expert menu */ + enum fdisk_labeltype label[2]; /* disklabel types associated with main and expert menu */ }; static const struct menulist_descr menulist[] = { @@ -133,7 +133,7 @@ unsigned int user_cylinders, user_heads, user_sectors; sector_t sector_offset = 1; unsigned int units_per_sector = 1, display_in_cyl_units = 0; unsigned long grain = DEFAULT_SECTOR_SIZE; -enum labeltype disklabel; /* Current disklabel */ +enum fdisk_labeltype disklabel; /* Current disklabel */ static void __attribute__ ((__noreturn__)) usage(FILE *out) { |