From patchwork Thu Jan 24 18:35:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 215469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "aserp1040.oracle.com", Issuer "VeriSign Class 3 International Server CA - G3" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 983B92C008C for ; Fri, 25 Jan 2013 05:35:31 +1100 (EST) Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0OIZS8K017046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 24 Jan 2013 18:35:28 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0OIZREM018072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Jan 2013 18:35:28 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TyRe3-0000Pu-Qc; Thu, 24 Jan 2013 10:35:27 -0800 Received: from ucsinet21.oracle.com ([156.151.31.93]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TyRe2-0000Pk-7m for fedfs-utils-devel@oss.oracle.com; Thu, 24 Jan 2013 10:35:26 -0800 Received: from aserp1020.oracle.com (aserp1020.oracle.com [141.146.126.67]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0OIZPBN020279 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Jan 2013 18:35:25 GMT Received: from mail-ob0-f176.google.com (mail-ob0-f176.google.com [209.85.214.176]) by aserp1020.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0OIZO2A003019 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Thu, 24 Jan 2013 18:35:25 GMT Received: by mail-ob0-f176.google.com with SMTP id v19so1098914obq.21 for ; Thu, 24 Jan 2013 10:35:24 -0800 (PST) X-Received: by 10.50.151.176 with SMTP id ur16mr2106720igb.30.1359052524513; Thu, 24 Jan 2013 10:35:24 -0800 (PST) Received: from seurat.1015granger.net ([99.26.161.222]) by mx.google.com with ESMTPS id j11sm1860818igc.5.2013.01.24.10.35.23 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 24 Jan 2013 10:35:24 -0800 (PST) From: Chuck Lever To: fedfs-utils-devel@oss.oracle.com Date: Thu, 24 Jan 2013 13:35:23 -0500 Message-ID: <20130124183522.13601.59523.stgit@seurat.1015granger.net> In-Reply-To: <20130124182619.13601.61251.stgit@seurat.1015granger.net> References: <20130124182619.13601.61251.stgit@seurat.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Flow-Control-Info: class=Default reputation=ipRepBelow100 ip=209.85.214.176 ct-class=R6 ct-vol1=0 ct-vol2=0 ct-vol3=0 ct-risk=68 ct-spam1=0 ct-spam2=0 ct-bulk=0 rcpts=1 size=8115 X-MM-CT-Classification: not spam X-MM-CT-RefID: str=0001.0A090205.51017EED.0050,ss=1,re=0.000,fgs=0 Subject: [fedfs-utils] [PATCH 06/11] nsdbc: Improve error message when nsdb_open_nsdb() fails X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet22.oracle.com [141.146.126.238] Clean up. Signed-off-by: Chuck Lever --- src/nfsref/add.c | 2 +- src/nfsref/remove.c | 2 +- src/nsdbc/nsdb-annotate.c | 2 +- src/nsdbc/nsdb-create-fsl.c | 2 +- src/nsdbc/nsdb-create-fsn.c | 2 +- src/nsdbc/nsdb-delete-fsl.c | 2 +- src/nsdbc/nsdb-delete-fsn.c | 2 +- src/nsdbc/nsdb-delete-nsdb.c | 2 +- src/nsdbc/nsdb-describe.c | 2 +- src/nsdbc/nsdb-list.c | 2 +- src/nsdbc/nsdb-nces.c | 2 +- src/nsdbc/nsdb-remove-nci.c | 2 +- src/nsdbc/nsdb-resolve-fsn.c | 2 +- src/nsdbc/nsdb-simple-nce.c | 2 +- src/nsdbc/nsdb-update-fsl.c | 2 +- src/nsdbc/nsdb-update-nci.c | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/nfsref/add.c b/src/nfsref/add.c index 87d74aa..8e925cc 100644 --- a/src/nfsref/add.c +++ b/src/nfsref/add.c @@ -628,7 +628,7 @@ nfsref_add_nfs_fedfs(const char *junct_path, char **argv, int optind) } goto out_free; default: - xlog(L_ERROR, "Failed to bind to NSDB %s:%u: %s", + xlog(L_ERROR, "Failed to open NSDB %s:%u: %s", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; } diff --git a/src/nfsref/remove.c b/src/nfsref/remove.c index b7aae18..a7bfca0 100644 --- a/src/nfsref/remove.c +++ b/src/nfsref/remove.c @@ -203,7 +203,7 @@ nfsref_remove_delete_fsn(const char *junct_path) } goto out_free; default: - xlog(L_ERROR, "Failed to bind to NSDB %s:%u: %s", + xlog(L_ERROR, "Failed to open NSDB %s:%u: %s", nsdb_hostname(host), nsdb_port(host), nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-annotate.c b/src/nsdbc/nsdb-annotate.c index 0c52c94..acf6a94 100644 --- a/src/nsdbc/nsdb-annotate.c +++ b/src/nsdbc/nsdb-annotate.c @@ -277,7 +277,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-create-fsl.c b/src/nsdbc/nsdb-create-fsl.c index c75b996..573d99b 100644 --- a/src/nsdbc/nsdb-create-fsl.c +++ b/src/nsdbc/nsdb-create-fsl.c @@ -280,7 +280,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-create-fsn.c b/src/nsdbc/nsdb-create-fsn.c index cb6d6d8..48e0099 100644 --- a/src/nsdbc/nsdb-create-fsn.c +++ b/src/nsdbc/nsdb-create-fsn.c @@ -257,7 +257,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-delete-fsl.c b/src/nsdbc/nsdb-delete-fsl.c index 871d621..d051da2 100644 --- a/src/nsdbc/nsdb-delete-fsl.c +++ b/src/nsdbc/nsdb-delete-fsl.c @@ -239,7 +239,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-delete-fsn.c b/src/nsdbc/nsdb-delete-fsn.c index dfbba09..f52bd24 100644 --- a/src/nsdbc/nsdb-delete-fsn.c +++ b/src/nsdbc/nsdb-delete-fsn.c @@ -241,7 +241,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-delete-nsdb.c b/src/nsdbc/nsdb-delete-nsdb.c index fd32446..5f330f6 100644 --- a/src/nsdbc/nsdb-delete-nsdb.c +++ b/src/nsdbc/nsdb-delete-nsdb.c @@ -214,7 +214,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-describe.c b/src/nsdbc/nsdb-describe.c index 2fb12ad..70b9eee 100644 --- a/src/nsdbc/nsdb-describe.c +++ b/src/nsdbc/nsdb-describe.c @@ -234,7 +234,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-list.c b/src/nsdbc/nsdb-list.c index 05367cd..5659a44 100644 --- a/src/nsdbc/nsdb-list.c +++ b/src/nsdbc/nsdb-list.c @@ -297,7 +297,7 @@ again: nsdbname, nsdbport, ldap_err2string(ldap_err)); goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-nces.c b/src/nsdbc/nsdb-nces.c index d5eca39..77b00f1 100644 --- a/src/nsdbc/nsdb-nces.c +++ b/src/nsdbc/nsdb-nces.c @@ -189,7 +189,7 @@ main(int argc, char **argv) nsdbname, nsdbport, ldap_err2string(ldap_err)); goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-remove-nci.c b/src/nsdbc/nsdb-remove-nci.c index 229ed2a..2e0dcad 100644 --- a/src/nsdbc/nsdb-remove-nci.c +++ b/src/nsdbc/nsdb-remove-nci.c @@ -209,7 +209,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-resolve-fsn.c b/src/nsdbc/nsdb-resolve-fsn.c index 66b1010..efeb327 100644 --- a/src/nsdbc/nsdb-resolve-fsn.c +++ b/src/nsdbc/nsdb-resolve-fsn.c @@ -357,7 +357,7 @@ again: nsdbname, nsdbport, ldap_err2string(ldap_err)); goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-simple-nce.c b/src/nsdbc/nsdb-simple-nce.c index abc0ea8..c7174c0 100644 --- a/src/nsdbc/nsdb-simple-nce.c +++ b/src/nsdbc/nsdb-simple-nce.c @@ -209,7 +209,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-update-fsl.c b/src/nsdbc/nsdb-update-fsl.c index f8cddb3..e2fb2f0 100644 --- a/src/nsdbc/nsdb-update-fsl.c +++ b/src/nsdbc/nsdb-update-fsl.c @@ -250,7 +250,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free; diff --git a/src/nsdbc/nsdb-update-nci.c b/src/nsdbc/nsdb-update-nci.c index 2f61c2e..e2c0b37 100644 --- a/src/nsdbc/nsdb-update-nci.c +++ b/src/nsdbc/nsdb-update-nci.c @@ -217,7 +217,7 @@ main(int argc, char **argv) } goto out_free; default: - fprintf(stderr, "Failed to bind to NSDB %s:%u: %s\n", + fprintf(stderr, "Failed to open NSDB %s:%u: %s\n", nsdbname, nsdbport, nsdb_display_fedfsstatus(retval)); goto out_free;