http2: rename http2_state class to Http2State

danbev · BethGriggs · commit 395ce845da8d · 2018-10-17T00:07:24.000+01:00
This commit renames the http2_state class to follow the guidelines in CPP_STYLE_GUIDE.md. Backport-PR-URL: #22850 PR-URL: #20423 Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -417,12 +417,12 @@ inline void Environment::set_http_parser_buffer(char* buffer) {
   http_parser_buffer_ = buffer;
 }
 
-inline http2::http2_state* Environment::http2_state() const {
+inline http2::Http2State* Environment::http2_state() const {
   return http2_state_.get();
 }
 
 inline void Environment::set_http2_state(
-    std::unique_ptr<http2::http2_state> buffer) {
+    std::unique_ptr<http2::Http2State> buffer) {
   CHECK(!http2_state_);  // Should be set only once.
   http2_state_ = std::move(buffer);
 }
diff --git a/src/env.h b/src/env.h
@@ -617,8 +617,8 @@ class Environment {
   inline char* http_parser_buffer() const;
   inline void set_http_parser_buffer(char* buffer);
 
-  inline http2::http2_state* http2_state() const;
-  inline void set_http2_state(std::unique_ptr<http2::http2_state> state);
+  inline http2::Http2State* http2_state() const;
+  inline void set_http2_state(std::unique_ptr<http2::Http2State> state);
 
   inline double* fs_stats_field_array() const;
   inline void set_fs_stats_field_array(double* fields);
@@ -759,7 +759,7 @@ class Environment {
   double* heap_space_statistics_buffer_ = nullptr;
 
   char* http_parser_buffer_;
-  std::unique_ptr<http2::http2_state> http2_state_;
+  std::unique_ptr<http2::Http2State> http2_state_;
 
   double* fs_stats_field_array_;
 
diff --git a/src/node_http2.cc b/src/node_http2.cc
@@ -2868,7 +2868,7 @@ void Initialize(Local<Object> target,
   Isolate* isolate = env->isolate();
   HandleScope scope(isolate);
 
-  std::unique_ptr<http2_state> state(new http2_state(isolate));
+  std::unique_ptr<Http2State> state(new Http2State(isolate));
 
 #define SET_STATE_TYPEDARRAY(name, field)             \
   target->Set(context,                                \
diff --git a/src/node_http2_state.h b/src/node_http2_state.h
@@ -84,9 +84,9 @@ namespace http2 {
     IDX_SESSION_STATS_COUNT
   };
 
-class http2_state {
+class Http2State {
  public:
-  explicit http2_state(v8::Isolate* isolate) :
+  explicit Http2State(v8::Isolate* isolate) :
     root_buffer(
       isolate,
       sizeof(http2_state_internal)),

Original file line number	Diff line number	Diff line change
`@@ -417,12 +417,12 @@ inline void Environment::set_http_parser_buffer(char* buffer) {`
`417`	`417`	`http_parser_buffer_ = buffer;`
`418`	`418`	`}`
`419`	`419`
`420`		`-inline http2::http2_state* Environment::http2_state() const {`
	`420`	`+inline http2::Http2State* Environment::http2_state() const {`
`421`	`421`	`return http2_state_.get();`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`inline void Environment::set_http2_state(`
`425`		`- std::unique_ptr<http2::http2_state> buffer) {`
	`425`	`+ std::unique_ptr<http2::Http2State> buffer) {`
`426`	`426`	`CHECK(!http2_state_); // Should be set only once.`
`427`	`427`	`http2_state_ = std::move(buffer);`
`428`	`428`	`}`