text-based mount.nfs: prepare for more complex error exit handling
Subsystems (2)
PATCH 3/7 text-based mount.nfs: prepare for more complex error exit handling
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 <[email protected]>
---
utils/mount/stropts.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-)
utils/mount/stropts.c +21 -15
@@ -307,24 +307,24 @@ int nfsmount_s(const char *spec, const char *node, int flags, {struct sockaddr_in saddr;char *hostname; -int err; +int err, retval =EX_FAIL ;if (!parse_devname (spec, &hostname)) -return EX_FAIL ; + goto out; err =fill_ipv4_sockaddr (hostname, &saddr);free (hostname);if (!err) -return EX_FAIL ; + goto out;extract_interesting_options (*extra_opts);if (!child && addr_opt) {nfs_error (_ ("%s: Illegal option: 'addr='" ), progname); -return EX_FAIL ; + goto out; }if (!append_addr_opt (&saddr, extra_opts)) -return EX_FAIL ; + goto out;if (verbose) printf(_("%s: text-based options: '%s'\n"),
@@ -334,11 +334,14 @@ int nfsmount_s(const char *spec, const char *node, int flags,if (mount (spec, node,"nfs" , flags & ~(MS_USER |MS_USERS ), *extra_opts)) {mount_error (spec, node, errno); -return EX_FAIL ; + goto out; } } -return EX_SUCCESS ; + retval =EX_SUCCESS ; + +out: +return retval; }/*
@@ -360,27 +363,27 @@ int nfs4mount_s(const char *spec, const char *node, int flags, {struct sockaddr_in saddr;char *hostname; -int err; +int err, retval =EX_FAIL ;if (!parse_devname (spec, &hostname)) -return EX_FAIL ; + goto out; err =fill_ipv4_sockaddr (hostname, &saddr);free (hostname);if (!err) -return EX_FAIL ; + goto out;extract_interesting_options (*extra_opts);if (addr_opt) {nfs_error (_ ("%s: Illegal option: 'addr='" ), progname); -return EX_FAIL ; + goto out; }if (!append_addr_opt (&saddr, extra_opts)) -return EX_FAIL ; + goto out;if (!ca_opt && !append_clientaddr_opt (&saddr, extra_opts)) -return EX_FAIL ; + goto out;if (verbose) printf(_("%s: text-based options: '%s'\n"),
@@ -390,9 +393,12 @@ int nfs4mount_s(const char *spec, const char *node, int flags,if (mount (spec, node,"nfs4" , flags & ~(MS_USER |MS_USERS ), *extra_opts)) {mount_error (spec, node, errno); -return EX_FAIL ; + goto out; } } -return EX_SUCCESS ; + retval =EX_SUCCESS ; + +out: +return retval; }
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs