summaryrefslogtreecommitdiffstats
path: root/fdisks/fdiskdoslabel.c
diff options
context:
space:
mode:
authorDavidlohr Bueso2012-11-26 05:25:49 +0100
committerKarel Zak2012-11-30 13:48:19 +0100
commitff5775bd4f391facbfecc864a394b5be55179a85 (patch)
treeab1a1b812dc1368e5ff2f2524703a0f5b930ef46 /fdisks/fdiskdoslabel.c
parentMerge branch '2012wk47' of git://github.com/kerolasa/lelux-utiliteetit (diff)
downloadkernel-qcow2-util-linux-ff5775bd4f391facbfecc864a394b5be55179a85.tar.gz
kernel-qcow2-util-linux-ff5775bd4f391facbfecc864a394b5be55179a85.tar.xz
kernel-qcow2-util-linux-ff5775bd4f391facbfecc864a394b5be55179a85.zip
fdisk: api: move disklabel type to cxt
Get rid of it as a global variable as it belongs in the context. To compare a disklabel on the device, the fdisk_dev_is_disklabel() function is introduced. Also, to avoid naming issues, the fdisk_labeltype members where renamed to FDISK_DISKLABEL_<type>. Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Diffstat (limited to 'fdisks/fdiskdoslabel.c')
-rw-r--r--fdisks/fdiskdoslabel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c
index 0ace7f846..ecc041f09 100644
--- a/fdisks/fdiskdoslabel.c
+++ b/fdisks/fdiskdoslabel.c
@@ -118,7 +118,7 @@ void dos_init(struct fdisk_context *cxt)
{
int i;
- disklabel = DOS_LABEL;
+ cxt->disklabel = FDISK_DISKLABEL_DOS;
partitions = 4;
ext_index = 0;
extended_offset = 0;