summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>1996-10-24 22:13:16 +0000
committerMiles Bader <miles@gnu.org>1996-10-24 22:13:16 +0000
commit05a286f34456b6f62887c4d8feab0b6118dfba6f (patch)
treecb76635e3d0f8d4cafcb4f6ee34fa25ea1935843
parent51efb6ed53b87c0adcf23cd10e2bb5762665ffd8 (diff)
(store_argp_children, startup_argp_children):
New variables. (diskfs_store_startup_argp): Use STORE_ARGP_CHILDREN instead of STORE_ARGP_PARENTS. (store_argp_parents, startup_argp_children): Variable removed. (diskfs_startup_argp): Use STARTUP_ARGP_CHILDREN instead of STARTUP_ARGP_PARENTS.
-rw-r--r--libdiskfs/opts-std-startup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libdiskfs/opts-std-startup.c b/libdiskfs/opts-std-startup.c
index 794db81a..1488fdb5 100644
--- a/libdiskfs/opts-std-startup.c
+++ b/libdiskfs/opts-std-startup.c
@@ -93,15 +93,15 @@ parse_startup_opt (int opt, char *arg, struct argp_state *state)
/* Suck in the common arguments. */
static const struct argp startup_common_argp =
{ diskfs_common_options, parse_startup_opt };
+static const struct argp_child startup_argp_children[] =
+ { {&startup_common_argp}, {0} };
/* This may be used with argp_parse to parse standard diskfs startup
options, possible chained onto the end of a user argp structure. */
-static const struct argp *startup_argp_parents[] = { &startup_common_argp, 0 };
-
const struct argp
diskfs_startup_argp =
{
- startup_options, parse_startup_opt, 0, 0, startup_argp_parents
+ startup_options, parse_startup_opt, 0, 0, startup_argp_children
};
static error_t
@@ -120,8 +120,8 @@ parse_store_startup_opt (int opt, char *arg, struct argp_state *state)
return 0;
}
-static const struct argp *store_argp_parents[] =
- { &diskfs_startup_argp, &store_argp, 0 };
+static const struct argp_child store_argp_children[] =
+ { {&diskfs_startup_argp}, {&store_argp}, {0} };
/* An argp structure for the standard diskfs command line arguments plus a
store specification. The address of a location in which to return the
@@ -131,5 +131,5 @@ static const struct argp *store_argp_parents[] =
const struct argp
diskfs_store_startup_argp =
{
- 0, parse_store_startup_opt, 0, 0, store_argp_parents
+ 0, parse_store_startup_opt, 0, 0, store_argp_children
};