From d84c1af8821819be965d26ce559279eff7fffb61 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Fri, 6 Aug 2021 17:36:01 -0400 Subject: [PATCH] East const for consistency --- include/olm/olm.h | 46 ++++++++++++++++++++++----------------------- src/olm.cpp | 48 +++++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/include/olm/olm.h b/include/olm/olm.h index e35ed0a..0cb42fe 100644 --- a/include/olm/olm.h +++ b/include/olm/olm.h @@ -72,34 +72,34 @@ size_t olm_error(void); /** A null terminated string describing the most recent error to happen to an * account */ const char * olm_account_last_error( - const OlmAccount * account + OlmAccount const * account ); /** An error code describing the most recent error to happen to an account */ enum OlmErrorCode olm_account_last_error_code( - const OlmAccount * account + OlmAccount const * account ); /** A null terminated string describing the most recent error to happen to a * session */ const char * olm_session_last_error( - const OlmSession * session + OlmSession const * session ); /** An error code describing the most recent error to happen to a session */ enum OlmErrorCode olm_session_last_error_code( - const OlmSession * session + OlmSession const * session ); /** A null terminated string describing the most recent error to happen to a * utility */ const char * olm_utility_last_error( - const OlmUtility * utility + OlmUtility const * utility ); /** An error code describing the most recent error to happen to a utility */ enum OlmErrorCode olm_utility_last_error_code( - const OlmUtility * utility + OlmUtility const * utility ); /** Clears the memory used to back this account */ @@ -119,12 +119,12 @@ size_t olm_clear_utility( /** Returns the number of bytes needed to store an account */ size_t olm_pickle_account_length( - const OlmAccount * account + OlmAccount const * account ); /** Returns the number of bytes needed to store a session */ size_t olm_pickle_session_length( - const OlmSession * session + OlmSession const * session ); /** Stores an account as a base64 string. Encrypts the account using the @@ -175,7 +175,7 @@ size_t olm_unpickle_session( /** The number of random bytes needed to create an account.*/ size_t olm_create_account_random_length( - const OlmAccount * account + OlmAccount const * account ); /** Creates a new account. Returns olm_error() on failure. If there weren't @@ -188,7 +188,7 @@ size_t olm_create_account( /** The size of the output buffer needed to hold the identity keys */ size_t olm_account_identity_keys_length( - const OlmAccount * account + OlmAccount const * account ); /** Writes the public parts of the identity keys for the account into the @@ -203,7 +203,7 @@ size_t olm_account_identity_keys( /** The length of an ed25519 signature encoded as base64. */ size_t olm_account_signature_length( - const OlmAccount * account + OlmAccount const * account ); /** Signs a message with the ed25519 key for this account. Returns olm_error() @@ -217,7 +217,7 @@ size_t olm_account_sign( /** The size of the output buffer needed to hold the one time keys */ size_t olm_account_one_time_keys_length( - const OlmAccount * account + OlmAccount const * account ); /** Writes the public parts of the unpublished one time keys for the account @@ -250,13 +250,13 @@ size_t olm_account_mark_keys_as_published( /** The largest number of one time keys this account can store. */ size_t olm_account_max_number_of_one_time_keys( - const OlmAccount * account + OlmAccount const * account ); /** The number of random bytes needed to generate a given number of new one * time keys. */ size_t olm_account_generate_one_time_keys_random_length( - const OlmAccount * account, + OlmAccount const * account, size_t number_of_keys ); @@ -272,7 +272,7 @@ size_t olm_account_generate_one_time_keys( /** The number of random bytes needed to generate a fallback key. */ size_t olm_account_generate_fallback_key_random_length( - const OlmAccount * account + OlmAccount const * account ); /** Generates a new fallback key. Only one previous fallback key is @@ -286,7 +286,7 @@ size_t olm_account_generate_fallback_key( /** The number of bytes needed to hold the fallback key as returned by * olm_account_fallback_key. */ size_t olm_account_fallback_key_length( - const OlmAccount * account + OlmAccount const * account ); size_t olm_account_fallback_key( @@ -297,7 +297,7 @@ size_t olm_account_fallback_key( /** The number of random bytes needed to create an outbound session */ size_t olm_create_outbound_session_random_length( - const OlmSession * session + OlmSession const * session ); /** Creates a new out-bound session for sending messages to a given identity_key @@ -339,7 +339,7 @@ size_t olm_create_inbound_session_from( /** The length of the buffer needed to return the id for this session. */ size_t olm_session_id_length( - const OlmSession * session + OlmSession const * session ); /** An identifier for this session. Will be the same for both ends of the @@ -351,7 +351,7 @@ size_t olm_session_id( ); int olm_session_has_received_message( - const OlmSession *session + OlmSession const *session ); /** @@ -402,18 +402,18 @@ size_t olm_remove_one_time_keys( * Returns OLM_MESSAGE_TYPE_MESSAGE if the message will be a normal message. * Returns olm_error on failure. */ size_t olm_encrypt_message_type( - const OlmSession * session + OlmSession const * session ); /** The number of random bytes needed to encrypt the next message. */ size_t olm_encrypt_random_length( - const OlmSession * session + OlmSession const * session ); /** The size of the next message in bytes for the given number of plain-text * bytes. */ size_t olm_encrypt_message_length( - const OlmSession * session, + OlmSession const * session, size_t plaintext_length ); @@ -464,7 +464,7 @@ size_t olm_decrypt( /** The length of the buffer needed to hold the SHA-256 hash. */ size_t olm_sha256_length( - const OlmUtility * utility + OlmUtility const * utility ); /** Calculates the SHA-256 hash of the input and encodes it as base64. If the diff --git a/src/olm.cpp b/src/olm.cpp index 6dfa876..80d5dba 100644 --- a/src/olm.cpp +++ b/src/olm.cpp @@ -42,15 +42,15 @@ static olm::Account * from_c(OlmAccount * account) { return reinterpret_cast(account); } -static const olm::Account * from_c(const OlmAccount * account) { - return reinterpret_cast(account); +static const olm::Account * from_c(OlmAccount const * account) { + return reinterpret_cast(account); } static olm::Session * from_c(OlmSession * session) { return reinterpret_cast(session); } -static const olm::Session * from_c(const OlmSession * session) { +static const olm::Session * from_c(OlmSession const * session) { return reinterpret_cast(session); } @@ -58,7 +58,7 @@ static olm::Utility * from_c(OlmUtility * utility) { return reinterpret_cast(utility); } -static const olm::Utility * from_c(const OlmUtility * utility) { +static const olm::Utility * from_c(OlmUtility const * utility) { return reinterpret_cast(utility); } @@ -142,20 +142,20 @@ const char * olm_session_last_error( } enum OlmErrorCode olm_session_last_error_code( - const OlmSession * session + OlmSession const * session ) { return from_c(session)->last_error; } const char * olm_utility_last_error( - const OlmUtility * utility + OlmUtility const * utility ) { auto error = from_c(utility)->last_error; return _olm_error_to_string(error); } enum OlmErrorCode olm_utility_last_error_code( - const OlmUtility * utility + OlmUtility const * utility ) { return from_c(utility)->last_error; } @@ -231,14 +231,14 @@ size_t olm_clear_utility( size_t olm_pickle_account_length( - const OlmAccount * account + OlmAccount const * account ) { return _olm_enc_output_length(pickle_length(*from_c(account))); } size_t olm_pickle_session_length( - const OlmSession * session + OlmSession const * session ) { return _olm_enc_output_length(pickle_length(*from_c(session))); } @@ -347,7 +347,7 @@ size_t olm_unpickle_session( size_t olm_create_account_random_length( - const OlmAccount * account + OlmAccount const * account ) { return from_c(account)->new_account_random_length(); } @@ -364,7 +364,7 @@ size_t olm_create_account( size_t olm_account_identity_keys_length( - const OlmAccount * account + OlmAccount const * account ) { return from_c(account)->get_identity_json_length(); } @@ -381,7 +381,7 @@ size_t olm_account_identity_keys( size_t olm_account_signature_length( - const OlmAccount * account + OlmAccount const * account ) { return b64_output_length(from_c(account)->signature_length()); } @@ -407,7 +407,7 @@ size_t olm_account_sign( size_t olm_account_one_time_keys_length( - const OlmAccount * account + OlmAccount const * account ) { return from_c(account)->get_one_time_keys_json_length(); } @@ -431,14 +431,14 @@ size_t olm_account_mark_keys_as_published( size_t olm_account_max_number_of_one_time_keys( - const OlmAccount * account + OlmAccount const * account ) { return from_c(account)->max_number_of_one_time_keys(); } size_t olm_account_generate_one_time_keys_random_length( - const OlmAccount * account, + OlmAccount const * account, size_t number_of_keys ) { return from_c(account)->generate_one_time_keys_random_length(number_of_keys); @@ -460,7 +460,7 @@ size_t olm_account_generate_one_time_keys( size_t olm_account_generate_fallback_key_random_length( - const OlmAccount * account + OlmAccount const * account ) { return from_c(account)->generate_fallback_key_random_length(); } @@ -479,7 +479,7 @@ size_t olm_account_generate_fallback_key( size_t olm_account_fallback_key_length( - const OlmAccount * account + OlmAccount const * account ) { return from_c(account)->get_fallback_key_json_length(); } @@ -496,7 +496,7 @@ size_t olm_account_fallback_key( size_t olm_create_outbound_session_random_length( - const OlmSession * session + OlmSession const * session ) { return from_c(session)->new_outbound_session_random_length(); } @@ -582,7 +582,7 @@ size_t olm_create_inbound_session_from( size_t olm_session_id_length( - const OlmSession * session + OlmSession const * session ) { return b64_output_length(from_c(session)->session_id_length()); } @@ -608,7 +608,7 @@ size_t olm_session_id( int olm_session_has_received_message( - const OlmSession * session + OlmSession const * session ) { return from_c(session)->received_message; } @@ -679,21 +679,21 @@ size_t olm_remove_one_time_keys( size_t olm_encrypt_message_type( - const OlmSession * session + OlmSession const * session ) { return size_t(from_c(session)->encrypt_message_type()); } size_t olm_encrypt_random_length( - const OlmSession * session + OlmSession const * session ) { return from_c(session)->encrypt_random_length(); } size_t olm_encrypt_message_length( - const OlmSession * session, + OlmSession const * session, size_t plaintext_length ) { return b64_output_length( @@ -766,7 +766,7 @@ size_t olm_decrypt( size_t olm_sha256_length( - const OlmUtility * utility + OlmUtility const * utility ) { return b64_output_length(from_c(utility)->sha256_length()); }