Update names

otrv4 · Oct 4, 2018 · f73c8fd · f73c8fd
1 parent 1687a6b
commit f73c8fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/otrng-client.c b/otrng-client.c
@@ -29,7 +29,7 @@
 char *otrv4_client_adapter_privkey_fingerprint(const otrng_client_s *client) {
   char *ret = NULL;
 
-  otrng_fingerprint_t our_fp = {0};
+  otrng_fingerprint our_fp = {0};
   if (otrng_failed(otrng_client_get_our_fingerprint(our_fp, client))) {
     return NULL;
   }

diff --git a/plugin-all.c b/plugin-all.c
@@ -1844,7 +1844,7 @@ static void gone_insecure_v4(const otrng_s *cconv) {
   otrng_plugin_conversation_free(conv);
 }
 
-static void fingerprint_seen_v3(const otrng_fingerprint_v3_t fp,
+static void fingerprint_seen_v3(const otrng_fingerprint_v3 fp,
                                 const otrng_s *cconv) {
   otrng_plugin_conversation *conv =
       client_conversation_to_plugin_conversation(cconv);
@@ -1857,7 +1857,7 @@ static void fingerprint_seen_v3(const otrng_fingerprint_v3_t fp,
   otrng_plugin_conversation_free(conv);
 }
 
-static void fingerprint_seen_v4(const otrng_fingerprint_t fp,
+static void fingerprint_seen_v4(const otrng_fingerprint fp,
                                 const otrng_s *cconv) {
   // TODO: use fp to determine if you have seen this fp before
   // See: otrng_dialog_unknown_fingerprint

diff --git a/prekey-plugin-account.c b/prekey-plugin-account.c
@@ -66,7 +66,7 @@ void storage_status_received_cb(
 
 void success_received_cb(otrng_client_s *client, void *ctx) {
   otrng_client_published(client);
-  client->prekey_messages_num_to_publish = 0;
+  client->prekey_msgs_num_to_publish = 0;
   otrng_debug_fprintf(stderr, "[%s] Prekey Server: received success\n",
                       client->client_id.account);
 }
@@ -152,7 +152,7 @@ int build_prekey_publication_message_cb(
   // TODO: @ola continue here - we should not create prekey messages here
   //    instead, they should be done in the orchestration part
 
-  msg->num_prekey_messages = client->prekey_messages_num_to_publish;
+  msg->num_prekey_messages = client->prekey_msgs_num_to_publish;
   msg->prekey_messages = otrng_client_build_prekey_messages(
       msg->num_prekey_messages, client, &msg->ecdh_keys, &msg->dh_keys);