diff options
author | Karel Zak | 2013-03-12 11:37:33 +0100 |
---|---|---|
committer | Karel Zak | 2013-03-12 11:37:33 +0100 |
commit | d23c661c4764dc3c11db0b5f624e92f329f37847 (patch) | |
tree | eec3855e7d8187fb8a085f9b681f6b877d48ab1d /libfdisk/src | |
parent | tests: update fdisk tests (diff) | |
download | kernel-qcow2-util-linux-d23c661c4764dc3c11db0b5f624e92f329f37847.tar.gz kernel-qcow2-util-linux-d23c661c4764dc3c11db0b5f624e92f329f37847.tar.xz kernel-qcow2-util-linux-d23c661c4764dc3c11db0b5f624e92f329f37847.zip |
fdisk: no more AIX "support"
The whole AIX support in fdisk has been limited to pretty poor AIX
magic string detection and warning that the AIX is unsupported. It's
too expensive to maintain such fdisk driver.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src')
-rw-r--r-- | libfdisk/src/ask.c | 1 | ||||
-rw-r--r-- | libfdisk/src/context.c | 1 | ||||
-rw-r--r-- | libfdisk/src/fdiskP.h | 1 | ||||
-rw-r--r-- | libfdisk/src/libfdisk.h | 7 |
4 files changed, 3 insertions, 7 deletions
diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c index 8ce9e5c34..d2325d5fe 100644 --- a/libfdisk/src/ask.c +++ b/libfdisk/src/ask.c @@ -531,7 +531,6 @@ int fdisk_warnx(struct fdisk_context *cxt, const char *fmt, ...) #ifdef TEST_PROGRAM struct fdisk_label *fdisk_new_dos_label(struct fdisk_context *cxt) { return NULL; } -struct fdisk_label *fdisk_new_aix_label(struct fdisk_context *cxt) { return NULL; } struct fdisk_label *fdisk_new_bsd_label(struct fdisk_context *cxt) { return NULL; } struct fdisk_label *fdisk_new_mac_label(struct fdisk_context *cxt) { return NULL; } struct fdisk_label *fdisk_new_sgi_label(struct fdisk_context *cxt) { return NULL; } diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c index 814d84c4f..da2d5588a 100644 --- a/libfdisk/src/context.c +++ b/libfdisk/src/context.c @@ -20,7 +20,6 @@ struct fdisk_context *fdisk_new_context(void) */ cxt->labels[ cxt->nlabels++ ] = fdisk_new_gpt_label(cxt); cxt->labels[ cxt->nlabels++ ] = fdisk_new_dos_label(cxt); - cxt->labels[ cxt->nlabels++ ] = fdisk_new_aix_label(cxt); cxt->labels[ cxt->nlabels++ ] = fdisk_new_bsd_label(cxt); cxt->labels[ cxt->nlabels++ ] = fdisk_new_mac_label(cxt); cxt->labels[ cxt->nlabels++ ] = fdisk_new_sgi_label(cxt); diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h index 89a96d964..570108c93 100644 --- a/libfdisk/src/fdiskP.h +++ b/libfdisk/src/fdiskP.h @@ -203,7 +203,6 @@ enum { /* label allocators */ extern struct fdisk_label *fdisk_new_gpt_label(struct fdisk_context *cxt); extern struct fdisk_label *fdisk_new_dos_label(struct fdisk_context *cxt); -extern struct fdisk_label *fdisk_new_aix_label(struct fdisk_context *cxt); extern struct fdisk_label *fdisk_new_bsd_label(struct fdisk_context *cxt); extern struct fdisk_label *fdisk_new_mac_label(struct fdisk_context *cxt); extern struct fdisk_label *fdisk_new_sgi_label(struct fdisk_context *cxt); diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h index a08a2afa5..0a23236ea 100644 --- a/libfdisk/src/libfdisk.h +++ b/libfdisk/src/libfdisk.h @@ -40,10 +40,9 @@ enum fdisk_labeltype { FDISK_DISKLABEL_DOS = 1, FDISK_DISKLABEL_SUN = 2, FDISK_DISKLABEL_SGI = 4, - FDISK_DISKLABEL_AIX = 8, - FDISK_DISKLABEL_OSF = 16, - FDISK_DISKLABEL_MAC = 32, - FDISK_DISKLABEL_GPT = 64, + FDISK_DISKLABEL_OSF = 8, + FDISK_DISKLABEL_MAC = 16, + FDISK_DISKLABEL_GPT = 32, FDISK_DISKLABEL_ANY = -1 }; |