[Pkg-gnupg-commit] [gnupg2] 189/241: dirmngr: Avoid a declarations after statements.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Dec 9 20:32:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit 100f34e869df899a695f5e5ef1b8e092baf91751
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 27 17:12:56 2015 +0100
dirmngr: Avoid a declarations after statements.
* tools/gpgtar.c (parse_arguments): Use a block for a local varibale
definition.
Signed-off-by: Werner Koch <wk at gnupg.org>
---
tools/gpgtar.c | 62 +++++++++++++++++++++++++++++++---------------------------
1 file changed, 33 insertions(+), 29 deletions(-)
diff --git a/tools/gpgtar.c b/tools/gpgtar.c
index a46a339..a09d2f0 100644
--- a/tools/gpgtar.c
+++ b/tools/gpgtar.c
@@ -347,38 +347,42 @@ parse_arguments (ARGPARSE_ARGS *pargs, ARGPARSE_OPTS *popts)
case oCMS: /* Dummy option for now. */ break;
case oGpgArgs:;
- strlist_t list;
- if (shell_parse_stringlist (pargs->r.ret_str, &list))
- log_error ("failed to parse gpg arguments '%s'\n",
- pargs->r.ret_str);
- else
- {
- if (opt.gpg_arguments)
- strlist_last (opt.gpg_arguments)->next = list;
- else
- opt.gpg_arguments = list;
- }
+ {
+ strlist_t list;
+ if (shell_parse_stringlist (pargs->r.ret_str, &list))
+ log_error ("failed to parse gpg arguments '%s'\n",
+ pargs->r.ret_str);
+ else
+ {
+ if (opt.gpg_arguments)
+ strlist_last (opt.gpg_arguments)->next = list;
+ else
+ opt.gpg_arguments = list;
+ }
+ }
break;
case oTarArgs:;
- int tar_argc;
- char **tar_argv;
-
- if (shell_parse_argv (pargs->r.ret_str, &tar_argc, &tar_argv))
- log_error ("failed to parse tar arguments '%s'\n",
- pargs->r.ret_str);
- else
- {
- ARGPARSE_ARGS tar_args;
- tar_args.argc = &tar_argc;
- tar_args.argv = &tar_argv;
- tar_args.flags = ARGPARSE_FLAG_ARG0;
- parse_arguments (&tar_args, tar_opts);
- if (tar_args.err)
- log_error ("unsupported tar arguments '%s'\n",
- pargs->r.ret_str);
- pargs->err = tar_args.err;
- }
+ {
+ int tar_argc;
+ char **tar_argv;
+
+ if (shell_parse_argv (pargs->r.ret_str, &tar_argc, &tar_argv))
+ log_error ("failed to parse tar arguments '%s'\n",
+ pargs->r.ret_str);
+ else
+ {
+ ARGPARSE_ARGS tar_args;
+ tar_args.argc = &tar_argc;
+ tar_args.argv = &tar_argv;
+ tar_args.flags = ARGPARSE_FLAG_ARG0;
+ parse_arguments (&tar_args, tar_opts);
+ if (tar_args.err)
+ log_error ("unsupported tar arguments '%s'\n",
+ pargs->r.ret_str);
+ pargs->err = tar_args.err;
+ }
+ }
break;
case oDryRun:
--
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