diff options
| author | Goraf <22941576+Goraf@users.noreply.github.com> | 2017-11-13 15:03:31 +0100 |
|---|---|---|
| committer | Goraf <22941576+Goraf@users.noreply.github.com> | 2017-11-13 15:07:33 +0100 |
| commit | a7c24ca48995cf2bf436156302f96b91bf135409 (patch) | |
| tree | 953835509ff1b778833e78fd7b74b05e05e77c84 /plugins/CryptoPP/src/cpp_gpgw.cpp | |
| parent | 591ec17b1c99db7f120c22ca9fb20ae05fe78325 (diff) | |
Code modernize ...
* replace 0/NULL with nullptr [using clang-tidy]
Diffstat (limited to 'plugins/CryptoPP/src/cpp_gpgw.cpp')
| -rw-r--r-- | plugins/CryptoPP/src/cpp_gpgw.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/CryptoPP/src/cpp_gpgw.cpp b/plugins/CryptoPP/src/cpp_gpgw.cpp index a86d2219cd..bda82d6e6f 100644 --- a/plugins/CryptoPP/src/cpp_gpgw.cpp +++ b/plugins/CryptoPP/src/cpp_gpgw.cpp @@ -30,7 +30,7 @@ int __cdecl gpg_done() int r = 0;
if (hgpg) {
r = _gpg_done();
- hgpg = 0;
+ hgpg = nullptr;
}
return r;
}
@@ -68,7 +68,7 @@ LPSTR __cdecl gpg_encrypt(pCNTX ptr, LPCSTR szPlainMsg) LPSTR szEncMsg = _gpg_encrypt(szPlainMsg, (LPCSTR)p->gpgKeyID);
mir_free(ptr->tmp);
if (!szEncMsg) {
- return ptr->tmp = 0;
+ return ptr->tmp = nullptr;
}
else {
ptr->tmp = mir_strdup(szEncMsg);
@@ -93,11 +93,11 @@ LPSTR __cdecl gpg_encode(HANDLE context, LPCSTR szPlainMsg) {
pCNTX ptr = get_context_on_id(context);
if (!ptr)
- return NULL;
+ return nullptr;
pGPGDATA p = (pGPGDATA)cpp_alloc_pdata(ptr);
if (!p->gpgKeyID) {
ptr->error = ERROR_NO_GPG_KEY;
- return NULL;
+ return nullptr;
}
// utf8 message: encrypt.
@@ -106,7 +106,7 @@ LPSTR __cdecl gpg_encode(HANDLE context, LPCSTR szPlainMsg) LPWSTR wszMsg = utf8decode(szPlainMsg);
int wlen = (int)wcslen(wszMsg) + 1;
szUtfMsg = (LPSTR)alloca(wlen);
- WideCharToMultiByte(CP_ACP, 0, wszMsg, -1, szUtfMsg, wlen, 0, 0);
+ WideCharToMultiByte(CP_ACP, 0, wszMsg, -1, szUtfMsg, wlen, nullptr, nullptr);
}
else {
szUtfMsg = (LPSTR)szPlainMsg;
@@ -119,9 +119,9 @@ LPSTR __cdecl gpg_decode(HANDLE context, LPCSTR szEncMsg) {
pCNTX ptr = get_context_on_id(context);
if (!ptr)
- return NULL;
+ return nullptr;
- LPSTR szNewMsg = NULL;
+ LPSTR szNewMsg = nullptr;
LPSTR szOldMsg = gpg_decrypt(ptr, szEncMsg);
if (szOldMsg) {
|