Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 152449. Remember the CRC checksum for the updated card info in PatchHistoryTableWithNewID(). r=naving, sr=bienvenu.

Browse Source
This commit is contained in:
cavin%netscape.com 2002-06-17 23:45:10 +00:00
parent 4b02557811
commit d247dadb0e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mailnews/absync/src/nsAbSync.cpp
View File

@ -1603,7 +1603,7 @@ EarlyExit:
}
nsresult
nsAbSync::PatchHistoryTableWithNewID(PRInt32 clientID, PRInt32 serverID, PRInt32 aMultiplier)
nsAbSync::PatchHistoryTableWithNewID(PRInt32 clientID, PRInt32 serverID, PRInt32 aMultiplier, ulong crc)
{
for (PRUint32 i = 0; i < mNewTableSize; i++)
{
@ -1614,6 +1614,9 @@ nsAbSync::PatchHistoryTableWithNewID(PRInt32 clientID, PRInt32 serverID, PRInt32
#endif
mNewSyncMapingTable[i].serverID = serverID;
// Patch CRC if it's not 0.
if (crc)
mNewSyncMapingTable[i].CRC = crc;
return NS_OK;
}
}
@ -1760,7 +1763,7 @@ nsAbSync::ProcessOpReturn()
rv += ExtractInteger(renop, SERVER_OP_RETURN_SID, ' ', &serverID);
if (NS_SUCCEEDED(rv))
{
PatchHistoryTableWithNewID(clientID, serverID, -1);
PatchHistoryTableWithNewID(clientID, serverID, -1, 0);
}
}
}
@ -2809,7 +2812,7 @@ nsAbSync::AddNewUsers()
// fails, then flip the flag to TRUE and have a new record created
// in newSyncRecord
//
if (NS_FAILED(PatchHistoryTableWithNewID(localID, serverID, 1)))
if (NS_FAILED(PatchHistoryTableWithNewID(localID, serverID, 1, GetCRC(tLine))))
isNewCard = PR_TRUE;
}

2
mailnews/absync/src/nsAbSync.h
View File

@ -238,7 +238,7 @@ private:
nsresult ExtractInteger(char *aLine, char *aTag, char aDelim, PRInt32 *aRetVal);
char *ExtractCharacterString(char *aLine, char *aTag, char aDelim);
nsresult PatchHistoryTableWithNewID(PRInt32 clientID, PRInt32 serverID, PRInt32 aMultiplier);
nsresult PatchHistoryTableWithNewID(PRInt32 clientID, PRInt32 serverID, PRInt32 aMultiplier, ulong crc);
nsresult DeleteRecord();
nsresult DeleteList();
nsresult DeleteGroup();