src: modify int to uint16_t fori HostPort

nodejs · Sep 25, 2023 · c6c00ce · c6c00ce
1 parent 55fde47
commit c6c00ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/inspector_io.cc b/src/inspector_io.cc
@@ -293,7 +293,7 @@ void InspectorIo::ThreadMain() {
       new InspectorIoDelegate(queue, main_thread_, id_,
                               script_path, script_name_));
   std::string host;
-  int port;
+  uint16_t port;
   {
     ExclusiveAccess<HostPort>::Scoped host_port(host_port_);
     host = host_port->host();

diff --git a/src/inspector_js_api.cc b/src/inspector_js_api.cc
@@ -286,7 +286,7 @@ void Open(const FunctionCallbackInfo<Value>& args) {
     uint32_t port = args[0].As<Uint32>()->Value();
     CHECK_LE(port, std::numeric_limits<uint16_t>::max());
     ExclusiveAccess<HostPort>::Scoped host_port(agent->host_port());
-    host_port->set_port(static_cast<int>(port));
+    host_port->set_port(static_cast<uint16_t>(port));
   }
 
   if (args.Length() > 1 && args[1]->IsString()) {

diff --git a/src/node_options.h b/src/node_options.h
@@ -28,24 +28,22 @@ class HostPort {
 
   void set_host(const std::string& host) { host_name_ = host; }
 
-  void set_port(int port) { port_ = port; }
+  void set_port(uint16_t port) { port_ = port; }
 
   const std::string& host() const { return host_name_; }
 
-  int port() const {
-    // TODO(joyeecheung): make port a uint16_t
-    CHECK_GE(port_, 0);
+  uint16_t port() const {
     return port_;
   }
 
   void Update(const HostPort& other) {
     if (!other.host_name_.empty()) host_name_ = other.host_name_;
-    if (other.port_ >= 0) port_ = other.port_;
+    port_ = other.port_;
   }
 
  private:
   std::string host_name_;
-  int port_;
+  uint16_t port_;
 };
 
 class Options {