Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

64 bit compatibility #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

64 bit compatibility #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c97f2c3
64 bit compatibility
nxdefiant Mar 21, 2022
bcab842
64 bit compatibility
nxdefiant Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/CMulticalendar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,8 +632,7 @@ bool CMulticalendar::getRecurrentTimes(string szRRule,
*/
//icaltimezone* pTz = 0;
//icaltimezone* pTz = CMulticalendar::getSystemTimeZoneAsIcalTimeZone();
unsigned int pos = 0;
pos = szRRule.find(UNTIL_ICAL,0);
size_t pos = szRRule.find(UNTIL_ICAL,0);
if(pos != string::npos)
{
/* Find the six zeros and then substitute them with
Expand Down Expand Up @@ -706,8 +705,7 @@ time_t CMulticalendar::getInstanceBeyond(string szRRule,
bool loopexit = false;
bool instanceIndicator = false;

unsigned int pos = 0;
pos = szRRule.find(UNTIL_ICAL,0);
size_t pos = szRRule.find(UNTIL_ICAL,0);
if(pos != string::npos)
{
/* Find the six zeros and then substitute them with
Expand Down Expand Up @@ -4060,7 +4058,7 @@ bool CMulticalendar::getICSFileInfoProgressive(string szFileName,
pErrorCode = CALENDAR_OPERATION_SUCCESSFUL;
string stemp("file://");
ifstream ics_file_stream;
unsigned int iDummy = 0;
size_t iDummy = 0;
bool bIsFirstRead = false;

if(iFileOffset == 0) {
Expand Down Expand Up @@ -4326,7 +4324,7 @@ bool CMulticalendar::importIcsFileData(string szFileName, int iCalId,
iDuplicateCountJournal = 0;

pErrorCode = CALENDAR_OPERATION_SUCCESSFUL;
unsigned int iDummy;
size_t iDummy;
string stemp(ICS_FILENAME_SEPERATOR);

iDummy = szFileName.find(stemp);
Expand Down Expand Up @@ -4452,7 +4450,7 @@ bool CMulticalendar::importIcsFileDataProgressive(string szFileName, int iCalId,
iDuplicateCountJournal = 0;

pErrorCode = CALENDAR_OPERATION_SUCCESSFUL;
unsigned int iDummy;
size_t iDummy;
string stemp(ICS_FILENAME_SEPERATOR);

iDummy = szFileName.find(stemp);
Expand Down Expand Up @@ -6299,8 +6297,7 @@ time_t CMulticalendar::getSystemTimeShift()
icaltimezone* CMulticalendar::getSystemTimeZoneAsIcalTimeZone()
{
string szZone(getSystemTimeZone());
unsigned int i = 0;
i = szZone.find(":",0);
size_t i = szZone.find(":",0);

if(i != string::npos)
szZone = szZone.substr(i+1);
Expand Down
3 changes: 1 addition & 2 deletions src/CParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ int CParameters::getDataType(string szPropParam)


/* Default type for all X -param and Prop is STRING */
int found;
found = szPropParam.find("X-", 0);
size_t found = szPropParam.find("X-", 0);

if (found != (int)string::npos)
return STRING;
Expand Down
3 changes: 1 addition & 2 deletions src/CProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ int CProperties::getDataType(string szProp)
return STRING;

/* Default type for all X -param and Prop is STRING */
int found;
found = szProp.find("X-", 0);
size_t found = szProp.find("X-", 0);

if (found != (int)string::npos)
return STRING;
Expand Down
5 changes: 2 additions & 3 deletions src/CUtility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ std::vector < time_t > CUtility::getRecurrentTimes(string szRRule,
time_t utc_tim = 0;
vector < time_t > listtime;
bool loopexit = false;
unsigned int pos = 0;
pos = szRRule.find(UNTIL_ICAL,0);
size_t pos = szRRule.find(UNTIL_ICAL,0);
if(pos != string::npos)
{
/* Find the six zeros and then substitute them with
Expand Down Expand Up @@ -234,7 +233,7 @@ void CUtility::releasePropertiesVector(std::vector < CProperties * > vec)
icaltimezone* CUtility::getSystemTimeZoneAsIcalTimeZone()
{
string szZone(getSystemTimeZone());
unsigned int i = 0;
size_t i = 0;

if((i = szZone.find(":",0)) != string::npos)
szZone = szZone.substr(i+1);
Expand Down
4 changes: 2 additions & 2 deletions src/ICalConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ string ICalConverter::appendControlM(string szContents)
std::istringstream iss(szContents);
while (getline(iss, szLine)) {

unsigned int loc = szLine.length();
size_t loc = szLine.length();

if (loc != 0) {
szLine = szLine + "\r";
Expand Down Expand Up @@ -2861,7 +2861,7 @@ vector < string > ICalConverter::getRecurrenceDates(string strIcalComp,
break;
}
if (strIcalComp.find(strRuleType) != string::npos ) {
unsigned int sPos = 0;
size_t sPos = 0;
int count = 0;
while ((sPos =
strIcalComp.find(strRuleType, sPos)) != string::npos) {
Expand Down