Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-05-10 02:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Return Q_NULLPTR instead of 0 when the return type is a pointer.

Browse source
This commit is contained in:
Felix Geyer 2012-07-23 14:58:57 +02:00
parent fcc936ceff
commit ecea101962
12 changed files with 67 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/format/KeePass2Reader.cpp
View file

@ -50,20 +50,20 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke
quint32 signature1 = Endian::readUInt32(m_device, KeePass2::BYTEORDER, &ok);
if (!ok || signature1 != KeePass2::SIGNATURE_1) {
raiseError(tr("Not a KeePass database."));
return 0;
return Q_NULLPTR;
}
quint32 signature2 = Endian::readUInt32(m_device, KeePass2::BYTEORDER, &ok);
if (!ok || signature2 != KeePass2::SIGNATURE_2) {
raiseError(tr("Not a KeePass database."));
return 0;
return Q_NULLPTR;
}
quint32 version = Endian::readUInt32(m_device, KeePass2::BYTEORDER, &ok) & KeePass2::FILE_VERSION_CRITICAL_MASK;
quint32 maxVersion = KeePass2::FILE_VERSION & KeePass2::FILE_VERSION_CRITICAL_MASK;
if (!ok || (version < KeePass2::FILE_VERSION_MIN) || (version > maxVersion)) {
raiseError(tr("Unsupported KeePass database version."));
return 0;
return Q_NULLPTR;
}
while (readHeaderField() && !hasError()) {
@ -86,7 +86,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke
if (realStart != m_streamStartBytes) {
raiseError(tr("Wrong key or database file is corrupt."));
return 0;
return Q_NULLPTR;
}
HashedBlockStream hashedStream(&cipherStream);
@ -121,7 +121,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke
if (xmlReader.hasError()) {
raiseError(xmlReader.errorString());
return 0;
return Q_NULLPTR;
}
return db.take();
@ -132,14 +132,14 @@ Database* KeePass2Reader::readDatabase(const QString& filename, const CompositeK
QFile file(filename);
if (!file.open(QFile::ReadOnly)) {
raiseError(file.errorString());
return 0;
return Q_NULLPTR;
}
QScopedPointer<Database> db(readDatabase(&file, key));
if (file.error() != QFile::NoError) {
raiseError(file.errorString());
return 0;
return Q_NULLPTR;
}
return db.take();