Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This fixes a bug and two warnings:

Browse Source 
- pending_chain was set to -1, then MAIL:pending_chain was read into the variable "chain",
  but later pending_chain was used again for comparison - and if that was not enough,
  "chain" was later used again as well... (Nathan please check this)
- pending_chain was int32, Chain()->ID() uint32
- renamed pending_chain to pendingChain


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12323 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-04-12 03:49:59 +00:00
parent 8962594050
commit 79de26ad08
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/kits/mail/RemoteStorageProtocol.cpp
View File

@ -333,14 +333,18 @@ void BRemoteMailStorageProtocol::SyncMailbox(const char *mailbox) {
if (snoodle.ReadAttr("MAIL:chain",B_INT32_TYPE,0,&chain,sizeof(chain)) < B_OK)
append = true;
if (chain != runner->Chain()->ID()) {
int32 pending_chain(-1), flags(0);
snoodle.ReadAttr("MAIL:pending_chain",B_INT32_TYPE,0,&chain,sizeof(chain));
uint32 pendingChain(~0UL), flags(0);
snoodle.ReadAttr("MAIL:pending_chain",B_INT32_TYPE,0,&pendingChain,sizeof(chain));
snoodle.ReadAttr("MAIL:flags",B_INT32_TYPE,0,&flags,sizeof(flags));
if ((pending_chain == runner->Chain()->ID()) && (BMailChain(chain).ChainDirection() == outbound) && (flags & B_MAIL_PENDING))
continue; //--- Ignore this message, recode the chain attribute at the next SyncMailbox()
if (pending_chain == runner->Chain()->ID()) {
if (pendingChain == runner->Chain()->ID()
&& BMailChain(chain).ChainDirection() == outbound
&& (flags & B_MAIL_PENDING) != 0) {
// Ignore this message, recode the chain attribute at the next SyncMailbox()
continue;
}
if (pendingChain == runner->Chain()->ID()) {
chain = runner->Chain()->ID();
snoodle.WriteAttr("MAIL:chain",B_INT32_TYPE,0,&chain,sizeof(chain));
append = false;