From ee262ed2ada76d1219a9f6cd58e3c38112f464a0 Mon Sep 17 00:00:00 2001 From: Richard Alpe Date: Fri, 7 Aug 2015 09:55:09 +0200 Subject: [PATCH 1/2] tipc: fix bearer get/set help synopsis One option is required for bearer set and bearer get. --- tipc/bearer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tipc/bearer.c b/tipc/bearer.c index 33295f9a..30b54d9f 100644 --- a/tipc/bearer.c +++ b/tipc/bearer.c @@ -412,7 +412,7 @@ static int cmd_bearer_disable(struct nlmsghdr *nlh, const struct cmd *cmd, static void cmd_bearer_set_help(struct cmdl *cmdl) { - fprintf(stderr, "Usage: %s bearer set [OPTIONS] media MEDIA ARGS...\n", + fprintf(stderr, "Usage: %s bearer set OPTION media MEDIA ARGS...\n", cmdl->argv[0]); _print_bearer_opts(); _print_bearer_media(); @@ -420,7 +420,7 @@ static void cmd_bearer_set_help(struct cmdl *cmdl) static void cmd_bearer_set_udp_help(struct cmdl *cmdl) { - fprintf(stderr, "Usage: %s bearer set [OPTIONS] media udp name NAME\n\n", + fprintf(stderr, "Usage: %s bearer set OPTION media udp name NAME\n\n", cmdl->argv[0]); _print_bearer_opts(); } @@ -528,7 +528,7 @@ static int cmd_bearer_set(struct nlmsghdr *nlh, const struct cmd *cmd, static void cmd_bearer_get_help(struct cmdl *cmdl) { - fprintf(stderr, "Usage: %s bearer get [OPTIONS] media MEDIA ARGS...\n", + fprintf(stderr, "Usage: %s bearer get OPTION media MEDIA ARGS...\n", cmdl->argv[0]); _print_bearer_opts(); _print_bearer_media(); @@ -536,7 +536,7 @@ static void cmd_bearer_get_help(struct cmdl *cmdl) static void cmd_bearer_get_udp_help(struct cmdl *cmdl) { - fprintf(stderr, "Usage: %s bearer get [OPTIONS] media udp name NAME\n\n", + fprintf(stderr, "Usage: %s bearer get OPTION media udp name NAME\n\n", cmdl->argv[0]); _print_bearer_opts(); } From 7f9dddbe7ddf507e96b025a95e352f3b863db0d1 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Aug 2015 15:31:27 +0200 Subject: [PATCH 2/2] misc/ss: don't imply -a when -A was specified Signed-off-by: Phil Sutter --- misc/ss.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/misc/ss.c b/misc/ss.c index f4c828c6..f59213b4 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -3664,6 +3664,8 @@ int main(int argc, char *argv[]) char *p, *p1; if (!saw_query) { current_filter.dbs = 0; + state_filter = state_filter ? + state_filter : SS_CONN; saw_query = 1; do_default = 0; }