2 commits - src/objectvalidation.cpp tztable.h

[Christian Mollekopf]

 src/objectvalidation.cpp |   16 ++++++++--------
 tztable.h                |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 8d558ddfb088f817773d0aa214d047bbbf8fcede
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Thu Feb 27 14:50:09 2014 +0100

    Fixed warnings.

diff --git a/src/objectvalidation.cpp b/src/objectvalidation.cpp
index 8ea0a04..cd3a104 100644
--- a/src/objectvalidation.cpp
+++ b/src/objectvalidation.cpp
@@ -31,7 +31,7 @@ namespace Kolab {
 
 static boost::unordered_set<std::string> initializeTzSet() {
     boost::unordered_set<std::string> set;
-    for (int i = 0; i < numOlsonTimezones; i++) {
+    for (unsigned int i = 0; i < numOlsonTimezones; i++) {
         set.insert(olsonTimezones[i]);
     }
     return set;
@@ -110,32 +110,32 @@ void validate(const Journal& journal)
     ASSERTVALID(journal.start());
 }
 
-void validate(const Contact& contact)
+void validate(const Contact& /* contact */)
 {
 
 }
 
-void validate(const DistList& distlist)
+void validate(const DistList& /* distlist */)
 {
 
 }
 
-void validate(const Freebusy& freebusy)
+void validate(const Freebusy& /* freebusy */)
 {
 
 }
 
-void validate(const Note& note)
+void validate(const Note& /* note */)
 {
 
 }
 
-void validate(const Configuration& configuration)
+void validate(const Configuration& /* configuration */)
 {
 
 }
 
-void validate(const File& file)
+void validate(const File& /* file */)
 {
 
 }
diff --git a/tztable.h b/tztable.h
index f59eb1a..2b788c9 100644
--- a/tztable.h
+++ b/tztable.h
@@ -420,5 +420,5 @@ static const char* olsonTimezones[] = {
     "Africa/Harare"
 };
 
-static const int numOlsonTimezones = sizeof olsonTimezones / sizeof *olsonTimezones;
+static const long unsigned int numOlsonTimezones = sizeof olsonTimezones / sizeof *olsonTimezones;
 


commit 21e14ad482ed1de9f8e8b8419562bd82d7f8d6b8
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Thu Feb 27 14:46:23 2014 +0100

    Print the invalid timezone as part of the error message.

diff --git a/src/objectvalidation.cpp b/src/objectvalidation.cpp
index e6a1464..8ea0a04 100644
--- a/src/objectvalidation.cpp
+++ b/src/objectvalidation.cpp
@@ -51,7 +51,7 @@ bool isValid(const cDateTime &datetime)
             return false;
         }
         if (tzSet.find(tz) == tzSet.end()) {
-            Utils::logMessage("not a valid olson timezone.", "", 0, Error);
+            Utils::logMessage("Not a valid olson timezone: " + tz, "", 0, Error);
             return false;
         }
     }