lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Replace newlines in table output with spaces.

Browse source
This commit is contained in:
Eelco Dolstra 2009-07-02 08:52:12 +00:00
parent 749dd97a54
commit c6890d6b5c
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nix-env/nix-env.cc
View file

@ -930,7 +930,7 @@ void printTable(Table & table)
vector<unsigned int> widths; vector<unsigned int> widths;
widths.resize(nrColumns); widths.resize(nrColumns);
for (Table::iterator i = table.begin(); i != table.end(); ++i) { foreach (Table::iterator, i, table) {
assert(i->size() == nrColumns); assert(i->size() == nrColumns);
Strings::iterator j; Strings::iterator j;
unsigned int column; unsigned int column;
@ -938,14 +938,15 @@ void printTable(Table & table)
if (j->size() > widths[column]) widths[column] = j->size(); if (j->size() > widths[column]) widths[column] = j->size();
} }
for (Table::iterator i = table.begin(); i != table.end(); ++i) { foreach (Table::iterator, i, table) {
Strings::iterator j; Strings::iterator j;
unsigned int column; unsigned int column;
for (j = i->begin(), column = 0; j != i->end(); ++j, ++column) for (j = i->begin(), column = 0; j != i->end(); ++j, ++column) {
{ string s = *j;
cout << *j; replace(s.begin(), s.end(), '\n', ' ');
cout << s;
if (column < nrColumns - 1) if (column < nrColumns - 1)
cout << string(widths[column] - j->size() + 2, ' '); cout << string(widths[column] - s.size() + 2, ' ');
} }
cout << std::endl; cout << std::endl;
} }