From patchwork Fri Dec 2 03:26:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 9457735 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A45C260235 for ; Fri, 2 Dec 2016 03:27:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 979582846F for ; Fri, 2 Dec 2016 03:27:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C243284FE; Fri, 2 Dec 2016 03:27:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_TVD_MIME_EPI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6964128518 for ; Fri, 2 Dec 2016 03:27:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752365AbcLBD1G (ORCPT ); Thu, 1 Dec 2016 22:27:06 -0500 Received: from mx2.suse.de ([195.135.220.15]:60882 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751227AbcLBD1F (ORCPT ); Thu, 1 Dec 2016 22:27:05 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0AF0AAAA3; Fri, 2 Dec 2016 03:27:03 +0000 (UTC) From: NeilBrown To: Steve Dickson Date: Fri, 02 Dec 2016 14:26:56 +1100 Cc: linux-nfs@vger.kernel.org Subject: [PATCH 4/4 revised] Remove error messages on xstrdup failure. In-Reply-To: <148064098431.9179.10389198547881177509.stgit@noble> References: <148064084082.9179.6570593128436337540.stgit@noble> <148064098431.9179.10389198547881177509.stgit@noble> User-Agent: Notmuch/0.22.1 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-suse-linux-gnu) Message-ID: <878trz6mf3.fsf@notabene.neil.brown.name> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP xstrdup() prints a messages and exits, except in statd where is prints a message and fails. So there is no point printing an extra message when xstrdup() fails, and except in statd, no point calling exit() as well. So remove some pointless code. Signed-off-by: NeilBrown --- Sorry, missed an include file in nfsd.c The output of 'make' is too noisy :-( It is easy to miss things (and something about bad workmen and tools). NeilBrown utils/mountd/mountd.c | 6 +----- utils/nfsd/nfsd.c | 35 ++++++----------------------------- utils/nfsidmap/nfsidmap.c | 6 +----- utils/statd/statd.c | 5 +---- 4 files changed, 9 insertions(+), 43 deletions(-) diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index a0ab2935136a..d6cebbbd3920 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -721,11 +721,7 @@ main(int argc, char **argv) reverse_resolve = 1; break; case 's': - if ((state_dir = xstrdup(optarg)) == NULL) { - fprintf(stderr, "%s: xstrdup(%s) failed!\n", - progname, optarg); - exit(1); - } + state_dir = xstrdup(optarg); break; case 't': num_threads = atoi (optarg); diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c index 7b5e67a09bd2..9a65877f30c3 100644 --- a/utils/nfsd/nfsd.c +++ b/utils/nfsd/nfsd.c @@ -27,6 +27,7 @@ #include "nfslib.h" #include "nfssvc.h" #include "xlog.h" +#include "xcommon.h" #ifndef NFSD_NPROC #define NFSD_NPROC 8 @@ -67,23 +68,9 @@ main(int argc, char **argv) int grace = -1; int lease = -1; - progname = strdup(basename(argv[0])); - if (!progname) { - fprintf(stderr, "%s: unable to allocate memory.\n", argv[0]); - exit(1); - } - - port = strdup("nfs"); - if (!port) { - fprintf(stderr, "%s: unable to allocate memory.\n", progname); - exit(1); - } - - haddr = malloc(sizeof(char *)); - if (!haddr) { - fprintf(stderr, "%s: unable to allocate memory.\n", progname); - exit(1); - } + progname = xstrdup(basename(argv[0])); + port = xstrdup("nfs"); + haddr = xmalloc(sizeof(char *)); haddr[0] = NULL; xlog_syslog(0); @@ -103,12 +90,7 @@ main(int argc, char **argv) exit(1); } } - haddr[hcounter] = strdup(optarg); - if (!haddr[hcounter]) { - fprintf(stderr, "%s: unable to allocate " - "memory.\n", progname); - exit(1); - } + haddr[hcounter] = xstrdup(optarg); hcounter++; break; case 'P': /* XXX for nfs-server compatibility */ @@ -121,12 +103,7 @@ main(int argc, char **argv) usage(progname); } free(port); - port = strdup(optarg); - if (!port) { - fprintf(stderr, "%s: unable to allocate " - "memory.\n", progname); - exit(1); - } + port = xstrdup(optarg); break; case 'r': rdma_port = "nfsrdma"; diff --git a/utils/nfsidmap/nfsidmap.c b/utils/nfsidmap/nfsidmap.c index 63545fc09143..a027343a078d 100644 --- a/utils/nfsidmap/nfsidmap.c +++ b/utils/nfsidmap/nfsidmap.c @@ -441,11 +441,7 @@ int main(int argc, char **argv) key = strtol(argv[optind++], NULL, 10); - arg = strdup(argv[optind]); - if (arg == NULL) { - xlog_err("strdup failed: %m"); - return EXIT_FAILURE; - } + arg = xstrdup(argv[optind]); type = strtok(arg, ":"); value = strtok(NULL, ":"); if (value == NULL) { diff --git a/utils/statd/statd.c b/utils/statd/statd.c index e5b4c980a86b..15f2b18d104d 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -332,11 +332,8 @@ int main (int argc, char **argv) exit(1); break; case 'H': /* PRC: specify the ha-callout program */ - if ((ha_callout_prog = xstrdup(optarg)) == NULL) { - fprintf(stderr, "%s: xstrdup(%s) failed!\n", - argv[0], optarg); + if ((ha_callout_prog = xstrdup(optarg)) == NULL) exit(1); - } break; case '?': /* heeeeeelllllllpppp? heh */ case 'h':