gnokii-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-28


From: Daniele Forsi
Subject: [SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-28-g1359936
Date: Thu, 01 Jul 2010 14:45:16 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  135993679b0e2aeede8d2aff71aa4c0b31647207 (commit)
       via  4841c90dc17e45fe47d789dd452cd03198095c30 (commit)
      from  f271afeaa42864335bf2e9c5fb91878b62718097 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=135993679b0e2aeede8d2aff71aa4c0b31647207


commit 135993679b0e2aeede8d2aff71aa4c0b31647207
Author: Daniele Forsi <address@hidden>
Date:   Thu Jul 1 16:40:07 2010 +0200

    Don't print general options if specific help was requested
    
    This makes the output faster to read for the user and hopefully
    easier to understand.

diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 205d7a4..d2a20ba 100644
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -228,23 +228,6 @@ static int usage(FILE *f, int argc, char *argv[])
        int i;
        int all = 0;
 
-       fprintf(f, _("Usage:\n"
-                    "  gnokii [CONFIG OPTIONS] OPTIONS\n"
-                    "\nCONFIG OPTIONS\n"
-                    "          --config filename\n"
-                    "          --phone phone_section\n"
-                    "\nOPTIONS\n"
-                    "Use just one option at a time.\n"
-                    "General options:\n"
-                    "          --help [all] [monitor] [sms] [mms] [phonebook] 
[calendar] [todo]\n"
-                    "                 [dial] [profile] [settings] [wap] [logo] 
[ringtone]\n"
-                    "                 [security] [file] [other]\n"
-                    "          --version\n"
-                    "          --shell\n"));
-       /* Print "short usage" only */
-       if (argc == -1)
-               return -1;
-
        for (i = 1; i < argc; i++) {
                if (!strcmp(argv[i], "all")) {
                        all = 1;
@@ -252,6 +235,22 @@ static int usage(FILE *f, int argc, char *argv[])
                }
        }
 
+       /* Don't print general options if specific help was requested */
+       if (all || argc == -1)
+               fprintf(f, _("Usage:\n"
+                            "  gnokii [CONFIG OPTIONS] OPTIONS\n"
+                            "\nCONFIG OPTIONS\n"
+                            "          --config filename\n"
+                            "          --phone phone_section\n"
+                            "\nOPTIONS\n"
+                            "Use just one option at a time.\n"
+                            "General options:\n"
+                            "          --help [all] [monitor] [sms] [mms] 
[phonebook] [calendar] [todo]\n"
+                            "                 [dial] [profile] [settings] 
[wap] [logo] [ringtone]\n"
+                            "                 [security] [file] [other]\n"
+                            "          --version\n"
+                            "          --shell\n"));
+
        /* FIXME? throw an error if argv[i] is duplicated or unknown */
        for (i = 1; i < argc; i++) {
                if (all || !strcmp(argv[i], "monitor"))

http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=4841c90dc17e45fe47d789dd452cd03198095c30


commit 135993679b0e2aeede8d2aff71aa4c0b31647207
Author: Daniele Forsi <address@hidden>
Date:   Thu Jul 1 16:40:07 2010 +0200

    Don't print general options if specific help was requested
    
    This makes the output faster to read for the user and hopefully
    easier to understand.

diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 205d7a4..d2a20ba 100644
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -228,23 +228,6 @@ static int usage(FILE *f, int argc, char *argv[])
        int i;
        int all = 0;
 
-       fprintf(f, _("Usage:\n"
-                    "  gnokii [CONFIG OPTIONS] OPTIONS\n"
-                    "\nCONFIG OPTIONS\n"
-                    "          --config filename\n"
-                    "          --phone phone_section\n"
-                    "\nOPTIONS\n"
-                    "Use just one option at a time.\n"
-                    "General options:\n"
-                    "          --help [all] [monitor] [sms] [mms] [phonebook] 
[calendar] [todo]\n"
-                    "                 [dial] [profile] [settings] [wap] [logo] 
[ringtone]\n"
-                    "                 [security] [file] [other]\n"
-                    "          --version\n"
-                    "          --shell\n"));
-       /* Print "short usage" only */
-       if (argc == -1)
-               return -1;
-
        for (i = 1; i < argc; i++) {
                if (!strcmp(argv[i], "all")) {
                        all = 1;
@@ -252,6 +235,22 @@ static int usage(FILE *f, int argc, char *argv[])
                }
        }
 
+       /* Don't print general options if specific help was requested */
+       if (all || argc == -1)
+               fprintf(f, _("Usage:\n"
+                            "  gnokii [CONFIG OPTIONS] OPTIONS\n"
+                            "\nCONFIG OPTIONS\n"
+                            "          --config filename\n"
+                            "          --phone phone_section\n"
+                            "\nOPTIONS\n"
+                            "Use just one option at a time.\n"
+                            "General options:\n"
+                            "          --help [all] [monitor] [sms] [mms] 
[phonebook] [calendar] [todo]\n"
+                            "                 [dial] [profile] [settings] 
[wap] [logo] [ringtone]\n"
+                            "                 [security] [file] [other]\n"
+                            "          --version\n"
+                            "          --shell\n"));
+
        /* FIXME? throw an error if argv[i] is duplicated or unknown */
        for (i = 1; i < argc; i++) {
                if (all || !strcmp(argv[i], "monitor"))

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

Summary of changes:
 ChangeLog        |    2 ++
 common/gsm-sms.c |    2 +-
 gnokii/gnokii.c  |   33 ++++++++++++++++-----------------
 3 files changed, 19 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs



reply via email to

[Prev in Thread] Current Thread [Next in Thread]