src/pEpEngine.c
branchENGINE-209
changeset 1797 32581fade44d
parent 1793 74cf3813c28e
child 1798 dddaa8a5d31c
     1.1 --- a/src/pEpEngine.c	Wed May 17 15:07:49 2017 +0200
     1.2 +++ b/src/pEpEngine.c	Thu May 18 11:27:07 2017 +0200
     1.3 @@ -1260,8 +1260,8 @@
     1.4              }
     1.5          }
     1.6  
     1.7 -        status = set_trust(session, identity->user_id, identity->fpr,
     1.8 -                           identity->comm_type)
     1.9 +        // status = set_trust(session, identity->user_id, identity->fpr,
    1.10 +        //                    identity->comm_type)
    1.11          sqlite3_reset(session->set_trust);
    1.12          sqlite3_bind_text(session->set_trust, 1, identity->user_id, -1,
    1.13                  SQLITE_STATIC);
    1.14 @@ -1284,7 +1284,7 @@
    1.15  }
    1.16  
    1.17  PEP_STATUS get_identities_by_fpr(PEP_SESSION session, 
    1.18 -                                 char* fpr, 
    1.19 +                                 const char* fpr, 
    1.20                                   identity_list** id_list) 
    1.21  {
    1.22      PEP_STATUS status = PEP_STATUS_OK;
    1.23 @@ -1293,7 +1293,7 @@
    1.24  }
    1.25  
    1.26  
    1.27 -static PEP_STATUS set_trust(PEP_SESSION session, 
    1.28 +PEP_STATUS set_trust(PEP_SESSION session, 
    1.29                              const char* user_id,
    1.30                              const char* fpr, 
    1.31                              PEP_comm_type comm_type)
    1.32 @@ -1307,7 +1307,7 @@
    1.33      sqlite3_bind_text(session->set_trust, 2, fpr, -1,
    1.34              SQLITE_STATIC);
    1.35      sqlite3_bind_int(session->set_trust, 3, comm_type);
    1.36 -    result = sqlite3_step(session->set_trust);
    1.37 +    int result = sqlite3_step(session->set_trust);
    1.38      sqlite3_reset(session->set_trust);
    1.39      if (result != SQLITE_DONE) {
    1.40          return PEP_CANNOT_SET_TRUST;
    1.41 @@ -2029,7 +2029,7 @@
    1.42      return status;
    1.43  }
    1.44  
    1.45 -static PEP_STATUS get_key_userids(
    1.46 +PEP_STATUS get_key_userids(
    1.47          PEP_SESSION session,
    1.48          const char* fpr,
    1.49          stringlist_t** keylist
    1.50 @@ -2058,8 +2058,7 @@
    1.51          result = sqlite3_step(session->get_key_userids);
    1.52          switch (result) {
    1.53          case SQLITE_ROW:
    1.54 -            userid = (const char *) sqlite3_column_text(session->get_key_userids,
    1.55 -                    0);
    1.56 +            userid = (char *) sqlite3_column_text(session->get_key_userids, 0);
    1.57      
    1.58              if (!userid)
    1.59                  return PEP_UNKNOWN_ERROR;