summaryrefslogtreecommitdiff
path: root/resize/main.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>1998-02-24 20:24:49 +0000
committerTheodore Ts'o <tytso@mit.edu>1998-02-24 20:24:49 +0000
commit3b627e8d6735fd81906117d580ee70292b2cfaaf (patch)
tree0ff2ce9099e1098d938ece7dd2a8883fc28ae5e5 /resize/main.c
parenta02ce9df5ff5db2982462aec7162f7142dc18131 (diff)
downloade2fsprogs-3b627e8d6735fd81906117d580ee70292b2cfaaf.tar.gz
ChangeLog, main.c, resize2fs.c, resize2fs.h:
Change the progress function to return an errcode_t; this allows the progress function to return a error indicating a user-requested cancel.
Diffstat (limited to 'resize/main.c')
-rw-r--r--resize/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/resize/main.c b/resize/main.c
index 7e25a8a5..b2518869 100644
--- a/resize/main.c
+++ b/resize/main.c
@@ -28,8 +28,8 @@ static volatile void usage (char *prog)
exit (1);
}
-static void resize_progress_func(ext2_resize_t rfs, int pass,
- unsigned long cur, unsigned long max)
+static errcode_t resize_progress_func(ext2_resize_t rfs, int pass,
+ unsigned long cur, unsigned long max)
{
ext2_sim_progmeter progress;
const char *label;
@@ -37,7 +37,7 @@ static void resize_progress_func(ext2_resize_t rfs, int pass,
progress = (ext2_sim_progmeter) rfs->prog_data;
if (max == 0)
- return;
+ return 0;
if (cur == 0) {
if (progress)
ext2fs_progress_close(progress);
@@ -77,6 +77,7 @@ static void resize_progress_func(ext2_resize_t rfs, int pass,
progress = 0;
rfs->prog_data = 0;
}
+ return 0;
}
static void check_mount(char *device_name)