Linux NFS development
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: steved@redhat.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 3/4] libexport.a: Allow m_hostname allocation to fail instead of exit
Date: Mon, 19 Apr 2010 16:21:32 -0400	[thread overview]
Message-ID: <20100419202131.3567.12042.stgit@matisse.1015granger.net> (raw)
In-Reply-To: <20100419201855.3567.9644.stgit-RytpoXr2tKZ9HhUboXbp9zCvJB+x5qRC@public.gmane.org>

Clean up: Replace xstrdup() with strdup(3) in client_init(), to
prevent the process from exiting if the memory allocation fails.

Note that both of client_init()'s callers set m_hostname equal to NULL
before calling, thus the extra free(3) at the top of client_init() is
unneeded.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 support/export/client.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/support/export/client.c b/support/export/client.c
index 8f83da3..fc1ade9 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -55,7 +55,7 @@ init_addrlist(nfs_client *clp, const struct hostent *hp)
 static void
 client_free(nfs_client *clp)
 {
-	xfree(clp->m_hostname);
+	free(clp->m_hostname);
 	xfree(clp);
 }
 
@@ -154,11 +154,9 @@ client_dup(nfs_client *clp, struct hostent *hp)
 static int
 client_init(nfs_client *clp, const char *hname, struct hostent *hp)
 {
-	xfree(clp->m_hostname);
-	if (hp)
-		clp->m_hostname = xstrdup(hp->h_name);
-	else
-		clp->m_hostname = xstrdup(hname);
+	clp->m_hostname = strdup(hname);
+	if (clp->m_hostname == NULL)
+		return false;
 
 	clp->m_exported = 0;
 	clp->m_count = 0;


  parent reply	other threads:[~2010-04-19 20:21 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-19 20:20 [PATCH 0/4] Four more pre-requisites for mountd IPv6 support Chuck Lever
     [not found] ` <20100419201855.3567.9644.stgit-RytpoXr2tKZ9HhUboXbp9zCvJB+x5qRC@public.gmane.org>
2010-04-19 20:21   ` [PATCH 1/4] libexport.a: Add client_free() Chuck Lever
2010-04-19 20:21   ` [PATCH 2/4] libexport.a: Allow client_init() to fail instead of exit Chuck Lever
2010-04-19 20:21   ` Chuck Lever [this message]
2010-04-19 20:21   ` [PATCH 4/4] libexport.a: Allow malloc(3) failures in client_lookup() and friends Chuck Lever
2010-04-20 12:16   ` [PATCH 0/4] Four more pre-requisites for mountd IPv6 support Jeff Layton
2010-04-23 16:29 ` Steve Dickson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100419202131.3567.12042.stgit@matisse.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=steved@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox