summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-03-12 18:52:35 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-03-12 18:52:35 (GMT)
commit82ee11f5fc5be88baad3e3c7b626b078bda5d915 (patch)
treebbc295fb09be078361d77e74c8b577e33469148c /Swiften
parent66ac08ab9a3e323e5257fffebe13aa1ee83f147e (diff)
downloadswift-contrib-82ee11f5fc5be88baad3e3c7b626b078bda5d915.zip
swift-contrib-82ee11f5fc5be88baad3e3c7b626b078bda5d915.tar.bz2
Avoid warning on end of file in cache files.swift-1.0beta9
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Avatars/AvatarFileStorage.cpp4
-rw-r--r--Swiften/VCards/VCardFileStorage.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Avatars/AvatarFileStorage.cpp b/Swiften/Avatars/AvatarFileStorage.cpp
index 62dfdf6..4f76c80 100644
--- a/Swiften/Avatars/AvatarFileStorage.cpp
+++ b/Swiften/Avatars/AvatarFileStorage.cpp
@@ -29,8 +29,8 @@ AvatarFileStorage::AvatarFileStorage(const boost::filesystem::path& avatarsDir,
if (jid.isValid()) {
jidAvatars.insert(std::make_pair(jid, r.first));
}
- else {
- std::cerr << "Invalid entry in avatars file" << std::endl;
+ else if (!r.first.empty() || !r.second.empty()) {
+ std::cerr << "Invalid entry in avatars file: " << r.second << std::endl;
}
}
}
diff --git a/Swiften/VCards/VCardFileStorage.cpp b/Swiften/VCards/VCardFileStorage.cpp
index db189ff..a246838 100644
--- a/Swiften/VCards/VCardFileStorage.cpp
+++ b/Swiften/VCards/VCardFileStorage.cpp
@@ -35,7 +35,7 @@ VCardFileStorage::VCardFileStorage(boost::filesystem::path dir) : vcardsPath(dir
if (jid.isValid()) {
photoHashes.insert(std::make_pair(jid, r.first));
}
- else {
+ else if (!r.first.empty() || !r.second.empty()) {
std::cerr << "Invalid entry in phashes file" << std::endl;
}
}