linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benny Halevy <benny@tonian.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 05/10] ctl: always return a value from find_dm_name
Date: Mon,  5 Dec 2011 10:13:39 +0200	[thread overview]
Message-ID: <1323072819-18243-1-git-send-email-benny@tonian.com> (raw)
In-Reply-To: <4EDC7C4E.1040901@tonian.com>

From: Benny Halevy <bhalevy@tonian.com>

Signed-off-by: Benny Halevy <bhalevy@tonian.com>
---
 ctl.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ctl.c b/ctl.c
index 959ef6a..7432a09 100644
--- a/ctl.c
+++ b/ctl.c
@@ -494,7 +494,7 @@ find_dm_name(int major, int minor)
 	if (((fd = get_output("/sbin/dmsetup", argv)) == -1) ||
 	    ((fp = fdopen(fd, "r")) == NULL)) {
 		printf("%s: get_output/fdopen failed\n", __func__);
-		return;
+		return NULL;
 	}
 	while (fgets(buf, sizeof (buf), fp) != NULL) {
 		t = __token_init(buf, '\t');
@@ -545,6 +545,7 @@ error:
 	
 	fclose(fp);
 	(void) wait(&status);
+	return NULL;
 }
 
 static int
-- 
1.7.6


  parent reply	other threads:[~2011-12-05  8:13 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-05  8:09 [PATCH 0/10] pnfs-block ctl Benny Halevy
2011-12-05  8:12 ` [PATCH 01/10] use gcc Benny Halevy
2011-12-05  8:13 ` [PATCH 02/10] efi: fix user-land debug printouts Benny Halevy
2011-12-05  8:13 ` [PATCH 03/10] ctl: improve " Benny Halevy
2011-12-05  8:13 ` [PATCH 04/10] increase compiler warning level Benny Halevy
2011-12-05  8:13 ` Benny Halevy [this message]
2011-12-05  8:13 ` [PATCH 06/10] add missing includes Benny Halevy
2011-12-05  8:14 ` [PATCH 07/10] ctl: fix compiler warnings Benny Halevy
2011-12-05  8:14 ` [PATCH 08/10] fix compiler warnings around get_output use of argv Benny Halevy
2011-12-05  8:14 ` [PATCH 09/10] ctl: main should return 0 on success Benny Halevy
2011-12-05  8:14 ` [PATCH 10/10] efi: fix compiler warnings Benny Halevy

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=1323072819-18243-1-git-send-email-benny@tonian.com \
    --to=benny@tonian.com \
    --cc=linux-nfs@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).