dovecot-2.0: doveadm: Removed long usage from doveadm commands.
dovecot at dovecot.org
dovecot at dovecot.org
Fri Jul 16 20:49:07 EEST 2010
details: http://hg.dovecot.org/dovecot-2.0/rev/875598cd7e26
changeset: 11849:875598cd7e26
user: Pascal Volk <user at localhost.localdomain.org>
date: Fri Jul 16 17:47:29 2010 +0000
description:
doveadm: Removed long usage from doveadm commands.
It's no longer needed since manual pages are displayed.
diffstat:
src/doveadm/doveadm-auth.c | 4 ++--
src/doveadm/doveadm-director.c | 10 +++++-----
src/doveadm/doveadm-dump.c | 3 +--
src/doveadm/doveadm-kick.c | 3 +--
src/doveadm/doveadm-log.c | 6 +++---
src/doveadm/doveadm-mail-mailbox.c | 2 +-
src/doveadm/doveadm-master.c | 4 ++--
src/doveadm/doveadm-penalty.c | 2 +-
src/doveadm/doveadm-pw.c | 8 +-------
src/doveadm/doveadm-who.c | 2 +-
src/doveadm/doveadm.c | 6 ++----
src/doveadm/doveadm.h | 1 -
12 files changed, 20 insertions(+), 31 deletions(-)
diffs (180 lines):
diff -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-auth.c
--- a/src/doveadm/doveadm-auth.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-auth.c Fri Jul 16 17:47:29 2010 +0000
@@ -274,10 +274,10 @@
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 -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-director.c
--- a/src/doveadm/doveadm-director.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-director.c Fri Jul 16 17:47:29 2010 +0000
@@ -453,15 +453,15 @@
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 -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-dump.c
--- a/src/doveadm/doveadm-dump.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-dump.c Fri Jul 16 17:47:29 2010 +0000
@@ -74,6 +74,5 @@
}
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 -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-kick.c
--- a/src/doveadm/doveadm-kick.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-kick.c Fri Jul 16 17:47:29 2010 +0000
@@ -207,6 +207,5 @@
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 -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-log.c
--- a/src/doveadm/doveadm-log.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-log.c Fri Jul 16 17:47:29 2010 +0000
@@ -272,9 +272,9 @@
}
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 -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-mail-mailbox.c
--- a/src/doveadm/doveadm-mail-mailbox.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-mail-mailbox.c Fri Jul 16 17:47:29 2010 +0000
@@ -514,5 +514,5 @@
};
struct doveadm_cmd doveadm_cmd_mailbox_mutf7 = {
cmd_mailbox_mutf7, "mailbox mutf7",
- "[-7|-8] <name> [...]", NULL
+ "[-7|-8] <name> [...]"
};
diff -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-master.c
--- a/src/doveadm/doveadm-master.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-master.c Fri Jul 16 17:47:29 2010 +0000
@@ -85,9 +85,9 @@
}
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 -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-penalty.c
--- a/src/doveadm/doveadm-penalty.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-penalty.c Fri Jul 16 17:47:29 2010 +0000
@@ -120,5 +120,5 @@
struct doveadm_cmd doveadm_cmd_penalty = {
cmd_penalty, "penalty",
- "[-a <anvil socket path>] [<ip/bits>]", NULL
+ "[-a <anvil socket path>] [<ip/bits>]"
};
diff -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-pw.c
--- a/src/doveadm/doveadm-pw.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-pw.c Fri Jul 16 17:47:29 2010 +0000
@@ -116,11 +116,5 @@
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 -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm-who.c
--- a/src/doveadm/doveadm-who.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm-who.c Fri Jul 16 17:47:29 2010 +0000
@@ -311,5 +311,5 @@
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 -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm.c
--- a/src/doveadm/doveadm.c Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm.c Fri Jul 16 17:47:29 2010 +0000
@@ -115,8 +115,6 @@
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 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 struct doveadm_cmd doveadm_cmd_config = {
- cmd_config, "config", "[doveconf parameters]", NULL
+ cmd_config, "config", "[doveconf parameters]"
};
static bool
diff -r 6b66aad2a997 -r 875598cd7e26 src/doveadm/doveadm.h
--- a/src/doveadm/doveadm.h Fri Jul 16 18:20:14 2010 +0100
+++ b/src/doveadm/doveadm.h Fri Jul 16 17:47:29 2010 +0000
@@ -11,7 +11,6 @@
doveadm_command_t *cmd;
const char *name;
const char *short_usage;
- const char *long_usage;
};
extern struct doveadm_cmd doveadm_cmd_stop;
More information about the dovecot-cvs
mailing list