summaryrefslogtreecommitdiff
path: root/protocols/IcqOscarJ/src/icq_packet.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/IcqOscarJ/src/icq_packet.cpp')
-rw-r--r--protocols/IcqOscarJ/src/icq_packet.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/IcqOscarJ/src/icq_packet.cpp b/protocols/IcqOscarJ/src/icq_packet.cpp
index 7b8c25946f..cc954bf2fe 100644
--- a/protocols/IcqOscarJ/src/icq_packet.cpp
+++ b/protocols/IcqOscarJ/src/icq_packet.cpp
@@ -539,7 +539,7 @@ void CIcqProto::ppackTLVStringFromDB(PBYTE *buf, size_t *buflen, const char *szS
void CIcqProto::ppackTLVStringUtfFromDB(PBYTE *buf, size_t *buflen, const char *szSetting, WORD wType)
{
- char *str = getSettingStringUtf(NULL, szSetting, NULL);
+ char *str = getSettingStringUtf(NULL, szSetting, nullptr);
ppackTLV(buf, buflen, wType, mir_strlen(str), (PBYTE)str);
@@ -567,7 +567,7 @@ void CIcqProto::ppackTLVDateFromDB(PBYTE *buf, size_t *buflen, const char *szSet
int CIcqProto::ppackTLVWordStringItemFromDB(PBYTE *buf, size_t *buflen, const char *szSetting, WORD wTypeID, WORD wTypeData, WORD wID)
{
char szTmp[1024];
- char *str = NULL;
+ char *str = nullptr;
if (!getSettingStringStatic(NULL, szSetting, szTmp, sizeof(szTmp)))
str = szTmp;
@@ -588,7 +588,7 @@ int CIcqProto::ppackTLVWordStringItemFromDB(PBYTE *buf, size_t *buflen, const ch
int CIcqProto::ppackTLVWordStringUtfItemFromDB(PBYTE *buf, size_t *buflen, const char *szSetting, WORD wTypeID, WORD wTypeData, WORD wID)
{
- char *str = getSettingStringUtf(NULL, szSetting, NULL);
+ char *str = getSettingStringUtf(NULL, szSetting, nullptr);
if (str) {
size_t wLen = mir_strlen(str);
@@ -836,7 +836,7 @@ NextTLV:
*(*ttlv + wLen) = '\0';
}
else
- *ttlv = NULL;
+ *ttlv = nullptr;
}
// Save type and length