Compile errors fixed for netpgp; still can't test. Mrrrr. ENGINE-73
authorKrista Grothoff <krista@pep-project.org>
Tue, 16 Aug 2016 13:03:51 +0200
branchENGINE-73
changeset 102190d21813bfce
parent 1020 b80ab1442557
child 1022 33885fd68114
Compile errors fixed for netpgp; still can't test. Mrrrr.
src/pgp_netpgp.c
     1.1 --- a/src/pgp_netpgp.c	Tue Aug 16 11:21:57 2016 +0200
     1.2 +++ b/src/pgp_netpgp.c	Tue Aug 16 13:03:51 2016 +0200
     1.3 @@ -1668,7 +1668,7 @@
     1.4      size_t copy_len = 0;
     1.5      
     1.6      // Primitive email extraction
     1.7 -    at = strrchr('@',src);
     1.8 +    at = strrchr(src,'@');
     1.9          
    1.10      if (at) {
    1.11          // Go back until we hit a space, a '<', or the start of the string
    1.12 @@ -1708,7 +1708,7 @@
    1.13  
    1.14  PEP_STATUS pgp_list_keys(
    1.15          PEP_SESSION session, 
    1.16 -        identity_list_t** id_list)
    1.17 +        identity_list** id_list)
    1.18  {
    1.19      
    1.20      pgp_key_t *key;
    1.21 @@ -1727,10 +1727,10 @@
    1.22      if (keyring_end < 1)
    1.23          return result;
    1.24      
    1.25 -    identity_list _retval = new_identity_list(NULL);
    1.26 +    identity_list* _retval = new_identity_list(NULL);
    1.27      
    1.28 -    for (key = keyring->keys; n < keyring_end; ++n, ++key) {
    1.29 -        assert(key)
    1.30 +    for (key = pubkeys->keys; n < keyring_end; ++n, ++key) {
    1.31 +        assert(key);
    1.32          if (!key)
    1.33              continue;
    1.34          char* primary_userid = (char*)pgp_key_get_primary_userid(key);
    1.35 @@ -1744,12 +1744,12 @@
    1.36          fpr_to_str(&id_fpr, key->pubkeyfpr.fingerprint,
    1.37                     key->pubkeyfpr.length);
    1.38  
    1.39 -        identity_list_add(_retval, new_identity(usermail, id_fpr, primary_user_id,
    1.40 +        identity_list_add(_retval, new_identity(usermail, id_fpr, primary_userid,
    1.41                                                  username));
    1.42          free(username);
    1.43          free(usermail);
    1.44          free(id_fpr);
    1.45 -        status = PEP_STATUS_OK;
    1.46 +        result = PEP_STATUS_OK;
    1.47      }
    1.48      *id_list = _retval;
    1.49      return result;