diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-02 14:54:24 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-02 14:54:24 -0500 |
| commit | e8f463ef7a9cddda3813d20935957708d3b4aa3b (patch) | |
| tree | c236a4466bedd21eb6de5e752882731ebf476b67 | |
| parent | d09d4e1a7e64b01fa1d9f3015de819a2e7069ac4 (diff) | |
Use LLProcess::ReadPipe::read() in LLLeap.
The code was using LLProcess::ReadPipe::get_istream().read(), but that's much
uglier, as it requires constructing a char* buffer etc. etc.
| -rw-r--r-- | indra/llcommon/llleap.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp index dddf1286ac..beb7fa8333 100644 --- a/indra/llcommon/llleap.cpp +++ b/indra/llcommon/llleap.cpp @@ -230,10 +230,7 @@ public: // childout (well, up to a max length) to log what was wrong. LLProcess::ReadPipe::size_type readlen((std::min)(childout.size(), LLProcess::ReadPipe::size_type(80))); - std::vector<char> buffer(readlen + 1); - childstream.read(&buffer[0], readlen); - buffer[childstream.gcount()] = '\0'; - bad_protocol(STRINGIZE(expect << char(colon) << &buffer[0])); + bad_protocol(STRINGIZE(expect << char(colon) << childout.read(readlen))); } else { |