From 517890bdff3c0e5bdf9fbdb5894e37b073b16bc5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 16 Aug 2013 12:48:20 +0000 Subject: built-in base64 removed from uinfoex git-svn-id: http://svn.miranda-ng.org/main/trunk@5717 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp') 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; -- cgit v1.2.3