This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/v4l-utils.git tree:

Subject: media-ctl: Always print the full help message
Author:  Laurent Pinchart <[email protected]>
Date:    Sat May 31 13:08:14 2014 +0200

The short help text isn't descriptive enough to be useful.

Signed-off-by: Laurent Pinchart <[email protected]>

 utils/media-ctl/options.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

---

http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=a9ad04b900a45ba78aa9679a4ec6a9e40e0c3f97

diff --git a/utils/media-ctl/options.c b/utils/media-ctl/options.c
index 2135d93..ecb7f61 100644
--- a/utils/media-ctl/options.c
+++ b/utils/media-ctl/options.c
@@ -32,7 +32,7 @@ struct media_options media_opts = {
        .devname = MEDIA_DEVNAME_DEFAULT,
 };
 
-static void usage(const char *argv0, int verbose)
+static void usage(const char *argv0)
 {
        printf("%s [options]\n", argv0);
        printf("-d, --device dev        Media device name (default: %s)\n", 
MEDIA_DEVNAME_DEFAULT);
@@ -46,10 +46,6 @@ static void usage(const char *argv0, int verbose)
        printf("    --print-dot         Print the device topology as a dot 
graph\n");
        printf("-r, --reset             Reset all links to inactive\n");
        printf("-v, --verbose           Be verbose\n");
-
-       if (!verbose)
-               return;
-
        printf("\n");
        printf("Links and formats are defined as\n");
        printf("\tlinks           = link { ',' link } ;\n");
@@ -105,7 +101,7 @@ int parse_cmdline(int argc, char **argv)
        int opt;
 
        if (argc == 1) {
-               usage(argv[0], 0);
+               usage(argv[0]);
                return 1;
        }
 
@@ -131,7 +127,7 @@ int parse_cmdline(int argc, char **argv)
                        break;
 
                case 'h':
-                       usage(argv[0], 1);
+                       usage(argv[0]);
                        exit(0);
 
                case 'i':

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to