From: Karel Zak Date: Tue, 17 Sep 2013 13:13:15 +0000 (+0200) Subject: fdisk: remove unnecessary test X-Git-Tag: v2.24-rc1~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5db5e805279f0c987479fe2a8f88cae2ea6ac41;p=thirdparty%2Futil-linux.git fdisk: remove unnecessary test Signed-off-by: Karel Zak --- diff --git a/fdisks/Makemodule.am b/fdisks/Makemodule.am index 43287e804b..f2c594cc33 100644 --- a/fdisks/Makemodule.am +++ b/fdisks/Makemodule.am @@ -31,12 +31,6 @@ fdisk_static_CFLAGS = $(fdisk_CFLAGS) fdisk_static_LDADD = $(fdisk_LDADD) endif -check_PROGRAMS += test_fdisk_menu - -test_fdisk_menu_SOURCES = fdisks/fdisk-menu.c -test_fdisk_menu_CFLAGS = -DTEST_PROGRAM $(fdisk_CFLAGS) -test_fdisk_menu_LDADD = $(fdisk_LDADD) - endif # BUILD_FDISK diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c index 10450cc65d..7251307245 100644 --- a/fdisks/fdisk-menu.c +++ b/fdisks/fdisk-menu.c @@ -809,28 +809,3 @@ static int createlabel_menu_cb(struct fdisk_context **cxt0, } return rc; } - -#ifdef TEST_PROGRAM -struct fdisk_label *fdisk_new_dos_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; } - -int main(int argc, char *argv[]) -{ - struct fdisk_context *cxt; - int idx = 1; - - fdisk_init_debug(0); - cxt = fdisk_new_context(); - - if (argc > idx && strcmp(argv[idx], "--expert") == 0) { - fdisk_context_enable_details(cxt, 1); - idx++; - } - fdisk_context_switch_label(cxt, argc > idx ? argv[idx] : "gpt"); - - print_fdisk_menu(cxt); - return 0; -} -#endif