Skip to content

Commit 839d5df

Browse files
author
Anton Shabouta
committed
Simplify string cast
1 parent d9c9fcc commit 839d5df

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

Buffer.cpp

+2-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void Buffer::clear() noexcept {
1717
buffer.clear();
1818
}
1919

20-
void Buffer::write(char * str, long length) noexcept {
20+
void Buffer::write(char * str, unsigned long length) noexcept {
2121
buffer.insert(buffer.end(), str, str + length);
2222
}
2323

@@ -41,13 +41,7 @@ void Buffer::merge(const Buffer &other) noexcept {
4141
}
4242

4343
std::string Buffer::bytes() const noexcept {
44-
std::stringstream stream;
45-
46-
unsigned long long size = buffer.size();
47-
for (unsigned long long i = 0; i < size; ++i)
48-
stream << buffer[i];
49-
50-
return stream.str();
44+
return std::string(buffer.begin(), buffer.end());
5145
}
5246

5347
std::string Buffer::flush() noexcept {

Buffer.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#pragma once
1111
#include <deque>
12-
#include <sstream>
12+
#include <string>
1313
#include <exception>
1414

1515
struct BufferOverflow : public std::exception {};
@@ -19,7 +19,7 @@ class Buffer {
1919
Buffer() noexcept;
2020

2121
void clear() noexcept;
22-
void write(char * str, long length) noexcept;
22+
void write(char * str, unsigned long length) noexcept;
2323
void discard(unsigned long long n);
2424

2525
unsigned long long size() const noexcept;

buffer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ static zend_function_entry buffer_object_methods[] = {
720720
};
721721

722722
static zend_object* buffer_object_create(zend_class_entry *ce) {
723-
buffer_object *objval = (buffer_object*) ecalloc(1, sizeof(buffer_object) + zend_object_properties_size(ce));
723+
buffer_object *objval = (buffer_object*) emalloc(sizeof(buffer_object) + zend_object_properties_size(ce));
724724

725725
zend_object* ret = buffer_object_to_zend_object(objval);
726726

0 commit comments

Comments
 (0)