diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-23 18:55:59 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-23 18:55:59 +0000 |
| commit | 2a815f8820ca402626bd283dd5b75744ddeb9812 (patch) | |
| tree | b230e7ac7d0330f5a1a0c8891d0a7dda9c5b47c6 /plugins/WhenWasIt | |
| parent | 9a177a4e355c52775b580ad5687db2120f9282d5 (diff) | |
mir_tstrncpy <> _tcsncpy
git-svn-id: http://svn.miranda-ng.org/main/trunk@13791 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/WhenWasIt')
| -rw-r--r-- | plugins/WhenWasIt/src/notifiers.cpp | 4 | ||||
| -rw-r--r-- | plugins/WhenWasIt/src/services.cpp | 4 | ||||
| -rw-r--r-- | plugins/WhenWasIt/src/utils.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index 68f2e6fb15..79c518246d 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -35,8 +35,8 @@ void PopupNotifyNoBirthdays() FillPopupData(pd, -1);
pd.lchIcon = GetDTBIcon(-1);
- mir_tstrncpy(pd.lptzContactName, TranslateT("WhenWasIt"), MAX_CONTACTNAME - 1);
- mir_tstrncpy(pd.lptzText, TranslateT("No upcoming birthdays."), MAX_SECONDLINE - 1);
+ _tcsncpy(pd.lptzContactName, TranslateT("WhenWasIt"), MAX_CONTACTNAME - 1);
+ _tcsncpy(pd.lptzText, TranslateT("No upcoming birthdays."), MAX_SECONDLINE - 1);
PUAddPopupT(&pd);
}
diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp index 4eebe0aaa1..79c699d7de 100644 --- a/plugins/WhenWasIt/src/services.cpp +++ b/plugins/WhenWasIt/src/services.cpp @@ -180,8 +180,8 @@ void ShowPopupMessage(TCHAR *title, TCHAR *message, HANDLE icon) {
POPUPDATAT pd = { 0 };
pd.lchIcon = Skin_GetIconByHandle(icon);
- mir_tstrncpy(pd.lptzContactName, title, MAX_CONTACTNAME - 1);
- mir_tstrncpy(pd.lptzText, message, MAX_SECONDLINE - 1);
+ _tcsncpy(pd.lptzContactName, title, MAX_CONTACTNAME - 1);
+ _tcsncpy(pd.lptzText, message, MAX_SECONDLINE - 1);
pd.colorText = commonData.foreground;
pd.colorBack = commonData.background;
PUAddPopupT(&pd);
diff --git a/plugins/WhenWasIt/src/utils.cpp b/plugins/WhenWasIt/src/utils.cpp index 5d78e81a7b..42bf4be905 100644 --- a/plugins/WhenWasIt/src/utils.cpp +++ b/plugins/WhenWasIt/src/utils.cpp @@ -94,14 +94,14 @@ void HexToBin(char *inData, ULONG &size, LPBYTE &outData) {
char buffer[32] = { 0 };
mir_strcpy(buffer, "0x");
- mir_strncpy(buffer + 2, inData, HEX_SIZE);
+ strncpy(buffer + 2, inData, HEX_SIZE);
sscanf(buffer, "%x", &size);
outData = (unsigned char*)new char[size * 2];
char *tmp = inData + HEX_SIZE;
buffer[4] = '\0'; //mark the end of the string
for (UINT i = 0; i < size; i++) {
- mir_strncpy(buffer + 2, &tmp[i * 2], 2);
+ strncpy(buffer + 2, &tmp[i * 2], 2);
sscanf(buffer, "%x", &outData[i]);
}
}
@@ -116,7 +116,7 @@ int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName res = 0;
size_t tmp = mir_strlen(dbv.pszVal);
len = (tmp < size - 1) ? tmp : size - 1;
- mir_strncpy(szResult, dbv.pszVal, len);
+ strncpy(szResult, dbv.pszVal, len);
szResult[len] = '\0';
mir_free(dbv.pszVal);
}
@@ -125,7 +125,7 @@ int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName if (szError) {
size_t tmp = mir_strlen(szError);
len = (tmp < size - 1) ? tmp : size - 1;
- mir_strncpy(szResult, szError, len);
+ strncpy(szResult, szError, len);
szResult[len] = '\0';
}
else szResult[0] = '\0';
|