RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

buffer: add no-newline hexdump option

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-05-20 10:28:52 -04:00
parent 7f6174e9d6
commit 46522cf0d2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/buffer.cc
View File

@ -2339,7 +2339,7 @@ void buffer::list::write_stream(std::ostream &out) const
}
void buffer::list::hexdump(std::ostream &out) const
void buffer::list::hexdump(std::ostream &out, bool trailing_newline) const
{
if (!length())
return;
@ -2377,7 +2377,8 @@ void buffer::list::hexdump(std::ostream &out) const
did_star = false;
}
}
if (o)
out << "\n";
out << std::hex << std::setw(8) << o << " ";
unsigned i;
@ -2400,9 +2401,12 @@ void buffer::list::hexdump(std::ostream &out) const
else
out << '.';
}
out << '|' << std::dec << std::endl;
out << '|' << std::dec;
}
if (trailing_newline) {
out << "\n" << std::hex << std::setw(8) << length();
out << "\n";
}
out << std::hex << std::setw(8) << length() << "\n";
out.flags(original_flags);
}

2
src/include/buffer.h
View File

@ -580,7 +580,7 @@ namespace buffer CEPH_BUFFER_API {
void decode_base64(list& o);
void write_stream(std::ostream &out) const;
void hexdump(std::ostream &out) const;
void hexdump(std::ostream &out, bool trailing_newline = true) const;
int read_file(const char *fn, std::string *error);
ssize_t read_fd(int fd, size_t len);
int read_fd_zero_copy(int fd, size_t len);