diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-08-16 12:48:20 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-08-16 12:48:20 +0000 |
| commit | 517890bdff3c0e5bdf9fbdb5894e37b073b16bc5 (patch) | |
| tree | 80dfc06f8ae06a96b32577e8f46b0a3d05d49f8c /plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp | |
| parent | 49fc1a8b9b5858974f90b9d2ed14ba5442c8cbfc (diff) | |
built-in base64 removed from uinfoex
git-svn-id: http://svn.miranda-ng.org/main/trunk@5717 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp')
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index ffbce296e9..6a7851d374 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -454,15 +454,13 @@ LPSTR CExImContactBase::uid2String(BYTE bPrependType) case DBVT_BLOB: //'n' cpbVal and pbVal are valid
{
if (bPrependType) { //True = XML
- INT_PTR baselen = Base64EncodeGetRequiredLength(_dbvUID.cpbVal, BASE64_FLAG_NOCRLF);
+ INT_PTR baselen = mir_base64_encode_bufsize(_dbvUID.cpbVal);
LPSTR t = (LPSTR)mir_alloc(baselen + 5 + bPrependType);
assert(t != NULL);
- if (Base64Encode(_dbvUID.pbVal, _dbvUID.cpbVal, t + bPrependType, &baselen, BASE64_FLAG_NOCRLF)) {
- if (baselen){
- t[baselen + bPrependType] = 0;
- if (bPrependType) t[0] = 'n';
- return t;
- }
+ if ( mir_base64_encodebuf(_dbvUID.pbVal, _dbvUID.cpbVal, t + bPrependType, baselen)) {
+ t[baselen + bPrependType] = 0;
+ if (bPrependType) t[0] = 'n';
+ return t;
}
mir_free(t);
return NULL;
|