[haiku-commits] r33443 - haiku/trunk/src/bin/mail_utils

From: axeld@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Mon, 5 Oct 2009 16:18:32 +0200 (CEST)
Author: axeld
Date: 2009-10-05 16:18:32 +0200 (Mon, 05 Oct 2009)
New Revision: 33443
Changeset: http://dev.haiku-os.org/changeset/33443/haiku

Modified:
   haiku/trunk/src/bin/mail_utils/mail2mbox.cpp
Log:
* Build fix... sorry, I could have sworn I compiled it before committing.


Modified: haiku/trunk/src/bin/mail_utils/mail2mbox.cpp
===================================================================
--- haiku/trunk/src/bin/mail_utils/mail2mbox.cpp        2009-10-05 13:38:27 UTC 
(rev 33442)
+++ haiku/trunk/src/bin/mail_utils/mail2mbox.cpp        2009-10-05 14:18:32 UTC 
(rev 33443)
@@ -57,7 +57,7 @@
        if (errorNumber != 0) {
                snprintf(errorBuffer, sizeof(errorBuffer), "%s: %s (%lx)"
                        "has occured.", messageString, strerror(errorNumber), 
errorNumber);
-               messageString = ErrorBuffer;
+               messageString = errorBuffer;
        }
 
        fputs(titleString, stderr);
@@ -86,7 +86,7 @@
 IsStartOfMailMessage(char* lineString)
 {
        // It starts with "From "
-       if (memcmp("From ", LineString, 5) != 0)
+       if (memcmp("From ", lineString, 5) != 0)
                return false;
 
        char* string = lineString + 4;
@@ -226,7 +226,6 @@
 
        // Extract a text message from the Mail file.
 
-       status_t status = B_ERROR;
        BString messageText;
        int lineNumber = 0;
 
@@ -239,8 +238,8 @@
                                snprintf(errorString, sizeof(errorString),
                                        "Error while reading from \"%s\"", 
fileName);
                                DisplayErrorMessage(errorString, errno);
-                               status = errno;
-                               goto out;
+                               fclose(inputFile);
+                               return errno;
                        }
                        break;
                                // No error, just end of file.
@@ -284,13 +283,14 @@
        messageText.Append("\n\n");
 
        // Write the message out.
+
+       status_t status = B_OK;
+
        if (puts(messageText.String()) < 0) {
                DisplayErrorMessage ("Error while writing the message", errno);
                status = errno;
-       } else
-               status = B_OK;
+       }
 
-out:
        fclose(inputFile);
        return status;
 }
@@ -330,7 +330,7 @@
        }
 
        // Append a trailing slash to the directory name, if it needs one.
-       if (inputPathName[strlen(InputPathName) - 1] != '/')
+       if (inputPathName[strlen(inputPathName) - 1] != '/')
                strcat(inputPathName, "/");
 
        int messagesDoneCount = 0;
@@ -342,7 +342,7 @@
                        break;
 
                strlcpy(tempString, inputPathName, sizeof(tempString));
-               strlcat(tempString, entry->d_name, , sizeof(tempString));
+               strlcat(tempString, entry->d_name, sizeof(tempString));
 
                status = ProcessMessageFile(tempString);
                if (status != B_OK)
@@ -355,7 +355,7 @@
 
        if (status != B_OK) {
                DisplayErrorMessage("Stopping early because an error occured", 
status);
-               return ErrorCode;
+               return status;
        }
 
        fprintf(stderr, "Did %d messages successfully.\n", messagesDoneCount);
[haiku-commits] r33443 - haiku/trunk/src/bin/mail_utils

Other related posts:
