summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
83efd7d)
I'm about to add an object or two that needs to be freed before the main
functions exit. Prepare the logic by adding an 'out' label and some
goto's.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
{
struct sockaddr_in saddr;
char *hostname;
{
struct sockaddr_in saddr;
char *hostname;
+ int err, retval = EX_FAIL;
if (!parse_devname(spec, &hostname))
if (!parse_devname(spec, &hostname))
err = fill_ipv4_sockaddr(hostname, &saddr);
free(hostname);
if (!err)
err = fill_ipv4_sockaddr(hostname, &saddr);
free(hostname);
if (!err)
extract_interesting_options(*extra_opts);
if (!child && addr_opt) {
nfs_error(_("%s: Illegal option: 'addr='"), progname);
extract_interesting_options(*extra_opts);
if (!child && addr_opt) {
nfs_error(_("%s: Illegal option: 'addr='"), progname);
}
if (!append_addr_opt(&saddr, extra_opts))
}
if (!append_addr_opt(&saddr, extra_opts))
if (verbose)
printf(_("%s: text-based options: '%s'\n"),
if (verbose)
printf(_("%s: text-based options: '%s'\n"),
if (mount(spec, node, "nfs",
flags & ~(MS_USER|MS_USERS), *extra_opts)) {
mount_error(spec, node, errno);
if (mount(spec, node, "nfs",
flags & ~(MS_USER|MS_USERS), *extra_opts)) {
mount_error(spec, node, errno);
+ retval = EX_SUCCESS;
+
+out:
+ return retval;
{
struct sockaddr_in saddr;
char *hostname;
{
struct sockaddr_in saddr;
char *hostname;
+ int err, retval = EX_FAIL;
if (!parse_devname(spec, &hostname))
if (!parse_devname(spec, &hostname))
err = fill_ipv4_sockaddr(hostname, &saddr);
free(hostname);
if (!err)
err = fill_ipv4_sockaddr(hostname, &saddr);
free(hostname);
if (!err)
extract_interesting_options(*extra_opts);
if (addr_opt) {
nfs_error(_("%s: Illegal option: 'addr='"), progname);
extract_interesting_options(*extra_opts);
if (addr_opt) {
nfs_error(_("%s: Illegal option: 'addr='"), progname);
}
if (!append_addr_opt(&saddr, extra_opts))
}
if (!append_addr_opt(&saddr, extra_opts))
if (!ca_opt && !append_clientaddr_opt(&saddr, extra_opts))
if (!ca_opt && !append_clientaddr_opt(&saddr, extra_opts))
if (verbose)
printf(_("%s: text-based options: '%s'\n"),
if (verbose)
printf(_("%s: text-based options: '%s'\n"),
if (mount(spec, node, "nfs4",
flags & ~(MS_USER|MS_USERS), *extra_opts)) {
mount_error(spec, node, errno);
if (mount(spec, node, "nfs4",
flags & ~(MS_USER|MS_USERS), *extra_opts)) {
mount_error(spec, node, errno);
+ retval = EX_SUCCESS;
+
+out:
+ return retval;