Merge branch 'maint' into next

[tools/e2fsprogs.git] / resize / sim_progress.c

diff --git a/resize/sim_progress.c b/resize/sim_progress.c
index b3ec589..321becd 100644 (file)
--- a/resize/sim_progress.c
+++ b/resize/sim_progress.c
@@ -4,14 +4,15 @@
  * Copyright (C) 1997, 1998 by Theodore Ts'o and
  *     PowerQuest, Inc.
  *
- * Copyright (C) 1999, 2000 by Theosore Ts'o
- * 
+ * Copyright (C) 1999, 2000 by Theodore Ts'o
+ *
  * %Begin-Header%
  * This file may be redistributed under the terms of the GNU Public
  * License.
  * %End-Header%
  */
 
+#include "config.h"
 #include "resize2fs.h"
 
 struct ext2_sim_progress {
@@ -58,7 +59,7 @@ void ext2fs_progress_update(ext2_sim_progmeter prog, __u32 current)
        num = level - old_level;
        if (num == 0)
                return;
-       
+
        if (num > 0) {
                for (i=0; i < num; i++)
                        putc('X', prog->f);
@@ -82,13 +83,12 @@ errcode_t ext2fs_progress_init(ext2_sim_progmeter *ret_prog,
        ext2_sim_progmeter      prog;
        errcode_t               retval;
 
-       retval = ext2fs_get_mem(sizeof(struct ext2_sim_progress),
-                               (void **) &prog);
-       if (!prog)
+       retval = ext2fs_get_mem(sizeof(struct ext2_sim_progress), &prog);
+       if (retval)
                return retval;
        memset(prog, 0, sizeof(struct ext2_sim_progress));
 
-       retval = ext2fs_get_mem(strlen(label)+1, (void **) &prog->label);
+       retval = ext2fs_get_mem(strlen(label)+1, &prog->label);
        if (retval) {
                free(prog);
                return retval;
@@ -101,7 +101,7 @@ errcode_t ext2fs_progress_init(ext2_sim_progmeter *ret_prog,
        prog->current = 0;
        prog->shown = 0;
        prog->f = stdout;
-       
+
        *ret_prog = prog;
 
        return ext2fs_progress_display(prog);
@@ -111,8 +111,8 @@ void ext2fs_progress_close(ext2_sim_progmeter prog)
 {
 
        if (prog->label)
-               ext2fs_free_mem((void **) &prog->label);
-       ext2fs_free_mem((void **) &prog);
+               ext2fs_free_mem(&prog->label);
+       ext2fs_free_mem(&prog);
        printf("\n");
        return;
 }