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

Write empty strings as short empty XML elements.

Browse Source 
For example instead of
<DatabaseName></DatabaseName>
we now write
<DatabaseName/>

Closes #29
This commit is contained in:
Felix Geyer 2012-06-23 15:44:27 +02:00
parent e578ca9a82
commit 513ba6d19d
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/format/KeePass2XmlWriter.cpp
View File

@ -163,6 +163,7 @@ void KeePass2XmlWriter::writeBinaries()
m_xml.writeAttribute("ID", QString::number(i.value())); m_xml.writeAttribute("ID", QString::number(i.value()));
QByteArray data;
if (m_db->compressionAlgo() == Database::CompressionGZip) { if (m_db->compressionAlgo() == Database::CompressionGZip) {
m_xml.writeAttribute("Compressed", "True"); m_xml.writeAttribute("Compressed", "True");
@ -178,12 +179,15 @@ void KeePass2XmlWriter::writeBinaries()
compressor.close(); compressor.close();
buffer.seek(0); buffer.seek(0);
m_xml.writeCharacters(QString::fromAscii(buffer.readAll().toBase64())); data = buffer.readAll();
} }
else { else {
m_xml.writeCharacters(QString::fromAscii(i.key().toBase64())); data = i.key();
} }
if (!data.isEmpty()) {
m_xml.writeCharacters(QString::fromAscii(data.toBase64()));
}
m_xml.writeEndElement(); m_xml.writeEndElement();
} }
@ -342,7 +346,9 @@ void KeePass2XmlWriter::writeEntry(const Entry* entry)
value = entry->attributes()->value(key); value = entry->attributes()->value(key);
} }
m_xml.writeCharacters(value); if (!value.isEmpty()) {
m_xml.writeCharacters(value);
}
m_xml.writeEndElement(); m_xml.writeEndElement();
m_xml.writeEndElement(); m_xml.writeEndElement();
@ -408,7 +414,12 @@ void KeePass2XmlWriter::writeEntryHistory(const Entry* entry)
void KeePass2XmlWriter::writeString(const QString& qualifiedName, const QString& string) void KeePass2XmlWriter::writeString(const QString& qualifiedName, const QString& string)
{ {
m_xml.writeTextElement(qualifiedName, string); if (string.isEmpty()) {
m_xml.writeEmptyElement(qualifiedName);
}
else {
m_xml.writeTextElement(qualifiedName, string);
}
} }
void KeePass2XmlWriter::writeNumber(const QString& qualifiedName, int number) void KeePass2XmlWriter::writeNumber(const QString& qualifiedName, int number)