diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-05-16 11:22:10 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-05-16 11:22:10 +0100 |
| commit | d37edaecc5fcdcc18ec1615c485f4410d6cbb4bb (patch) | |
| tree | fcc4ad015412b06fdf14a0928703db87ca8e1080 /src/account.cpp | |
| parent | b1db016baa2a66b37d309a627d9dd00486f57cc9 (diff) | |
| parent | 3965320a9ce2a41a96b962e8f5bf396f328d1aad (diff) | |
Merge branch 'rav/remove_logging'
Diffstat (limited to 'src/account.cpp')
| -rw-r--r-- | src/account.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/account.cpp b/src/account.cpp index 4fca953..e5cbfab 100644 --- a/src/account.cpp +++ b/src/account.cpp @@ -14,12 +14,9 @@ */ #include "olm/account.hh" #include "olm/base64.hh" -#include "olm/logging.hh" #include "olm/pickle.hh" #include "olm/memory.hh" -static const char *LOG_CATEGORY = "olm::Account"; - olm::Account::Account( ) : next_one_time_key_id(0), last_error(olm::ErrorCode::SUCCESS) { @@ -45,11 +42,9 @@ std::size_t olm::Account::remove_key( if (olm::array_equal(i->key.public_key, public_key.public_key)) { std::uint32_t id = i->id; one_time_keys.erase(i); - olm::logf(olm::LOG_INFO, LOG_CATEGORY, "removed key id %i", id); return id; } } - olm::logf(olm::LOG_WARNING, LOG_CATEGORY, "Couldn't find key to remove"); return std::size_t(-1); } @@ -69,8 +64,6 @@ std::size_t olm::Account::new_account( random += KEY_LENGTH; olm::curve25519_generate_key(random, identity_keys.curve25519_key); - olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Created new account"); - return 0; } |