Skip to content

ostream and stringFormat simplifications #3298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

ostream and stringFormat simplifications #3298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59971d1
convert some ostreams to stringFormat
neheb Jun 26, 2025
e11540c
replace templated prints with macros
neheb Jun 26, 2025
9b9d5a6
nikomn: simplify by returning os directly
neheb Jun 26, 2025
2750eec
sonymn: return by ostream
neheb Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/datasets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,14 +579,8 @@ void IptcKey::makeKey() {
// free functions

std::ostream& operator<<(std::ostream& os, const DataSet& dataSet) {
std::ios::fmtflags f(os.flags());
IptcKey iptcKey(dataSet.number_, dataSet.recordId_);
os << dataSet.name_ << ", " << std::dec << dataSet.number_ << ", "
<< "0x" << std::setw(4) << std::setfill('0') << std::right << std::hex << dataSet.number_ << ", "
<< IptcDataSets::recordName(dataSet.recordId_) << ", " << std::boolalpha << dataSet.mandatory_ << ", "
<< dataSet.repeatable_ << ", " << std::dec << dataSet.minbytes_ << ", " << dataSet.maxbytes_ << ", "
<< iptcKey.key() << ", " << TypeInfo::typeName(IptcDataSets::dataSetType(dataSet.number_, dataSet.recordId_))
<< ", ";

// CSV encoded I am \"dead\" beat" => "I am ""dead"" beat"
std::string escapedDesc;
escapedDesc.push_back('"');
Expand All @@ -597,9 +591,12 @@ std::ostream& operator<<(std::ostream& os, const DataSet& dataSet) {
escapedDesc.push_back(c);
}
escapedDesc.push_back('"');
os << escapedDesc;
os.flags(f);
return os;

return os << stringFormat(
"{}, {}, 0x{:04x}, {}, {}, {}, {}, {}, {}, {}, {}", dataSet.name_, dataSet.number_, dataSet.number_,
IptcDataSets::recordName(dataSet.recordId_), dataSet.mandatory_ ? "true" : "false",
dataSet.repeatable_ ? "true" : "false", dataSet.minbytes_, dataSet.maxbytes_, iptcKey.key(),
TypeInfo::typeName(IptcDataSets::dataSetType(dataSet.number_, dataSet.recordId_)), escapedDesc);
}

} // namespace Exiv2
Loading
Loading