(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/ufs/main.c b/ufs/main.c
index a42f8158..f0ffa3f5 100644
--- a/ufs/main.c
+++ b/ufs/main.c
@@ -120,12 +120,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
 }
 
 /* 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;