diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 19:01:08 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 19:01:08 -0500 |
| commit | ec323d8c3f61c3ca86d1ef2b604d4dd75c59e250 (patch) | |
| tree | 81608ed30d766f52b253427aff59d78309114189 /src/wallet/wallet2.cpp | |
| parent | Merge pull request #1579 (diff) | |
| parent | enable clang checks that were disabled (diff) | |
| download | monero-ec323d8c3f61c3ca86d1ef2b604d4dd75c59e250.tar.xz | |
Merge pull request #1561
d561f4ad enable clang checks that were disabled (Chris Vickio)
0aefb2f6 remove std::move from return statements (pessimizing-move warning) (Chris Vickio)
629d5b76 change counter from bool to int (deprecated-increment-bool warning) (Chris Vickio)
fb76d439 add extra braces around subobjects (missing-braces warning) (Chris Vickio)
3b6d5f25 make struct/class declarations consistent (mismatched-tags warning) (Chris Vickio)
fcf66925 remove unused fields from network_throttle (unused-private-field warning) (Chris Vickio)
296f8c16 inline unused function (for unused-function warning) (Chris Vickio)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index ccfe86ee0..8a03b94af 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -5150,7 +5150,7 @@ std::string wallet2::encrypt(const std::string &plaintext, const crypto::secret_ crypto::signature &signature = *(crypto::signature*)&ciphertext[ciphertext.size() - sizeof(crypto::signature)]; crypto::generate_signature(hash, pkey, skey, signature); } - return std::move(ciphertext); + return ciphertext; } //---------------------------------------------------------------------------------------------------- std::string wallet2::encrypt_with_view_secret_key(const std::string &plaintext, bool authenticated) const @@ -5180,7 +5180,7 @@ std::string wallet2::decrypt(const std::string &ciphertext, const crypto::secret error::wallet_internal_error, "Failed to authenticate criphertext"); } crypto::chacha8(ciphertext.data() + sizeof(iv), ciphertext.size() - prefix_size, key, iv, &plaintext[0]); - return std::move(plaintext); + return plaintext; } //---------------------------------------------------------------------------------------------------- std::string wallet2::decrypt_with_view_secret_key(const std::string &ciphertext, bool authenticated) const @@ -5218,7 +5218,7 @@ std::string wallet2::make_uri(const std::string &address, const std::string &pay } std::string uri = "monero:" + address; - bool n_fields = 0; + unsigned int n_fields = 0; if (!payment_id.empty()) { |