ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-23 18:40:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bugs in keyring revealed by -Wunused-parameter

Browse Source
This commit is contained in:
Andrew Bettison 2013-12-09 18:19:58 +10:30
parent 48ef87a68b
commit 85448d5612
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keyring.c
View File

@ -259,7 +259,7 @@ void keyring_release_identity(keyring_file *k, int cn, int id){
void keyring_release_subscriber(keyring_file *k, const sid_t *sid) void keyring_release_subscriber(keyring_file *k, const sid_t *sid)
{ {
int cn=0,in=0,kp=0; int cn=0,in=0,kp=0;
if (keyring_find_sid(keyring, &cn, &in, &kp, sid) if (keyring_find_sid(k, &cn, &in, &kp, sid)
&& keyring->contexts[cn]->identities[in]->subscriber != my_subscriber) && keyring->contexts[cn]->identities[in]->subscriber != my_subscriber)
keyring_release_identity(keyring, cn, in); keyring_release_identity(keyring, cn, in);
} }
@ -1599,8 +1599,8 @@ int keyring_find_public_tag_value(const keyring_file *k, int *cn, int *in, int *
int keyring_identity_find_keytype(const keyring_file *k, int cn, int in, int keytype) int keyring_identity_find_keytype(const keyring_file *k, int cn, int in, int keytype)
{ {
int kp; int kp;
for (kp = 0; kp < keyring->contexts[cn]->identities[in]->keypair_count; ++kp) for (kp = 0; kp < k->contexts[cn]->identities[in]->keypair_count; ++kp)
if (keyring->contexts[cn]->identities[in]->keypairs[kp]->type == keytype) if (k->contexts[cn]->identities[in]->keypairs[kp]->type == keytype)
return kp; return kp;
return -1; return -1;
} }