summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorSami Kerola2017-03-05 21:52:20 +0100
committerKarel Zak2017-03-13 14:48:04 +0100
commitc308e2050f3b7cc08be64227644ce1020a27fdfe (patch)
tree9efe0572d5e3f63021d9c614b09c826c4ff50858 /disk-utils
parentlib/colors: assert rathen than overflow [-Wnull-dereference] (diff)
downloadkernel-qcow2-util-linux-c308e2050f3b7cc08be64227644ce1020a27fdfe.tar.gz
kernel-qcow2-util-linux-c308e2050f3b7cc08be64227644ce1020a27fdfe.tar.xz
kernel-qcow2-util-linux-c308e2050f3b7cc08be64227644ce1020a27fdfe.zip
misc: stop mixing declarations and code
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/cfdisk.c4
-rw-r--r--disk-utils/sfdisk.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index f06dad1c8..cb9f3421d 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -2092,6 +2092,8 @@ static int ui_create_label(struct cfdisk *cf)
do {
+ int key;
+
if (refresh_menu) {
ui_draw_menu(cf);
ui_hint(_("Select a type to create a new label or press 'L' to load script file."));
@@ -2099,7 +2101,7 @@ static int ui_create_label(struct cfdisk *cf)
refresh_menu = 0;
}
- int key = getch();
+ key = getch();
if (ui_resize)
ui_menu_resize(cf);
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index f4f9b6b1a..cf5dd0052 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1495,7 +1495,7 @@ static void follow_wipe_mode(struct sfdisk *sf)
static int wipe_partition(struct sfdisk *sf, size_t partno)
{
int rc, yes = 0;
- char *fstype = NULL;;
+ char *fstype = NULL;
struct fdisk_partition *tmp = NULL;
DBG(MISC, ul_debug("checking for signature"));