From 62d50bbe031cbea42b2b5217b78f2c6a06c7443d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 22 Jan 2013 14:02:22 +0100 Subject: [PATCH] libfdisk: (gpt) move code from fdisk to libfdisk Signed-off-by: Karel Zak --- fdisks/Makemodule.am | 2 -- fdisks/fdisk.c | 3 --- fdisks/gpt.h | 6 ------ libfdisk/src/Makemodule.am | 3 ++- libfdisk/src/fdiskP.h | 4 ++++ {fdisks => libfdisk/src}/gpt.c | 16 +++++++++++++--- 6 files changed, 19 insertions(+), 15 deletions(-) delete mode 100644 fdisks/gpt.h rename {fdisks => libfdisk/src}/gpt.c (99%) diff --git a/fdisks/Makemodule.am b/fdisks/Makemodule.am index 442d4bf0c6..dcb48e52f0 100644 --- a/fdisks/Makemodule.am +++ b/fdisks/Makemodule.am @@ -19,8 +19,6 @@ fdisk_SOURCES = \ fdisks/fdisksgilabel.h \ fdisks/fdisksunlabel.c \ fdisks/fdisksunlabel.h \ - fdisks/gpt.c \ - fdisks/gpt.h \ fdisks/partname.c \ fdisks/common.h diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c index 62ecdf4a99..d091a5d517 100644 --- a/fdisks/fdisk.c +++ b/fdisks/fdisk.c @@ -49,9 +49,6 @@ #include #endif -#include "gpt.h" - - /* menu list description */ struct menulist_descr { diff --git a/fdisks/gpt.h b/fdisks/gpt.h deleted file mode 100644 index 645a014e88..0000000000 --- a/fdisks/gpt.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef FDISK_GPT_H -#define FDISK_GPT_H - -extern void gpt_list_table(struct fdisk_context *cxt, int xtra); - -#endif /* FDISK_GPT_H */ diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am index 4f9048e90a..20d4e4e660 100644 --- a/libfdisk/src/Makemodule.am +++ b/libfdisk/src/Makemodule.am @@ -13,7 +13,8 @@ libfdisk_la_SOURCES = \ libfdisk/src/label.c \ libfdisk/src/utils.c \ libfdisk/src/context.c \ - libfdisk/src/parttype.c + libfdisk/src/parttype.c \ + libfdisk/src/gpt.c nodist_libfdisk_la_SOURCES = libfdisk/src/fdiskP.h diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h index 3a5ab4a7eb..bf39211822 100644 --- a/libfdisk/src/fdiskP.h +++ b/libfdisk/src/fdiskP.h @@ -251,4 +251,8 @@ extern int fdisk_read_firstsector(struct fdisk_context *cxt); extern int fdisk_probe_labels(struct fdisk_context *cxt); extern void fdisk_deinit_label(struct fdisk_label *lb); + +/* gpt.c -- temporary bypass library API... */ +extern void gpt_list_table(struct fdisk_context *cxt, int xtra); + #endif /* _LIBFDISK_PRIVATE_H */ diff --git a/fdisks/gpt.c b/libfdisk/src/gpt.c similarity index 99% rename from fdisks/gpt.c rename to libfdisk/src/gpt.c index 3a9f541817..03fad41efc 100644 --- a/fdisks/gpt.c +++ b/libfdisk/src/gpt.c @@ -34,17 +34,27 @@ #include #include +#include "fdiskP.h" + #include "nls.h" #include "xalloc.h" -#include "common.h" -#include "fdisk.h" #include "crc32.h" -#include "gpt.h" #include "blkdev.h" #include "bitops.h" #include "strutils.h" #include "all-io.h" +/* temporary -- exported from fdisk/sfdisk.c + * TODO: use fdisk_dialog API + */ +extern unsigned int read_int(struct fdisk_context *cxt, + unsigned int low, unsigned int dflt, + unsigned int high, unsigned int base, char *mesg); + +extern unsigned int read_int_with_suffix(struct fdisk_context *cxt, + unsigned int low, unsigned int dflt, unsigned int high, + unsigned int base, char *mesg, int *is_suffix_used); + #define GPT_HEADER_SIGNATURE 0x5452415020494645LL /* EFI PART */ #define GPT_HEADER_REVISION_V1_02 0x00010200 #define GPT_HEADER_REVISION_V1_00 0x00010000 -- 2.47.2