sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(read_binary_amount): If the commodity ident is zero,

Browse source 
it is an explicit reference to commodity_t::null_commodity.
(write_binary_journal): Initialize account_index and
commodity_index to zero before writing.
(write_binary_journal): Set the "ident" field of the
null_commodity to 0, so that read_binary_amount can recognize it.
This commit is contained in:
John Wiegley 2005-01-07 04:39:35 +00:00
parent a69bddcf2a
commit 9403113c59
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
binary.cc
View file

@ -168,6 +168,8 @@ inline void read_binary_amount(char *& data, amount_t& amt)
read_binary_number(data, ident); read_binary_number(data, ident);
if (ident == 0xffffffff) if (ident == 0xffffffff)
amt.commodity_ = NULL; amt.commodity_ = NULL;
else if (ident == 0)
amt.commodity_ = commodity_t::null_commodity;
else else
amt.commodity_ = commodities[ident - 1]; amt.commodity_ = commodities[ident - 1];
@ -628,6 +630,9 @@ void write_binary_account(std::ostream& out, account_t * account)
void write_binary_journal(std::ostream& out, journal_t * journal, void write_binary_journal(std::ostream& out, journal_t * journal,
strings_list * files) strings_list * files)
{ {
account_index =
commodity_index = 0;
write_binary_number(out, binary_magic_number); write_binary_number(out, binary_magic_number);
write_binary_number(out, format_version); write_binary_number(out, format_version);
@ -678,6 +683,8 @@ void write_binary_journal(std::ostream& out, journal_t * journal,
i++) i++)
if (! (*i).first.empty()) if (! (*i).first.empty())
write_binary_commodity(out, (*i).second); write_binary_commodity(out, (*i).second);
else
(*i).second->ident = 0;
for (commodities_map::const_iterator i = commodity_t::commodities.begin(); for (commodities_map::const_iterator i = commodity_t::commodities.begin();
i != commodity_t::commodities.end(); i != commodity_t::commodities.end();