diff options
| author | George Hazan <ghazan@miranda.im> | 2019-03-12 19:37:35 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-12 19:37:35 +0300 |
| commit | 2ebd5155bdf88bdb3fbc76fbf7e9fdc9765133d6 (patch) | |
| tree | f4a50c8ff88f45e52d20943142de33478559afc7 /plugins/Variables/src | |
| parent | 413bfdfbc3b4bbcdf5ebe47d83c618c3781c6a82 (diff) | |
fixes for format specifiers
Diffstat (limited to 'plugins/Variables/src')
| -rw-r--r-- | plugins/Variables/src/help.cpp | 2 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_metacontacts.cpp | 6 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_miranda.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Variables/src/help.cpp b/plugins/Variables/src/help.cpp index d2cf8fb869..4999207416 100644 --- a/plugins/Variables/src/help.cpp +++ b/plugins/Variables/src/help.cpp @@ -300,7 +300,7 @@ static wchar_t* getTokenDescription(TOKENREGISTEREX *tr) } if (tr->flags&TRF_FIELD) - mir_snwprintf(desc, len, L"%c%s%c", FIELD_CHAR, tr->szTokenString, FIELD_CHAR); + mir_snwprintf(desc, len, L"%c%s%c", FIELD_CHAR, tr->szTokenString.w, FIELD_CHAR); else { if (args != nullptr) tArgs = mir_a2u(args); diff --git a/plugins/Variables/src/parse_metacontacts.cpp b/plugins/Variables/src/parse_metacontacts.cpp index f9b13bea14..0d06cafffc 100644 --- a/plugins/Variables/src/parse_metacontacts.cpp +++ b/plugins/Variables/src/parse_metacontacts.cpp @@ -40,7 +40,7 @@ static wchar_t* parseGetParent(ARGUMENTSINFO *ai) if (szUniqueID == NULL) {
szProto = PROTOID_HANDLE;
wchar_t tszID[40];
- mir_snwprintf(tszID, L"%p", hContact);
+ _itow_s(hContact, tszID, 10);
szUniqueID = mir_wstrdup(tszID);
}
@@ -68,7 +68,7 @@ static wchar_t* parseGetDefault(ARGUMENTSINFO *ai) if (szUniqueID == NULL) {
szProto = PROTOID_HANDLE;
wchar_t tszID[40];
- mir_snwprintf(tszID, L"%p", hContact);
+ _itow_s(hContact, tszID, 10);
szUniqueID = mir_wstrdup(tszID);
}
@@ -96,7 +96,7 @@ static wchar_t* parseGetMostOnline(ARGUMENTSINFO *ai) if (szUniqueID == NULL) {
szProto = PROTOID_HANDLE;
wchar_t tszID[40];
- mir_snwprintf(tszID, L"%p", hContact);
+ _itow_s(hContact, tszID, 10);
szUniqueID = mir_wstrdup(tszID);
}
diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index 2bd57f5804..e093fce35c 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -387,7 +387,7 @@ static wchar_t* parseSpecialContact(ARGUMENTSINFO *ai) szUniqueID = (wchar_t*)mir_alloc(40);
if (szUniqueID == NULL)
return nullptr;
- mir_snwprintf(szUniqueID, 20, L"%p", ai->fi->hContact);
+ _itow_s(ai->fi->hContact, szUniqueID, 20, 10);
}
if (szUniqueID == NULL)
|