[SCM] CTDB repository - branch master updated - ctdb-2.1-48-g35264e4

[Amitay Isaacs]

The branch, master has been updated
       via  35264e42ade4676468cf7713fa339c784e932953 (commit)
      from  1c7adbccc69ac276d2b957ad16c3802fdb8868ca (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 35264e42ade4676468cf7713fa339c784e932953
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Mar 27 12:32:43 2013 +1100

    tools/ltdbtool: Fix handling of -e option
    
    Also, include description of -e option in usage.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 tools/ltdbtool.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tools/ltdbtool.c b/tools/ltdbtool.c
index b7ad5a5..add9c32 100644
--- a/tools/ltdbtool.c
+++ b/tools/ltdbtool.c
@@ -77,7 +77,9 @@ static int help(const char* cmd)
 "   -O <num>        the number of bytes to interpret as ctdb record header\n"
 "                   for the output database (beware!)\n"
 "\n"
-"   -p              print header (for the dump command), defaults ot off\n"
+"   -e              Include empty records, defaults to off\n"
+"\n"
+"   -p              print header (for the dump command), defaults to off\n"
 "\n"
 "   -h              print this help\n"
 "\n"
@@ -91,8 +93,8 @@ static int help(const char* cmd)
 static int usage(const char* cmd)
 {
 	fprintf(stderr,
-		"Usage: %s dump [-p] [-s{0|32|64}] <idb>\n"
-		"       %s convert [-s{0|32|64}] [-o{0|32|64}] <idb> <odb>\n"
+		"Usage: %s dump [-e] [-p] [-s{0|32|64}] <idb>\n"
+		"       %s convert [-e] [-s{0|32|64}] [-o{0|32|64}] <idb> <odb>\n"
 		"       %s {help|-h}\n"
 		, cmd, cmd, cmd);
 	return -1;
@@ -229,6 +231,7 @@ int main(int argc, char* argv[])
 			break;
 		case 'e':
 			keep_empty = true;
+			break;
 		case 'h':
 			return help(argv[0]);
 		default:


-- 
CTDB repository