diff options
Diffstat (limited to 'plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp')
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp index 8a7eff65c8..b0272ff998 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp @@ -37,11 +37,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * return TRUE or FALSE
**/
-BYTE IsUSASCII(LPCSTR pBuffer, LPDWORD pcbBuffer)
+uint8_t IsUSASCII(LPCSTR pBuffer, LPDWORD pcbBuffer)
{
- BYTE c;
+ uint8_t c;
uint8_t *s = (uint8_t*)pBuffer;
- BYTE bIsUTF = 0;
+ uint8_t bIsUTF = 0;
if (s == nullptr) return 1;
while ((c = *s++) != 0) {
@@ -97,7 +97,7 @@ CLineBuffer::~CLineBuffer() * return: TRUE if reallocation successful or memoryblock is large enough, FALSE otherwise
**/
-BYTE CLineBuffer::_resizeBuf(const size_t cbReq)
+uint8_t CLineBuffer::_resizeBuf(const size_t cbReq)
{
if (cbReq > _cbVal - _cbUsed) {
if (!(_pVal = (uint8_t*)mir_realloc(_pVal, BLOCKSIZE + _cbVal + 1))) {
@@ -205,7 +205,7 @@ size_t CLineBuffer::operator + (const CHAR cVal) * return: length of the string, added
**/
-size_t CLineBuffer::operator + (const BYTE bVal)
+size_t CLineBuffer::operator + (const uint8_t bVal)
{
size_t cbLength = 3;
@@ -479,7 +479,7 @@ int CLineBuffer::fgetEncoded(FILE *inFile) case '=':
if (_resizeBuf(1)) {
fread(hex, 2, 1, inFile);
- *(_pVal + _cbUsed++) = (BYTE)strtol(hex, nullptr, 16);
+ *(_pVal + _cbUsed++) = (uint8_t)strtol(hex, nullptr, 16);
wAdd++;
}
break;
@@ -716,7 +716,7 @@ size_t CVCardFileVCF::packList(LPIDSTRLIST pList, UINT nList, int iID, size_t *c * return value type
**/
-BYTE CVCardFileVCF::GetSetting(const CHAR *pszModule, const CHAR *pszSetting, DBVARIANT *dbv)
+uint8_t CVCardFileVCF::GetSetting(const CHAR *pszModule, const CHAR *pszSetting, DBVARIANT *dbv)
{
int type = _useUtf8 ? DBVT_UTF8 : DBVT_ASCIIZ;
dbv->pszVal = nullptr;
@@ -779,7 +779,7 @@ size_t CVCardFileVCF::packDB(const CHAR *pszModule, const CHAR *pszSetting, size * return number of bytes, added to the linebuffer
**/
-size_t CVCardFileVCF::packDBList(const CHAR *pszModule, const CHAR *pszSetting, MIRANDASERVICE GetList, BYTE bSigned, size_t *cbRew)
+size_t CVCardFileVCF::packDBList(const CHAR *pszModule, const CHAR *pszSetting, MIRANDASERVICE GetList, uint8_t bSigned, size_t *cbRew)
{
DBVARIANT dbv;
UINT nList;
@@ -880,7 +880,7 @@ void CVCardFileVCF::writeLineEncoded(const CHAR *szSet, size_t *cbRew) * return TRUE or FALSE
**/
-BYTE CVCardFileVCF::Open(MCONTACT hContact, const wchar_t *pszFileName, const wchar_t *pszMode)
+uint8_t CVCardFileVCF::Open(MCONTACT hContact, const wchar_t *pszFileName, const wchar_t *pszMode)
{
if (!(_pFile = _wfopen(pszFileName, pszMode)))
return FALSE;
@@ -916,7 +916,7 @@ void CVCardFileVCF::Close(void) * return TRUE or FALSE
**/
-BYTE CVCardFileVCF::Export(BYTE bExportUtf)
+uint8_t CVCardFileVCF::Export(uint8_t bExportUtf)
{
size_t cbRew = 0;
@@ -1073,7 +1073,7 @@ BYTE CVCardFileVCF::Export(BYTE bExportUtf) // gender
//
{
- BYTE gender = db_get_b(_hContact, USERINFO, SET_CONTACT_GENDER, 0);
+ uint8_t gender = db_get_b(_hContact, USERINFO, SET_CONTACT_GENDER, 0);
if (!gender) gender = db_get_b(_hContact, _pszBaseProto, SET_CONTACT_GENDER, 0);
switch (gender) {
case 'F':
@@ -1171,12 +1171,12 @@ int CVCardFileVCF::readLine(LPSTR szVCFSetting, WORD cchSetting) * return: number of characters read from the file or EOF
**/
-BYTE CVCardFileVCF::Import()
+uint8_t CVCardFileVCF::Import()
{
CHAR szEnt[MAX_PATH];
LPSTR pszParam;
int cbLine;
- BYTE numEmails = 0;
+ uint8_t numEmails = 0;
while (EOF != (cbLine = readLine(szEnt, MAX_PATH))) {
@@ -1237,10 +1237,10 @@ BYTE CVCardFileVCF::Import() db_set_w(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHYEAR, (WORD)strtol(buf, nullptr, 10));
memcpy(buf, _clVal.GetBuffer() + 4, 2);
buf[2] = 0;
- db_set_b(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHMONTH, (BYTE)strtol(buf, nullptr, 10));
+ db_set_b(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHMONTH, (uint8_t)strtol(buf, nullptr, 10));
memcpy(buf, _clVal.GetBuffer() + 6, 2);
buf[2] = 0;
- db_set_b(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHDAY, (BYTE)strtol(buf, nullptr, 10));
+ db_set_b(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHDAY, (uint8_t)strtol(buf, nullptr, 10));
}
}
continue;
|