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/MirOTR/src | |
| 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/MirOTR/src')
| -rw-r--r-- | plugins/MirOTR/src/dbfilter.cpp | 6 | ||||
| -rw-r--r-- | plugins/MirOTR/src/striphtml.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirOTR/src/utils.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/src/dbfilter.cpp index 55ca91add0..b3078c0c8d 100644 --- a/plugins/MirOTR/src/dbfilter.cpp +++ b/plugins/MirOTR/src/dbfilter.cpp @@ -90,7 +90,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam) newmsg = (char*)mir_alloc(alloclen); memset(newmsg, 0, alloclen+datalen); - mir_strncpy(newmsg, options.prefix, prefixlen); + strncpy(newmsg, options.prefix, prefixlen); mir_strncat(newmsg, msg, alloclen - mir_strlen(newmsg)); // append additional data if (datalen) { @@ -129,7 +129,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam) newmsg = (char*)mir_alloc(alloclen+datalen); memset(newmsg, 0, alloclen+datalen); - mir_strncpy(newmsg, prefix, prefixlen); + strncpy(newmsg, prefix, prefixlen); mir_strncat(newmsg, msg, alloclen + datalen - mir_strlen(newmsg)); wchar_t *p = (wchar_t*) newmsg + (msglen + prefixlen + 1); wcsncpy(p, prefixw, prefixlenw); @@ -157,7 +157,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam) newmsg = (char*)mir_alloc(alloclen+datalen); memset(newmsg, 0, alloclen+datalen); - mir_strncpy(newmsg, prefix, prefixlen); + strncpy(newmsg, prefix, prefixlen); mir_strncat(newmsg, msg, msglen - mir_strlen(newmsg)); mir_free(prefix); // append additional data diff --git a/plugins/MirOTR/src/striphtml.cpp b/plugins/MirOTR/src/striphtml.cpp index 58f57c0c87..a7d84b69c4 100644 --- a/plugins/MirOTR/src/striphtml.cpp +++ b/plugins/MirOTR/src/striphtml.cpp @@ -9,7 +9,7 @@ void starttag_cb (void *cbdata, ekhtml_string_t *tag, ekhtml_attr_t *attrs) { case 'A':
for(ekhtml_attr_t *attr=attrs; attr; attr=attr->next) {
if (_strnicmp(attr->name.str, "href", attr->name.len)==0) {
- data->stack.push(mir_strncpy((char*)mir_calloc(attr->val.len+1), attr->val.str, attr->val.len));
+ data->stack.push(strncpy((char*)mir_calloc(attr->val.len+1), attr->val.str, attr->val.len));
break;
}
}
diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp index 9d59edd5ab..5e9715e256 100644 --- a/plugins/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/src/utils.cpp @@ -184,12 +184,12 @@ void ShowPopup(const TCHAR* line1, const TCHAR* line2, int timeout, const MCONTA ppd.lchIcon = NULL; if(line1 && line2) { - mir_tstrncpy( ppd.lptzContactName, line1, MAX_CONTACTNAME-1 ); - mir_tstrncpy( ppd.lptzText, line2, MAX_SECONDLINE-1 ); + _tcsncpy( ppd.lptzContactName, line1, MAX_CONTACTNAME-1 ); + _tcsncpy( ppd.lptzText, line2, MAX_SECONDLINE-1 ); } else if(line1) - mir_tstrncpy( ppd.lptzText, line1, MAX_SECONDLINE-1 ); + _tcsncpy( ppd.lptzText, line1, MAX_SECONDLINE-1 ); else if(line2) - mir_tstrncpy( ppd.lptzText, line2, MAX_SECONDLINE-1 ); + _tcsncpy( ppd.lptzText, line2, MAX_SECONDLINE-1 ); ppd.iSeconds = timeout; |