(startup_children, runtime_children):

  New variables.
(startup_parents, runtime_parents):
  Variables removed.
(startup_argp, runtime_argp):
  Use new *_CHILDREN variables instead of corresponding *_PARENT ones.

1 files changed, 6 insertions, 4 deletions

diff --git a/ext2fs/ext2fs.c b/ext2fs/ext2fs.c
index f3a23c68..5939de5d 100644
--- a/ext2fs/ext2fs.c
+++ b/ext2fs/ext2fs.c
@@ -122,12 +122,14 @@ diskfs_append_args (char **argz, unsigned *argz_len)
 }
 
 /* Add our startup arguments to the standard diskfs set.  */
-static const struct argp *startup_parents[] = { &diskfs_store_startup_argp, 0};
-static struct argp startup_argp = {options, parse_opt, 0, 0, startup_parents};
+static const struct argp_child startup_children[] =
+  {{&diskfs_store_startup_argp}, {0}};
+static struct argp startup_argp = {options, parse_opt, 0, 0, startup_children};
 
 /* Similarly at runtime.  */
-static const struct argp *runtime_parents[] = {&diskfs_std_runtime_argp, 0};
-static struct argp runtime_argp = {options, parse_opt, 0, 0, runtime_parents};
+static const struct argp_child runtime_children[] =
+  {{&diskfs_std_runtime_argp}, {0}};
+static struct argp runtime_argp = {options, parse_opt, 0, 0, runtime_children};
 
 struct argp *diskfs_runtime_argp = (struct argp *)&runtime_argp;