security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

gpg: Remove unused arg in a card related function.

Browse source 
* g10/call-agent.c (agent_scd_setattr): Remove unused arg serialno.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-04-01 18:12:35 +02:00
parent 21b6740974
commit 3a4534d826
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
4 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

33
g10/call-agent.c
View file

@ -726,7 +726,10 @@ learn_status_cb (void *opaque, const char *line)
return 0;
}
/* Call the scdaemon to learn about a smartcard */
/* Call the scdaemon to learn about a smartcard. Note that in
* contradiction to the function's name, gpg-agent's LEARN command is
* used and not the low-level "SCD LEARN". */
int
agent_scd_learn (struct agent_card_info_s *info, int force)
{
@ -876,23 +879,21 @@ agent_scd_getattr (const char *name, struct agent_card_info_s *info)
}
/* Send an setattr command to the SCdaemon. SERIALNO is not actually
used here but required by gpg 1.4's implementation of this code in
cardglue.c. */
int
agent_scd_setattr (const char *name,
const unsigned char *value, size_t valuelen,
const char *serialno)
/* Send an setattr command to the SCdaemon.
* Used by:
* card-util.c
*/
gpg_error_t
agent_scd_setattr (const char *name, const void *value_arg, size_t valuelen)
{
int rc;
gpg_error_t err;
const unsigned char *value = value_arg;
char line[ASSUAN_LINELENGTH];
char *p;
struct default_inq_parm_s parm;
memset (&parm, 0, sizeof parm);
(void)serialno;
if (!*name || !valuelen)
return gpg_error (GPG_ERR_INV_VALUE);
@ -918,16 +919,16 @@ agent_scd_setattr (const char *name,
}
*p = 0;
rc = start_agent (NULL, 1);
if (!rc)
err = start_agent (NULL, 1);
if (!err)
{
parm.ctx = agent_ctx;
rc = assuan_transact (agent_ctx, line, NULL, NULL,
err = assuan_transact (agent_ctx, line, NULL, NULL,
default_inq_cb, &parm, NULL, NULL);
}
status_sc_op_failure (rc);
return rc;
status_sc_op_failure (err);
return err;
}