SF.net SVN: mahogany:[7528] trunk/M/src
[email protected] Thu, 07 Aug 2008 18:25:49 +0000
| Newsgroups | gmane.mail.mahogany.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 7528
http://mahogany.svn.sourceforge.net/mahogany/?rev=7528&view=rev
Author: nerijus
Date: 2008-08-07 18:25:47 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
fixing warning: suggest explicit braces to avoid ambiguous 'else'
Modified Paths:
--------------
trunk/M/src/mail/MailFolderCmn.cpp
trunk/M/src/util/sysutil.cpp
Modified: trunk/M/src/mail/MailFolderCmn.cpp
===================================================================
--- trunk/M/src/mail/MailFolderCmn.cpp 2008-08-06 23:25:17 UTC (rev 7527)
+++ trunk/M/src/mail/MailFolderCmn.cpp 2008-08-07 18:25:47 UTC (rev 7528)
@@ -2194,6 +2194,7 @@
} \
else if ( (!wasDeleted && msgStatusOld.what) && \
(isDeleted || !msgStatusNew.what) ) \
+ { \
if ( status.what > 0 ) \
{ \
wxLogTrace(M_TRACE_MFSTATUS, "%s: " #what "-- (now %lu)", \
@@ -2201,7 +2202,8 @@
status.what--; \
} \
else \
- FAIL_MSG( _T("error in msg status change logic") )
+ FAIL_MSG( _T("error in msg status change logic") ); \
+ }
UPDATE_NUM_OF(recent);
UPDATE_NUM_OF(unread);
Modified: trunk/M/src/util/sysutil.cpp
===================================================================
--- trunk/M/src/util/sysutil.cpp 2008-08-06 23:25:17 UTC (rev 7527)
+++ trunk/M/src/util/sysutil.cpp 2008-08-07 18:25:47 UTC (rev 7528)
@@ -38,6 +38,7 @@
rc = wxStat(file1, &statbuf1);
if(rc != 0)
+ {
if(rc == ENOENT)
{
// using all flags but x, will be modified by umask anyway
@@ -52,9 +53,11 @@
}
else
return strutil_compare_filenames(file1, file2);
+ }
rc = wxStat(file2, &statbuf2);
if(rc != 0)
+ {
if(rc == ENOENT)
{
// using all flags but x, will be modified by umask anyway
@@ -69,6 +72,7 @@
}
else
return strutil_compare_filenames(file1, file2);
+ }
return
statbuf1.st_dev == statbuf2.st_dev // same device
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/