From d0c4ef4f820977a586d1197e8f9f8b9c5ea8f5a0 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 25 Oct 1996 03:06:50 +0000 Subject: (main): Rename ARGP_PARENTS to ARGP_CHILDREN, and change the element type to `struct argp_child'; change the reference in ARGP accordingly. (runtime_argp_children): New variable. (runtime_argp_parents): Variable removed. (runtime_argp): Use RUNTIME_ARGP_CHILDREN, not RUNTIME_ARGP_PARENTS. --- nfs/main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'nfs/main.c') diff --git a/nfs/main.c b/nfs/main.c index a757fe81..271453a6 100644 --- a/nfs/main.c +++ b/nfs/main.c @@ -176,10 +176,11 @@ static char *doc = "Hurd nfs translator" "\vIf HOST is not specified, an attempt is made to extract" " it from REMOTE_FS, using either the `HOST:FS' or `FS@HOST' notations."; -static const struct argp * -runtime_argp_parents[] = { &netfs_std_runtime_argp, 0 }; +static const struct argp_child +runtime_argp_children[] = { {&netfs_std_runtime_argp}, {0} }; static struct argp -runtime_argp = { common_options, parse_common_opt, 0, 0, runtime_argp_parents }; +runtime_argp = { common_options, parse_common_opt, 0, 0, + runtime_argp_children }; /* Use by netfs_set_options to handle runtime option parsing. */ struct argp *netfs_runtime_argp = &runtime_argp; @@ -311,10 +312,10 @@ int main (int argc, char **argv) { struct argp common_argp = { common_options, parse_common_opt }; - const struct argp *argp_parents[] = - { &common_argp, &netfs_std_startup_argp, 0 }; + const struct argp_child argp_children[] = + { {&common_argp}, {&netfs_std_startup_argp}, {0} }; struct argp argp = - { startup_options, parse_startup_opt, args_doc, doc, argp_parents }; + { startup_options, parse_startup_opt, args_doc, doc, argp_children }; mach_port_t bootstrap; struct sockaddr_in addr; int ret; -- cgit v1.2.3