i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spelling and potential deadlock.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40414 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2011-02-09 22:22:26 +00:00
parent b985151b34
commit a68750c1ac
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
+3 -3
View File
@@ -337,7 +337,7 @@ IMAPInboundProtocol::Connect(const char* server, const char* username,
fStorage.StartReadDatabase(); fStorage.StartReadDatabase();
status = fIMAPMailbox.SelectMailbox(fMailboxName); status = fIMAPMailbox.SelectMailbox(fMailboxName);
if (status != B_OK) { if (status != B_OK) {
fStorage.WaitForDatabaseReaded(); fStorage.WaitForDatabaseRead();
statusMessage = "Failed to select mailbox ("; statusMessage = "Failed to select mailbox (";
statusMessage += fMailboxName; statusMessage += fMailboxName;
statusMessage += "): "; statusMessage += "): ";
@@ -350,14 +350,14 @@ IMAPInboundProtocol::Connect(const char* server, const char* username,
ReportProgress(0, 1, "Fetch message list"); ReportProgress(0, 1, "Fetch message list");
status = fIMAPMailbox.Sync(); status = fIMAPMailbox.Sync();
if (status != B_OK) { if (status != B_OK) {
fStorage.WaitForDatabaseReaded(); fStorage.WaitForDatabaseRead();
ShowError("Failed to sync mailbox"); ShowError("Failed to sync mailbox");
ResetProgress(); ResetProgress();
return status; return status;
} }
ReportProgress(0, 1, "Read local message list"); ReportProgress(0, 1, "Read local message list");
status = fStorage.WaitForDatabaseReaded(); status = fStorage.WaitForDatabaseRead();
if (status != B_OK) { if (status != B_OK) {
ShowError("Can't read database"); ShowError("Can't read database");
ResetProgress(); ResetProgress();
src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
+1 -3
View File
@@ -25,8 +25,6 @@
status_t status_t
IMAPMailboxSync::Sync(IMAPStorage& storage, IMAPMailbox& mailbox) IMAPMailboxSync::Sync(IMAPStorage& storage, IMAPMailbox& mailbox)
{ {
storage.WaitForDatabaseReaded();
const MailEntryMap& files = storage.GetFiles(); const MailEntryMap& files = storage.GetFiles();
const MinMessageList& messages = mailbox.GetMessageList(); const MinMessageList& messages = mailbox.GetMessageList();
@@ -151,7 +149,7 @@ IMAPStorage::StartReadDatabase()
status_t status_t
IMAPStorage::WaitForDatabaseReaded() IMAPStorage::WaitForDatabaseRead()
{ {
// just wait for thread // just wait for thread
if (acquire_sem(fLoadDatabaseLock) != B_OK) if (acquire_sem(fLoadDatabaseLock) != B_OK)
src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.h
+1 -1
View File
@@ -52,7 +52,7 @@ public:
void SetTo(const char* dir); void SetTo(const char* dir);
status_t StartReadDatabase(); status_t StartReadDatabase();
status_t WaitForDatabaseReaded(); status_t WaitForDatabaseRead();
status_t AddNewMessage(int32 uid, int32 flags, status_t AddNewMessage(int32 uid, int32 flags,
BPositionIO** file = NULL); BPositionIO** file = NULL);