security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Remove some unused variables. 

* tools/gpgconf-comp.c (gc_process_gpgconf_conf): Remove unused
used_components.
* agent/command-ssh.c (ssh_signature_encoder_ecdsa): Mark unused arg.
* g13/g13.c (main): Comment variable of yet unimplemented options.
This commit is contained in:
Werner Koch 2013-02-12 19:28:54 +01:00
parent 161674118d
commit c6b8f05517
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/command-ssh.c
View File

@ -1247,6 +1247,8 @@ ssh_signature_encoder_ecdsa (ssh_key_type_spec_t *spec,
gpg_error_t err; gpg_error_t err;
int i; int i;
(void)spec;
innerlen = 0; innerlen = 0;
for (i = 0; i < DIM(data); i++) for (i = 0; i < DIM(data); i++)
{ {

18
g13/g13.c
View File

@ -323,7 +323,7 @@ main ( int argc, char **argv)
int orig_argc; int orig_argc;
char **orig_argv; char **orig_argv;
gpg_error_t err = 0; gpg_error_t err = 0;
const char *fname; /* const char *fname; */
int may_coredump; int may_coredump;
FILE *configfp = NULL; FILE *configfp = NULL;
char *configname = NULL; char *configname = NULL;
@ -334,10 +334,10 @@ main ( int argc, char **argv)
char *logfile = NULL; char *logfile = NULL;
int greeting = 0; int greeting = 0;
int nogreeting = 0; int nogreeting = 0;
int debug_wait = 0; /* int debug_wait = 0; */
int use_random_seed = 1; int use_random_seed = 1;
int nodetach = 0; /* int nodetach = 0; */
int nokeysetup = 0; /* int nokeysetup = 0; */
enum cmd_and_opt_values cmd = 0; enum cmd_and_opt_values cmd = 0;
struct server_control_s ctrl; struct server_control_s ctrl;
strlist_t recipients = NULL; strlist_t recipients = NULL;
@ -473,13 +473,13 @@ main ( int argc, char **argv)
case aGPGConfTest: case aGPGConfTest:
set_cmd (&cmd, pargs.r_opt); set_cmd (&cmd, pargs.r_opt);
nogreeting = 1; nogreeting = 1;
nokeysetup = 1; /* nokeysetup = 1; */
break; break;
case aServer: case aServer:
case aMount: case aMount:
case aUmount: case aUmount:
nokeysetup = 1; /* nokeysetup = 1; */
case aCreate: case aCreate:
set_cmd (&cmd, pargs.r_opt); set_cmd (&cmd, pargs.r_opt);
break; break;
@ -504,13 +504,13 @@ main ( int argc, char **argv)
case oLogFile: logfile = pargs.r.ret_str; break; case oLogFile: logfile = pargs.r.ret_str; break;
case oNoLogFile: logfile = NULL; break; case oNoLogFile: logfile = NULL; break;
case oNoDetach: nodetach = 1; break; case oNoDetach: /*nodetach = 1; */break;
case oDebug: debug_value |= pargs.r.ret_ulong; break; case oDebug: debug_value |= pargs.r.ret_ulong; break;
case oDebugAll: debug_value = ~0; break; case oDebugAll: debug_value = ~0; break;
case oDebugNone: debug_value = 0; break; case oDebugNone: debug_value = 0; break;
case oDebugLevel: debug_level = pargs.r.ret_str; break; case oDebugLevel: debug_level = pargs.r.ret_str; break;
case oDebugWait: debug_wait = pargs.r.ret_int; break; case oDebugWait: /*debug_wait = pargs.r.ret_int; */break;
case oDebugAllowCoreDump: case oDebugAllowCoreDump:
may_coredump = enable_core_dumps (); may_coredump = enable_core_dumps ();
break; break;
@ -653,7 +653,7 @@ main ( int argc, char **argv)
} }
/* Store given filename into FNAME. */ /* Store given filename into FNAME. */
fname = argc? *argv : NULL; /* fname = argc? *argv : NULL; */
/* Parse all given encryption keys. This does a lookup of the keys /* Parse all given encryption keys. This does a lookup of the keys
and stops if any of the given keys was not found. */ and stops if any of the given keys was not found. */

6
tools/gpgconf-comp.c
View File

@ -3382,7 +3382,6 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
int in_rule = 0; int in_rule = 0;
int got_match = 0; int got_match = 0;
int runtime[GC_BACKEND_NR]; int runtime[GC_BACKEND_NR];
int used_components[GC_COMPONENT_NR];
int backend_id, component_id; int backend_id, component_id;
char *fname; char *fname;
@ -3393,8 +3392,6 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
for (backend_id = 0; backend_id < GC_BACKEND_NR; backend_id++) for (backend_id = 0; backend_id < GC_BACKEND_NR; backend_id++)
runtime[backend_id] = 0; runtime[backend_id] = 0;
for (component_id = 0; component_id < GC_COMPONENT_NR; component_id++)
used_components[component_id] = 0;
config = fopen (fname, "r"); config = fopen (fname, "r");
if (!config) if (!config)
@ -3621,9 +3618,6 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
if (defaults) if (defaults)
{ {
assert (component_id >= 0 && component_id < GC_COMPONENT_NR);
used_components[component_id] = 1;
/* Here we explicitly allow to update the value again. */ /* Here we explicitly allow to update the value again. */
if (newflags) if (newflags)
{ {