Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/brpc/channel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ int Channel::InitChannelOptions(const ChannelOptions* options) {

// Check connection_type
if (_options.connection_type == CONNECTION_TYPE_UNKNOWN) {
// Save has_error which will be overriden in later assignments to
// Save has_error which will be overridden in later assignments to
// connection_type.
const bool has_error = _options.connection_type.has_error();

Expand Down
2 changes: 1 addition & 1 deletion src/brpc/details/tcmalloc_extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static void InitGetInstanceFn() {
} // namespace

MallocExtension* BAIDU_WEAK MallocExtension::instance() {
// On fedora 26, this weak function is NOT overriden by the one in tcmalloc
// On fedora 26, this weak function is NOT overridden by the one in tcmalloc
// which is dynamically linked.The same issue can't be re-produced in
// Ubuntu and the exact cause is unknown yet. Using dlsym to get the
// function works around the issue right now. Note that we can't use dlsym
Expand Down
2 changes: 1 addition & 1 deletion src/brpc/policy/mongo_protocol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ ParseResult ParseMongoMessage(butil::IOBuf* source,
return MakeParseError(PARSE_ERROR_NOT_ENOUGH_DATA);
}
// Mongo protocol is a protocol with state. Each connection has its own
// mongo context. (e.g. last error occured on the connection, the cursor
// mongo context. (e.g. last error occurred on the connection, the cursor
// created by the last Query). The context is stored in
// socket::_input_message, and created at the first time when msg
// comes over the socket.
Expand Down
2 changes: 1 addition & 1 deletion src/butil/reloadable_flags.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
//
// This macro does not work for string-flags because they're thread-unsafe to
// modify directly. To emphasize this, you have to write the validator by
// yourself and use GFLAGS_NAMESPACE::GetCommandLineOption() to acess the flag.
// yourself and use GFLAGS_NAMESPACE::GetCommandLineOption() to access the flag.
#define BUTIL_VALIDATE_GFLAG(flag, validate_fn) \
namespace butil_flags {} \
const int ALLOW_UNUSED register_FLAGS_ ## flag ## _dummy = \
Expand Down
2 changes: 1 addition & 1 deletion test/brpc_http_rpc_protocol_unittest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1528,7 +1528,7 @@ class ServerProgressiveReader : public ReadBody {
_destroyed = true;
_destroying_st = st;
LOG(INFO) << "Destroy ReadBody=" << this << ", " << st;
_cntl->response_attachment().append("Sucess");
_cntl->response_attachment().append("Success");
}
private:
brpc::Controller* _cntl;
Expand Down
Loading