Skip to content

Commit

Permalink
src: mark some global state as const
Browse files Browse the repository at this point in the history
Mark some global variables as `const` or `constexpr`.

PR-URL: nodejs#25052
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
addaleax authored and Trott committed Dec 17, 2018
1 parent 52ee55a commit 18f2bf7
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/env.cc
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TraceEventScope {
};

int const Environment::kNodeContextTag = 0x6e6f64;
void* Environment::kNodeContextTagPtr = const_cast<void*>(
void* const Environment::kNodeContextTagPtr = const_cast<void*>(
static_cast<const void*>(&Environment::kNodeContextTag));

IsolateData::IsolateData(Isolate* isolate,
Expand Down
2 changes: 1 addition & 1 deletion src/env.h
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ class Environment {
uint64_t thread_id_ = 0;
std::unordered_set<worker::Worker*> sub_worker_contexts_;

static void* kNodeContextTagPtr;
static void* const kNodeContextTagPtr;
static int const kNodeContextTag;

#if HAVE_INSPECTOR
Expand Down
4 changes: 2 additions & 2 deletions src/node_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ using v8::Value;
#endif

#ifdef __POSIX__
const char* kPathSeparator = "/";
constexpr char kPathSeparator = '/';
#else
const char* kPathSeparator = "\\/";
const char* const kPathSeparator = "\\/";
#endif

#define GET_OFFSET(a) ((a)->IsNumber() ? (a).As<Integer>()->Value() : -1)
Expand Down
2 changes: 1 addition & 1 deletion src/node_http_parser_llhttp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace node {

const char* llhttp_version =
const char* const llhttp_version =
NODE_STRINGIFY(LLHTTP_VERSION_MAJOR)
"."
NODE_STRINGIFY(LLHTTP_VERSION_MINOR)
Expand Down
2 changes: 1 addition & 1 deletion src/node_http_parser_traditional.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace node {

const char* http_parser_version =
const char* const http_parser_version =
NODE_STRINGIFY(HTTP_PARSER_VERSION_MAJOR)
"."
NODE_STRINGIFY(HTTP_PARSER_VERSION_MINOR)
Expand Down
4 changes: 2 additions & 2 deletions src/node_internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -697,8 +697,8 @@ static inline const char* errno_string(int errorno) {

extern double prog_start_time;

extern const char* llhttp_version;
extern const char* http_parser_version;
extern const char* const llhttp_version;
extern const char* const http_parser_version;

void Abort(const v8::FunctionCallbackInfo<v8::Value>& args);
void Chdir(const v8::FunctionCallbackInfo<v8::Value>& args);
Expand Down
2 changes: 1 addition & 1 deletion src/node_postmortem_metadata.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ int GenDebugSymbols() {
return 1;
}

int debug_symbols_generated = GenDebugSymbols();
const int debug_symbols_generated = GenDebugSymbols();

} // namespace node

0 comments on commit 18f2bf7

Please sign in to comment.