Patchwork [06/11] nsdbc: Improve error message when nsdb_open_nsdb() fails

login
register
mail settings
Submitter Chuck Lever
Date Jan. 24, 2013, 6:35 p.m.
Message ID <20130124183522.13601.59523.stgit@seurat.1015granger.net>
Download mbox | patch
Permalink /patch/215469/
State Accepted
Headers show

Comments

Chuck Lever - Jan. 24, 2013, 6:35 p.m.
Clean up.

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

 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(-)

Patch

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;