[Pkg-gnupg-commit] [gnupg2] 54/102: gpg: Fix command line parsing of --quick-addkey and --quick-gen-key.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Fri Jun 17 00:14:54 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit abeeb84a94be815a16e678b319cb5c8bffde2811
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Jun 7 14:16:32 2016 +0900

    gpg: Fix command line parsing of --quick-addkey and --quick-gen-key.
    
    * g10/gpg.c (main): Compose a block by curly braces.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 g10/gpg.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/g10/gpg.c b/g10/gpg.c
index df6c246..9adf169 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -4121,7 +4121,9 @@ main (int argc, char **argv)
                 {
                   x_usage = *argv++; argc--;
                   if (argc)
-                    x_expire = *argv++; argc--;
+                    {
+                      x_expire = *argv++; argc--;
+                    }
                 }
             }
           quick_generate_keypair (ctrl, username, x_algo, x_usage, x_expire);
@@ -4195,7 +4197,9 @@ main (int argc, char **argv)
                 {
                   x_usage = *argv++; argc--;
                   if (argc)
-                    x_expire = *argv++; argc--;
+                   {
+                     x_expire = *argv++; argc--;
+                   }
                 }
             }
           keyedit_quick_addkey (ctrl, x_fpr, x_algo, x_usage, x_expire);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list