[haiku-commits] r40414 - in haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap: . imap_lib

  • From: clemens.zeidler@xxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 9 Feb 2011 23:22:26 +0100 (CET)

Author: czeidler
Date: 2011-02-09 23:22:26 +0100 (Wed, 09 Feb 2011)
New Revision: 40414
Changeset: http://dev.haiku-os.org/changeset/40414

Modified:
   
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
   
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
   
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.h
Log:
Fix spelling and potential deadlock.



Modified: 
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
===================================================================
--- 
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
  2011-02-09 22:17:54 UTC (rev 40413)
+++ 
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
  2011-02-09 22:22:26 UTC (rev 40414)
@@ -337,7 +337,7 @@
        fStorage.StartReadDatabase();
        status = fIMAPMailbox.SelectMailbox(fMailboxName);
        if (status != B_OK) {
-               fStorage.WaitForDatabaseReaded();
+               fStorage.WaitForDatabaseRead();
                statusMessage = "Failed to select mailbox (";
                statusMessage += fMailboxName;
                statusMessage += "): ";
@@ -350,14 +350,14 @@
        ReportProgress(0, 1, "Fetch message list");
        status = fIMAPMailbox.Sync();
        if (status != B_OK) {
-               fStorage.WaitForDatabaseReaded();
+               fStorage.WaitForDatabaseRead();
                ShowError("Failed to sync mailbox");
                ResetProgress();
                return status;
        }
 
        ReportProgress(0, 1, "Read local message list");
-       status = fStorage.WaitForDatabaseReaded();
+       status = fStorage.WaitForDatabaseRead();
        if (status != B_OK) {
                ShowError("Can't read database");
                ResetProgress();

Modified: 
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
===================================================================
--- 
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
 2011-02-09 22:17:54 UTC (rev 40413)
+++ 
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
 2011-02-09 22:22:26 UTC (rev 40414)
@@ -25,8 +25,6 @@
 status_t
 IMAPMailboxSync::Sync(IMAPStorage& storage, IMAPMailbox& mailbox)
 {
-       storage.WaitForDatabaseReaded();
-
        const MailEntryMap& files = storage.GetFiles();
        const MinMessageList& messages = mailbox.GetMessageList();
 
@@ -151,7 +149,7 @@
 
 
 status_t
-IMAPStorage::WaitForDatabaseReaded()
+IMAPStorage::WaitForDatabaseRead()
 {
        // just wait for thread
        if (acquire_sem(fLoadDatabaseLock) != B_OK)

Modified: 
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.h
===================================================================
--- 
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.h
   2011-02-09 22:17:54 UTC (rev 40413)
+++ 
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.h
   2011-02-09 22:22:26 UTC (rev 40414)
@@ -52,7 +52,7 @@
                        void                            SetTo(const char* dir);
 
                        status_t                        StartReadDatabase();
-                       status_t                        WaitForDatabaseReaded();
+                       status_t                        WaitForDatabaseRead();
 
                        status_t                        AddNewMessage(int32 
uid, int32 flags,
                                                                        
BPositionIO** file = NULL);


Other related posts:

  • » [haiku-commits] r40414 - in haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap: . imap_lib - clemens . zeidler