src/pEpEngine.c
branchsync
changeset 3739 523fb9710660
parent 3720 9ed76a79d784
child 3740 248166aa4ab2
child 3747 82fe58af7b53
child 3750 318c86bc30b0
     1.1 --- a/src/pEpEngine.c	Mon May 20 14:49:40 2019 +0200
     1.2 +++ b/src/pEpEngine.c	Tue May 21 07:04:51 2019 +0200
     1.3 @@ -533,7 +533,7 @@
     1.4  
     1.5      int retval = 0;
     1.6  
     1.7 -    int rc = sqlite3_step(stmt);  
     1.8 +    int rc = Sqlite3_step(stmt);  
     1.9      if (rc == SQLITE_DONE || rc == SQLITE_OK || rc == SQLITE_ROW) {
    1.10          retval = 1;
    1.11      }
    1.12 @@ -584,7 +584,7 @@
    1.13  
    1.14      int retval = 0;
    1.15  
    1.16 -    int rc = sqlite3_step(stmt);  
    1.17 +    int rc = Sqlite3_step(stmt);  
    1.18      if (rc == SQLITE_DONE || rc == SQLITE_OK || rc == SQLITE_ROW) {
    1.19          retval = 1;
    1.20      }
    1.21 @@ -607,7 +607,7 @@
    1.22      sqlite3_prepare_v2(session->db, sql_query, -1, &stmt, NULL);
    1.23      int i = 0;
    1.24      int int_result = 0;
    1.25 -    while ((int_result = sqlite3_step(stmt)) == SQLITE_ROW && i < _PEP_MAX_AFFECTED) {
    1.26 +    while ((int_result = Sqlite3_step(stmt)) == SQLITE_ROW && i < _PEP_MAX_AFFECTED) {
    1.27          table_names[i++] = strdup((const char*)(sqlite3_column_text(stmt, 0)));
    1.28      }
    1.29      
    1.30 @@ -2040,7 +2040,7 @@
    1.31      //     sqlite3_bind_text(session->log, 4, comment, -1, SQLITE_STATIC);
    1.32      // else
    1.33      //     sqlite3_bind_null(session->log, 4);
    1.34 -    // result = sqlite3_step(session->log);
    1.35 +    // result = Sqlite3_step(session->log);
    1.36      // sqlite3_reset(session->log);
    1.37      // 
    1.38      return PEP_STATUS_OK; // We ignore errors for this function.
    1.39 @@ -2094,7 +2094,7 @@
    1.40      sqlite3_bind_text(session->trustword, 1, lang, -1, SQLITE_STATIC);
    1.41      sqlite3_bind_int(session->trustword, 2, value);
    1.42  
    1.43 -    const int result = sqlite3_step(session->trustword);
    1.44 +    const int result = Sqlite3_step(session->trustword);
    1.45      if (result == SQLITE_ROW) {
    1.46          *word = strdup((const char *) sqlite3_column_text(session->trustword,
    1.47                      1));
    1.48 @@ -2289,7 +2289,7 @@
    1.49      
    1.50      sqlite3_reset(session->get_default_own_userid);
    1.51  
    1.52 -    const int result = sqlite3_step(session->get_default_own_userid);
    1.53 +    const int result = Sqlite3_step(session->get_default_own_userid);
    1.54      const char* id;
    1.55      
    1.56      switch (result) {
    1.57 @@ -2338,7 +2338,7 @@
    1.58  
    1.59      const char* tempid;
    1.60      
    1.61 -    const int result = sqlite3_step(session->get_userid_alias_default);
    1.62 +    const int result = Sqlite3_step(session->get_userid_alias_default);
    1.63      switch (result) {
    1.64      case SQLITE_ROW:
    1.65          tempid = (const char *) sqlite3_column_text(session->get_userid_alias_default, 0);
    1.66 @@ -2383,7 +2383,7 @@
    1.67      sqlite3_bind_text(session->add_userid_alias, 2, alias_id, -1,
    1.68              SQLITE_STATIC);
    1.69          
    1.70 -    result = sqlite3_step(session->add_userid_alias);
    1.71 +    result = Sqlite3_step(session->add_userid_alias);
    1.72  
    1.73      sqlite3_reset(session->add_userid_alias);
    1.74      if (result != SQLITE_DONE) {
    1.75 @@ -2420,7 +2420,7 @@
    1.76      sqlite3_bind_text(session->get_identity, 1, address, -1, SQLITE_STATIC);
    1.77      sqlite3_bind_text(session->get_identity, 2, user_id, -1, SQLITE_STATIC);
    1.78  
    1.79 -    const int result = sqlite3_step(session->get_identity);
    1.80 +    const int result = Sqlite3_step(session->get_identity);
    1.81      switch (result) {
    1.82      case SQLITE_ROW:
    1.83          _identity = new_identity(
    1.84 @@ -2483,7 +2483,7 @@
    1.85      sqlite3_bind_text(session->get_identities_by_userid, 1, user_id, -1, SQLITE_STATIC);
    1.86  
    1.87      int result = -1;
    1.88 -    while ((result = sqlite3_step(session->get_identities_by_userid)) == SQLITE_ROW) {
    1.89 +    while ((result = Sqlite3_step(session->get_identities_by_userid)) == SQLITE_ROW) {
    1.90              // "select address, fpr, username, comm_type, lang,"
    1.91              // "   identity.flags | pgp_keypair.flags,"
    1.92              // "   is_own"
    1.93 @@ -2561,7 +2561,7 @@
    1.94  
    1.95      int result = -1;
    1.96      
    1.97 -    while ((result = sqlite3_step(session->get_identities_by_main_key_id)) == SQLITE_ROW) {
    1.98 +    while ((result = Sqlite3_step(session->get_identities_by_main_key_id)) == SQLITE_ROW) {
    1.99          ident = new_identity(
   1.100                      (const char *) sqlite3_column_text(session->get_identities_by_main_key_id, 0),
   1.101                      fpr,
   1.102 @@ -2631,7 +2631,7 @@
   1.103      sqlite3_bind_text(session->get_identity_without_trust_check, 1, address, -1, SQLITE_STATIC);
   1.104      sqlite3_bind_text(session->get_identity_without_trust_check, 2, user_id, -1, SQLITE_STATIC);
   1.105  
   1.106 -    const int result = sqlite3_step(session->get_identity_without_trust_check);
   1.107 +    const int result = Sqlite3_step(session->get_identity_without_trust_check);
   1.108      switch (result) {
   1.109      case SQLITE_ROW:
   1.110          _identity = new_identity(
   1.111 @@ -2695,7 +2695,7 @@
   1.112      sqlite3_bind_text(session->get_identities_by_address, 1, address, -1, SQLITE_STATIC);
   1.113      int result;
   1.114  
   1.115 -    while ((result = sqlite3_step(session->get_identities_by_address)) == SQLITE_ROW) {
   1.116 +    while ((result = Sqlite3_step(session->get_identities_by_address)) == SQLITE_ROW) {
   1.117          //"select user_id, main_key_id, username, comm_type, lang,"
   1.118          //"   identity.flags, is_own"
   1.119          pEp_identity *ident = new_identity(
   1.120 @@ -2762,7 +2762,7 @@
   1.121      sqlite3_bind_text(session->exists_identity_entry, 2, identity->user_id, -1,
   1.122                        SQLITE_STATIC);
   1.123                    
   1.124 -    int result = sqlite3_step(session->exists_identity_entry);
   1.125 +    int result = Sqlite3_step(session->exists_identity_entry);
   1.126  
   1.127      switch (result) {
   1.128          case SQLITE_ROW: {
   1.129 @@ -2797,7 +2797,7 @@
   1.130      sqlite3_bind_text(session->exists_trust_entry, 2, identity->fpr, -1,
   1.131                        SQLITE_STATIC);
   1.132                    
   1.133 -    int result = sqlite3_step(session->exists_trust_entry);
   1.134 +    int result = Sqlite3_step(session->exists_trust_entry);
   1.135      switch (result) {
   1.136          case SQLITE_ROW: {
   1.137              // yeah yeah, I know, we could be lazy here, but it looks bad.
   1.138 @@ -2821,7 +2821,7 @@
   1.139      sqlite3_reset(session->set_pgp_keypair);
   1.140      sqlite3_bind_text(session->set_pgp_keypair, 1, fpr, -1,
   1.141              SQLITE_STATIC);
   1.142 -    result = sqlite3_step(session->set_pgp_keypair);
   1.143 +    result = Sqlite3_step(session->set_pgp_keypair);
   1.144      sqlite3_reset(session->set_pgp_keypair);
   1.145      if (result != SQLITE_DONE) {
   1.146          return PEP_CANNOT_SET_PGP_KEYPAIR;
   1.147 @@ -2854,7 +2854,7 @@
   1.148      sqlite3_bind_text(set_or_update, 2, identity->fpr, -1,
   1.149              SQLITE_STATIC);
   1.150      sqlite3_bind_int(set_or_update, 3, identity->comm_type);
   1.151 -    result = sqlite3_step(set_or_update);
   1.152 +    result = Sqlite3_step(set_or_update);
   1.153      assert(result == SQLITE_DONE);
   1.154      sqlite3_reset(set_or_update);
   1.155      if (result != SQLITE_DONE)
   1.156 @@ -2882,7 +2882,7 @@
   1.157              SQLITE_STATIC);
   1.158      sqlite3_bind_int(set_or_update, 4, identity->flags);
   1.159      sqlite3_bind_int(set_or_update, 5, identity->me);
   1.160 -    int result = sqlite3_step(set_or_update);
   1.161 +    int result = Sqlite3_step(set_or_update);
   1.162      sqlite3_reset(set_or_update);
   1.163      if (result != SQLITE_DONE)
   1.164          return PEP_CANNOT_SET_IDENTITY;
   1.165 @@ -2912,7 +2912,7 @@
   1.166          sqlite3_bind_null(set_or_update, 3);
   1.167      sqlite3_bind_text(set_or_update, 4, identity->fpr, -1,
   1.168                        SQLITE_STATIC);
   1.169 -    int result = sqlite3_step(set_or_update);
   1.170 +    int result = Sqlite3_step(set_or_update);
   1.171      sqlite3_reset(set_or_update);
   1.172      
   1.173      if (result != SQLITE_DONE)
   1.174 @@ -3028,7 +3028,7 @@
   1.175          sqlite3_reset(session->set_pgp_keypair);
   1.176          sqlite3_bind_text(session->set_pgp_keypair, 1, identity->fpr, -1,
   1.177                  SQLITE_STATIC);
   1.178 -        result = sqlite3_step(session->set_pgp_keypair);
   1.179 +        result = Sqlite3_step(session->set_pgp_keypair);
   1.180          sqlite3_reset(session->set_pgp_keypair);
   1.181          if (result != SQLITE_DONE) {
   1.182              sqlite3_exec(session->db, "ROLLBACK ;", NULL, NULL, NULL);
   1.183 @@ -3081,7 +3081,7 @@
   1.184      sqlite3_reset(session->update_trust_to_pEp);
   1.185      sqlite3_bind_text(session->update_trust_to_pEp, 1, user->user_id, -1,
   1.186              SQLITE_STATIC);
   1.187 -    int result = sqlite3_step(session->update_trust_to_pEp);
   1.188 +    int result = Sqlite3_step(session->update_trust_to_pEp);
   1.189      sqlite3_reset(session->update_trust_to_pEp);
   1.190      if (result != SQLITE_DONE)
   1.191          return PEP_CANNOT_SET_TRUST;
   1.192 @@ -3116,7 +3116,7 @@
   1.193      sqlite3_reset(session->set_as_pEp_user);
   1.194      sqlite3_bind_text(session->set_as_pEp_user, 1, user->user_id, -1,
   1.195              SQLITE_STATIC);
   1.196 -    int result = sqlite3_step(session->set_as_pEp_user);
   1.197 +    int result = Sqlite3_step(session->set_as_pEp_user);
   1.198      sqlite3_reset(session->set_as_pEp_user);
   1.199      
   1.200      if (result != SQLITE_DONE)
   1.201 @@ -3151,7 +3151,7 @@
   1.202          sqlite3_reset(session->exists_person);
   1.203          sqlite3_bind_text(session->exists_person, 1, user_id, -1,
   1.204                  SQLITE_STATIC);
   1.205 -        int result = sqlite3_step(session->exists_person);
   1.206 +        int result = Sqlite3_step(session->exists_person);
   1.207          switch (result) {
   1.208              case SQLITE_ROW: {
   1.209                  // yeah yeah, I know, we could be lazy here, but it looks bad.
   1.210 @@ -3189,7 +3189,7 @@
   1.211      sqlite3_bind_text(session->delete_person, 1, user_id, -1,
   1.212                        SQLITE_STATIC);
   1.213                        
   1.214 -    int result = sqlite3_step(session->delete_person);
   1.215 +    int result = Sqlite3_step(session->delete_person);
   1.216      
   1.217      if (result != SQLITE_DONE)
   1.218          status = PEP_UNKNOWN_ERROR;
   1.219 @@ -3224,7 +3224,7 @@
   1.220      sqlite3_reset(session->is_pEp_user);
   1.221      sqlite3_bind_text(session->is_pEp_user, 1, user_id, -1,
   1.222              SQLITE_STATIC);
   1.223 -    int result = sqlite3_step(session->is_pEp_user);
   1.224 +    int result = Sqlite3_step(session->is_pEp_user);
   1.225      switch (result) {
   1.226          case SQLITE_ROW: {
   1.227              // yeah yeah, I know, we could be lazy here, but it looks bad.
   1.228 @@ -3260,7 +3260,7 @@
   1.229      sqlite3_reset(session->is_own_address);
   1.230      sqlite3_bind_text(session->is_own_address, 1, address, -1,
   1.231              SQLITE_STATIC);
   1.232 -    int result = sqlite3_step(session->is_own_address);
   1.233 +    int result = Sqlite3_step(session->is_own_address);
   1.234      switch (result) {
   1.235          case SQLITE_ROW: {
   1.236              // yeah yeah, I know, we could be lazy here, but it looks bad.
   1.237 @@ -3292,7 +3292,7 @@
   1.238      sqlite3_bind_text(session->add_into_social_graph, 3, contact_ident->user_id, -1,
   1.239              SQLITE_STATIC);
   1.240          
   1.241 -    int result = sqlite3_step(session->add_into_social_graph);
   1.242 +    int result = Sqlite3_step(session->add_into_social_graph);
   1.243      sqlite3_reset(session->add_into_social_graph);
   1.244      
   1.245      if (result != SQLITE_DONE)
   1.246 @@ -3321,7 +3321,7 @@
   1.247      sqlite3_bind_text(session->get_own_address_binding_from_contact, 2, contact->user_id, -1,
   1.248              SQLITE_STATIC);
   1.249  
   1.250 -    int result = sqlite3_step(session->get_own_address_binding_from_contact);
   1.251 +    int result = Sqlite3_step(session->get_own_address_binding_from_contact);
   1.252      
   1.253      const char* own_address = NULL;
   1.254      
   1.255 @@ -3357,7 +3357,7 @@
   1.256      sqlite3_bind_text(session->remove_fpr_as_default, 1, fpr, -1,
   1.257                        SQLITE_STATIC);
   1.258  
   1.259 -    int result = sqlite3_step(session->remove_fpr_as_default);
   1.260 +    int result = Sqlite3_step(session->remove_fpr_as_default);
   1.261      sqlite3_reset(session->remove_fpr_as_default);
   1.262      
   1.263      if (result != SQLITE_DONE)
   1.264 @@ -3383,7 +3383,7 @@
   1.265      sqlite3_bind_text(session->replace_identities_fpr, 2, old_fpr, -1,
   1.266                        SQLITE_STATIC);
   1.267  
   1.268 -    int result = sqlite3_step(session->replace_identities_fpr);
   1.269 +    int result = Sqlite3_step(session->replace_identities_fpr);
   1.270      sqlite3_reset(session->replace_identities_fpr);
   1.271      
   1.272      if (result != SQLITE_DONE)
   1.273 @@ -3403,7 +3403,7 @@
   1.274      sqlite3_bind_int(session->update_trust_for_fpr, 1, comm_type);
   1.275      sqlite3_bind_text(session->update_trust_for_fpr, 2, fpr, -1,
   1.276              SQLITE_STATIC);
   1.277 -    int result = sqlite3_step(session->update_trust_for_fpr);
   1.278 +    int result = Sqlite3_step(session->update_trust_for_fpr);
   1.279      sqlite3_reset(session->update_trust_for_fpr);
   1.280      if (result != SQLITE_DONE) {
   1.281          return PEP_CANNOT_SET_TRUST;
   1.282 @@ -3435,7 +3435,7 @@
   1.283      sqlite3_bind_text(session->set_identity_flags, 3, identity->user_id, -1,
   1.284          SQLITE_STATIC);
   1.285          
   1.286 -    result = sqlite3_step(session->set_identity_flags);
   1.287 +    result = Sqlite3_step(session->set_identity_flags);
   1.288  
   1.289      sqlite3_reset(session->set_identity_flags);
   1.290      if (result != SQLITE_DONE)
   1.291 @@ -3467,7 +3467,7 @@
   1.292              SQLITE_STATIC);
   1.293      sqlite3_bind_text(session->unset_identity_flags, 3, identity->user_id, -1,
   1.294              SQLITE_STATIC);
   1.295 -    result = sqlite3_step(session->unset_identity_flags);
   1.296 +    result = Sqlite3_step(session->unset_identity_flags);
   1.297      sqlite3_reset(session->unset_identity_flags);
   1.298      if (result != SQLITE_DONE)
   1.299          return PEP_CANNOT_SET_IDENTITY;
   1.300 @@ -3491,7 +3491,7 @@
   1.301      sqlite3_reset(session->get_trust_by_userid);
   1.302      sqlite3_bind_text(session->get_trust_by_userid, 1, user_id, -1, SQLITE_STATIC);
   1.303  
   1.304 -    while ((result = sqlite3_step(session->get_trust_by_userid)) == SQLITE_ROW) {
   1.305 +    while ((result = Sqlite3_step(session->get_trust_by_userid)) == SQLITE_ROW) {
   1.306          if (!t_list)
   1.307              t_list = new_labeled_int_list(sqlite3_column_int(session->get_trust_by_userid, 1),
   1.308                                           (const char *) sqlite3_column_text(session->get_trust_by_userid, 0));
   1.309 @@ -3822,7 +3822,7 @@
   1.310              SQLITE_STATIC);
   1.311      sqlite3_bind_text(session->replace_userid, 2, old_uid, -1,
   1.312              SQLITE_STATIC);
   1.313 -    result = sqlite3_step(session->replace_userid);
   1.314 +    result = Sqlite3_step(session->replace_userid);
   1.315  #ifndef NDEBUG
   1.316      if (result) {
   1.317          const char *errmsg = sqlite3_errmsg(session->db);
   1.318 @@ -3848,7 +3848,7 @@
   1.319      sqlite3_reset(session->delete_key);
   1.320      sqlite3_bind_text(session->delete_key, 1, fpr, -1,
   1.321              SQLITE_STATIC);
   1.322 -    result = sqlite3_step(session->delete_key);
   1.323 +    result = Sqlite3_step(session->delete_key);
   1.324      sqlite3_reset(session->delete_key);
   1.325      if (result != SQLITE_DONE)
   1.326          return PEP_CANNOT_SET_PGP_KEYPAIR;
   1.327 @@ -3869,7 +3869,7 @@
   1.328      sqlite3_reset(session->refresh_userid_default_key);
   1.329      sqlite3_bind_text(session->refresh_userid_default_key, 1, user_id, -1,
   1.330              SQLITE_STATIC);
   1.331 -    result = sqlite3_step(session->refresh_userid_default_key);
   1.332 +    result = Sqlite3_step(session->refresh_userid_default_key);
   1.333      sqlite3_reset(session->refresh_userid_default_key);
   1.334      if (result != SQLITE_DONE)
   1.335          return PEP_CANNOT_SET_PERSON;
   1.336 @@ -3893,7 +3893,7 @@
   1.337              SQLITE_STATIC);
   1.338      sqlite3_bind_text(session->replace_main_user_fpr, 2, user_id, -1,
   1.339              SQLITE_STATIC);
   1.340 -    result = sqlite3_step(session->replace_main_user_fpr);
   1.341 +    result = Sqlite3_step(session->replace_main_user_fpr);
   1.342      sqlite3_reset(session->replace_main_user_fpr);
   1.343      if (result != SQLITE_DONE)
   1.344          return PEP_CANNOT_SET_PERSON;
   1.345 @@ -3920,7 +3920,7 @@
   1.346      sqlite3_reset(session->get_main_user_fpr);
   1.347      sqlite3_bind_text(session->get_main_user_fpr, 1, user_id, -1,
   1.348                        SQLITE_STATIC);
   1.349 -    result = sqlite3_step(session->get_main_user_fpr);
   1.350 +    result = Sqlite3_step(session->get_main_user_fpr);
   1.351      switch (result) {
   1.352      case SQLITE_ROW: {
   1.353          const char* _fpr = 
   1.354 @@ -3968,7 +3968,7 @@
   1.355      sqlite3_reset(session->mark_compromised);
   1.356      sqlite3_bind_text(session->mark_compromised, 1, fpr, -1,
   1.357              SQLITE_STATIC);
   1.358 -    result = sqlite3_step(session->mark_compromised);
   1.359 +    result = Sqlite3_step(session->mark_compromised);
   1.360      sqlite3_reset(session->mark_compromised);
   1.361  
   1.362      if (result != SQLITE_DONE)
   1.363 @@ -4008,7 +4008,7 @@
   1.364              SQLITE_STATIC);
   1.365      sqlite3_bind_text(session->get_trust, 2, identity->fpr, -1, SQLITE_STATIC);
   1.366  
   1.367 -    result = sqlite3_step(session->get_trust);
   1.368 +    result = Sqlite3_step(session->get_trust);
   1.369      switch (result) {
   1.370      case SQLITE_ROW: {
   1.371          int comm_type = (PEP_comm_type) sqlite3_column_int(session->get_trust,
   1.372 @@ -4047,7 +4047,7 @@
   1.373      sqlite3_reset(session->least_trust);
   1.374      sqlite3_bind_text(session->least_trust, 1, fpr, -1, SQLITE_STATIC);
   1.375  
   1.376 -    result = sqlite3_step(session->least_trust);
   1.377 +    result = Sqlite3_step(session->least_trust);
   1.378      switch (result) {
   1.379          case SQLITE_ROW: {
   1.380              int _comm_type = sqlite3_column_int(session->least_trust, 0);
   1.381 @@ -4478,7 +4478,7 @@
   1.382      int result;
   1.383  
   1.384      do {
   1.385 -        result = sqlite3_step(session->crashdump);
   1.386 +        result = Sqlite3_step(session->crashdump);
   1.387          switch (result) {
   1.388          case SQLITE_ROW:
   1.389              timestamp = (const char *) sqlite3_column_text(session->crashdump,
   1.390 @@ -4570,7 +4570,7 @@
   1.391      int result;
   1.392  
   1.393      do {
   1.394 -        result = sqlite3_step(session->languagelist);
   1.395 +        result = Sqlite3_step(session->languagelist);
   1.396          switch (result) {
   1.397          case SQLITE_ROW:
   1.398              lang = (const char *) sqlite3_column_text(session->languagelist,
   1.399 @@ -4638,7 +4638,7 @@
   1.400      const char *_phrase = NULL;
   1.401      int result;
   1.402  
   1.403 -    result = sqlite3_step(session->i18n_token);
   1.404 +    result = Sqlite3_step(session->i18n_token);
   1.405      switch (result) {
   1.406      case SQLITE_ROW:
   1.407          _phrase = (const char *) sqlite3_column_text(session->i18n_token, 0);
   1.408 @@ -4680,7 +4680,7 @@
   1.409      sqlite3_reset(session->sequence_value2);
   1.410      sqlite3_bind_text(session->sequence_value2, 1, name, -1,
   1.411              SQLITE_STATIC);
   1.412 -    int result = sqlite3_step(session->sequence_value2);
   1.413 +    int result = Sqlite3_step(session->sequence_value2);
   1.414      switch (result) {
   1.415          case SQLITE_ROW: {
   1.416              int32_t _value = (int32_t)
   1.417 @@ -4708,7 +4708,7 @@
   1.418  
   1.419      sqlite3_reset(session->sequence_value1);
   1.420      sqlite3_bind_text(session->sequence_value1, 1, name, -1, SQLITE_STATIC);
   1.421 -    int result = sqlite3_step(session->sequence_value1);
   1.422 +    int result = Sqlite3_step(session->sequence_value1);
   1.423      assert(result == SQLITE_DONE);
   1.424      sqlite3_reset(session->sequence_value1);
   1.425      if (result == SQLITE_DONE)
   1.426 @@ -4769,7 +4769,7 @@
   1.427      
   1.428      sqlite3_bind_text(session->own_key_is_listed, 1, fpr, -1,
   1.429              SQLITE_STATIC);
   1.430 -    int result = sqlite3_step(session->own_key_is_listed);
   1.431 +    int result = Sqlite3_step(session->own_key_is_listed);
   1.432      switch (result) {
   1.433          case SQLITE_ROW: {
   1.434              *own_key = (sqlite3_column_int(session->own_key_is_listed, 0) != 0);
   1.435 @@ -4813,7 +4813,7 @@
   1.436  
   1.437      int result;
   1.438      
   1.439 -    result = sqlite3_step(session->set_revoked);
   1.440 +    result = Sqlite3_step(session->set_revoked);
   1.441      switch (result) {
   1.442          case SQLITE_DONE:
   1.443              status = PEP_STATUS_OK;
   1.444 @@ -4855,7 +4855,7 @@
   1.445  
   1.446      int result;
   1.447      
   1.448 -    result = sqlite3_step(session->get_revoked);
   1.449 +    result = Sqlite3_step(session->get_revoked);
   1.450      switch (result) {
   1.451          case SQLITE_ROW: {
   1.452              *revoked_fpr = strdup((const char *)
   1.453 @@ -4899,7 +4899,7 @@
   1.454  
   1.455      int result;
   1.456      
   1.457 -    result = sqlite3_step(session->get_replacement_fpr);
   1.458 +    result = Sqlite3_step(session->get_replacement_fpr);
   1.459      switch (result) {
   1.460          case SQLITE_ROW: {
   1.461              *revoked_fpr = strdup((const char *)
   1.462 @@ -4938,7 +4938,7 @@
   1.463      sqlite3_reset(session->get_last_contacted);
   1.464      int result;
   1.465  
   1.466 -    while ((result = sqlite3_step(session->get_last_contacted)) == SQLITE_ROW) {
   1.467 +    while ((result = Sqlite3_step(session->get_last_contacted)) == SQLITE_ROW) {
   1.468          pEp_identity *ident = new_identity(
   1.469                  (const char *) sqlite3_column_text(session->get_last_contacted, 1),
   1.470                  NULL,