From: Pascal Volk <user@localhost.localdomain.org>
Date: Fri, 16 Jul 2010 17:47:29 +0000 (+0000)
Subject: doveadm: Removed long usage from doveadm commands.
X-Git-Tag: 2.0.rc3~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bde78a7bf5f9000f1ae4dc7ce6cabd012e1f8b79;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Removed long usage from doveadm commands.
It's no longer needed since manual pages are displayed.
---

diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c
index dbe399ef90..efc4eafd72 100644
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -274,10 +274,10 @@ static void cmd_user(int argc, char *argv[])
 
 struct doveadm_cmd doveadm_cmd_auth = {
 	cmd_auth, "auth",
-	"[-a <auth socket path>] [-x <auth info>] <user> [<password>]", NULL
+	"[-a <auth socket path>] [-x <auth info>] <user> [<password>]"
 };
 
 struct doveadm_cmd doveadm_cmd_user = {
 	cmd_user, "user",
-	"[-a <userdb socket path>] [-x <auth info>] <user mask> [...]", NULL
+	"[-a <userdb socket path>] [-x <auth info>] <user mask> [...]"
 };
diff --git a/src/doveadm/doveadm-director.c b/src/doveadm/doveadm-director.c
index 0f4a636368..38dd925dc8 100644
--- a/src/doveadm/doveadm-director.c
+++ b/src/doveadm/doveadm-director.c
@@ -453,15 +453,15 @@ static void cmd_director_flush(int argc, char *argv[])
 
 struct doveadm_cmd doveadm_cmd_director[] = {
 	{ cmd_director_status, "director status",
-	  "[-a <director socket path>] [<user>]", NULL },
+	  "[-a <director socket path>] [<user>]" },
 	{ cmd_director_map, "director map",
-	  "[-a <director socket path>] [-f <users file>] [<host>]", NULL },
+	  "[-a <director socket path>] [-f <users file>] [<host>]" },
 	{ cmd_director_add, "director add",
-	  "[-a <director socket path>] <host> [<vhost count>]", NULL },
+	  "[-a <director socket path>] <host> [<vhost count>]" },
 	{ cmd_director_remove, "director remove",
-	  "[-a <director socket path>] <host>", NULL },
+	  "[-a <director socket path>] <host>" },
 	{ cmd_director_flush, "director flush",
-	  "[-a <director socket path>] <host>|all", NULL }
+	  "[-a <director socket path>] <host>|all" }
 };
 
 static void director_cmd_help(doveadm_command_t *cmd)
diff --git a/src/doveadm/doveadm-dump.c b/src/doveadm/doveadm-dump.c
index 19c1011c24..acd5b8ce4e 100644
--- a/src/doveadm/doveadm-dump.c
+++ b/src/doveadm/doveadm-dump.c
@@ -74,6 +74,5 @@ static void cmd_dump(int argc, char *argv[])
 }
 
 struct doveadm_cmd doveadm_cmd_dump = {
-	cmd_dump, "dump", "[-t <type>] <path>",
-"  <type> can be: index log mailboxlog thread\n"
+	cmd_dump, "dump", "[-t <type>] <path>"
 };
diff --git a/src/doveadm/doveadm-kick.c b/src/doveadm/doveadm-kick.c
index 3159ccc284..05c7d4467d 100644
--- a/src/doveadm/doveadm-kick.c
+++ b/src/doveadm/doveadm-kick.c
@@ -207,6 +207,5 @@ static void cmd_kick(int argc, char *argv[])
 
 struct doveadm_cmd doveadm_cmd_kick = {
 	cmd_kick, "kick",
-	"[-a <anvil socket path>] [-f] <user mask>[|]<ip/bits>",
-	NULL
+	"[-a <anvil socket path>] [-f] <user mask>[|]<ip/bits>"
 };
diff --git a/src/doveadm/doveadm-log.c b/src/doveadm/doveadm-log.c
index a8e8e0145d..8733bb757e 100644
--- a/src/doveadm/doveadm-log.c
+++ b/src/doveadm/doveadm-log.c
@@ -272,9 +272,9 @@ static void cmd_log_find(int argc, char *argv[])
 }
 
 struct doveadm_cmd doveadm_cmd_log[] = {
-	{ cmd_log_test, "log test", "", NULL },
-	{ cmd_log_reopen, "log reopen", "", NULL },
-	{ cmd_log_find, "log find", "[<dir>]", NULL }
+	{ cmd_log_test, "log test", "" },
+	{ cmd_log_reopen, "log reopen", "" },
+	{ cmd_log_find, "log find", "[<dir>]" }
 };
 
 void doveadm_register_log_commands(void)
diff --git a/src/doveadm/doveadm-mail-mailbox.c b/src/doveadm/doveadm-mail-mailbox.c
index 6a7c4f9623..a8dd0ec98c 100644
--- a/src/doveadm/doveadm-mail-mailbox.c
+++ b/src/doveadm/doveadm-mail-mailbox.c
@@ -514,5 +514,5 @@ struct doveadm_mail_cmd cmd_mailbox_unsubscribe = {
 };
 struct doveadm_cmd doveadm_cmd_mailbox_mutf7 = {
 	cmd_mailbox_mutf7, "mailbox mutf7",
-	"[-7|-8] <name> [...]", NULL
+	"[-7|-8] <name> [...]"
 };
diff --git a/src/doveadm/doveadm-master.c b/src/doveadm/doveadm-master.c
index 639ae02d12..97b4d33d6b 100644
--- a/src/doveadm/doveadm-master.c
+++ b/src/doveadm/doveadm-master.c
@@ -85,9 +85,9 @@ static void cmd_reload(int argc ATTR_UNUSED, char *argv[] ATTR_UNUSED)
 }
 
 struct doveadm_cmd doveadm_cmd_stop = {
-	cmd_stop, "stop", "", NULL
+	cmd_stop, "stop", ""
 };
 
 struct doveadm_cmd doveadm_cmd_reload = {
-	cmd_reload, "reload", "", NULL
+	cmd_reload, "reload", ""
 };
diff --git a/src/doveadm/doveadm-penalty.c b/src/doveadm/doveadm-penalty.c
index d2e068d037..348a10fce0 100644
--- a/src/doveadm/doveadm-penalty.c
+++ b/src/doveadm/doveadm-penalty.c
@@ -120,5 +120,5 @@ static void cmd_penalty(int argc, char *argv[])
 
 struct doveadm_cmd doveadm_cmd_penalty = {
 	cmd_penalty, "penalty",
-	"[-a <anvil socket path>] [<ip/bits>]", NULL
+	"[-a <anvil socket path>] [<ip/bits>]"
 };
diff --git a/src/doveadm/doveadm-pw.c b/src/doveadm/doveadm-pw.c
index 4704933cc6..78fc4c1377 100644
--- a/src/doveadm/doveadm-pw.c
+++ b/src/doveadm/doveadm-pw.c
@@ -116,11 +116,5 @@ static void cmd_pw(int argc, char *argv[])
 
 struct doveadm_cmd doveadm_cmd_pw = {
 	cmd_pw, "pw",
-	"[-l] [-p plaintext] [-r rounds] [-s scheme] [-u user] [-V]",
-"  -l            List known password schemes\n"
-"  -p plaintext  New password\n"
-"  -r rounds     Number of encryption rounds (if scheme uses it)\n"
-"  -s scheme     Password scheme\n"
-"  -u user       Username (if scheme uses it)\n"
-"  -V            Internally verify the hash\n"
+	"[-l] [-p plaintext] [-r rounds] [-s scheme] [-u user] [-V]"
 };
diff --git a/src/doveadm/doveadm-who.c b/src/doveadm/doveadm-who.c
index 30c638421a..fd2dc822d8 100644
--- a/src/doveadm/doveadm-who.c
+++ b/src/doveadm/doveadm-who.c
@@ -311,5 +311,5 @@ static void cmd_who(int argc, char *argv[])
 
 struct doveadm_cmd doveadm_cmd_who = {
 	cmd_who, "who",
-	"[-a <anvil socket path>] [-1] [<user mask>] [<ip/bits>]", NULL
+	"[-a <anvil socket path>] [-1] [<user mask>] [<ip/bits>]"
 };
diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 69fcec1dfd..e869b06ffd 100644
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -115,8 +115,6 @@ static void ATTR_NORETURN
 help_to(const struct doveadm_cmd *cmd, FILE *out)
 {
 	fprintf(out, "doveadm %s %s\n", cmd->name, cmd->short_usage);
-	if (cmd->long_usage != NULL)
-		fprintf(out, "%s", cmd->long_usage);
 	exit(0);
 }
 
@@ -260,7 +258,7 @@ static void cmd_help(int argc ATTR_UNUSED, char *argv[])
 }
 
 static struct doveadm_cmd doveadm_cmd_help = {
-	cmd_help, "help", "<cmd>", NULL
+	cmd_help, "help", "<cmd>"
 };
 
 static void cmd_config(int argc ATTR_UNUSED, char *argv[])
@@ -271,7 +269,7 @@ static void cmd_config(int argc ATTR_UNUSED, char *argv[])
 }
 
 static struct doveadm_cmd doveadm_cmd_config = {
-	cmd_config, "config", "[doveconf parameters]", NULL
+	cmd_config, "config", "[doveconf parameters]"
 };
 
 static bool
diff --git a/src/doveadm/doveadm.h b/src/doveadm/doveadm.h
index c62c4aab6e..d097b005ce 100644
--- a/src/doveadm/doveadm.h
+++ b/src/doveadm/doveadm.h
@@ -11,7 +11,6 @@ struct doveadm_cmd {
 	doveadm_command_t *cmd;
 	const char *name;
 	const char *short_usage;
-	const char *long_usage;
 };
 
 extern struct doveadm_cmd doveadm_cmd_stop;