diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-07-10 16:59:27 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-07-10 16:59:27 +0000 |
| commit | 2329457a8658926ceae20cf6ff883b24965e052f (patch) | |
| tree | 66e7fa2652f1c6af7c742e52b2bba0f2fe4cbfb7 /plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp | |
| parent | 18170fc2601f90dd8d1b39feae78fcafeb978332 (diff) | |
UserInfoEx:
-Cleanup
git-svn-id: http://svn.miranda-ng.org/main/trunk@14525 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp')
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp index fb0a8ad16e..73322070da 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp @@ -439,7 +439,7 @@ void CLineBuffer::fputEncoded(FILE *outFile) **/
int CLineBuffer::fgetEncoded(FILE *inFile)
{
- CHAR c;
+ int c;
CHAR hex[3];
WORD wAdd = 0;
@@ -654,6 +654,7 @@ CVCardFileVCF::CVCardFileVCF() _pszBaseProto = NULL;
_hasUtf8 = 0;
_useUtf8 = FALSE;
+ _cbRew = 0;
}
/**
@@ -1115,16 +1116,18 @@ BYTE CVCardFileVCF::Export(BYTE bExportUtf) int CVCardFileVCF::readLine(LPSTR szVCFSetting, WORD cchSetting)
{
LPSTR here;
-
+ int c;
+
// read setting (size is never larger than MAX_SETTING, error otherwise!)
- for (here = szVCFSetting; here - szVCFSetting < cchSetting && EOF != (*here = fgetc(_pFile)); here++) {
+ for (here = szVCFSetting; here - szVCFSetting < cchSetting && EOF != (c = fgetc(_pFile)); here++) {
// end of the setting string
- if (*here == ':') {
+ if (c == ':') {
*here = 0;
break;
}
+ *here = c;
// end of line before value?
- if (*here == '\n')
+ if (c == '\n')
return 0;
}
// ignore line if setting was not read correctly
|