Skip to content

Commit

Permalink
src: fix compile warnings in node_url.cc
Browse files Browse the repository at this point in the history
Since for all affected conversions there is a preceding type check,
it’s safe to use `.FromJust()` instead.

This fixes the following compile warnings:

    ../src/node_url.cc: In function ‘void node::url::{anonymous}::ToUSVString(const v8::FunctionCallbackInfo<v8::Value>&)’:
    ../src/node_url.cc:2242:43: warning: ignoring return value of ‘bool v8::Maybe<T>::To(T*) const [with T = long int]’, declared with attribute warn_unused_result [-Wunused-result]
     2242 |   args[1]->IntegerValue(env->context()).To(&start);
          |   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
    ../src/node_url.cc: In function ‘node::url::url_data node::url::{anonymous}::HarvestBase(node::Environment*, v8::Local<v8::Object>)’:
    ../src/node_url.cc:1206:34: warning: ignoring return value of ‘bool v8::Maybe<T>::To(T*) const [with T = int]’, declared with attribute warn_unused_result [-Wunused-result]
     1206 |     flags->Int32Value(context).To(&base.flags);
          |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
    ../src/node_url.cc:1211:33: warning: ignoring return value of ‘bool v8::Maybe<T>::To(T*) const [with T = int]’, declared with attribute warn_unused_result [-Wunused-result]
     1211 |     port->Int32Value(context).To(&base.port);
          |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~
    ../src/node_url.cc: In function ‘void node::url::{anonymous}::ToUSVString(const v8::FunctionCallbackInfo<v8::Value>&)’:
    ../src/node_url.cc:2245:15: warning: ‘start’ may be used uninitialized in this function [-Wmaybe-uninitialized]
     2245 |   for (size_t i = start; i < value.length(); i++) {
          |               ^

PR-URL: #31689
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
addaleax authored and codebytere committed Mar 15, 2020
1 parent 63ad830 commit 46e8b91
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/node_url.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1203,12 +1203,12 @@ url_data HarvestBase(Environment* env, Local<Object> base_obj) {
Local<Value> flags =
base_obj->Get(env->context(), env->flags_string()).ToLocalChecked();
if (flags->IsInt32())
flags->Int32Value(context).To(&base.flags);
base.flags = flags->Int32Value(context).FromJust();

Local<Value> port =
base_obj->Get(env->context(), env->port_string()).ToLocalChecked();
if (port->IsInt32())
port->Int32Value(context).To(&base.port);
base.port = port->Int32Value(context).FromJust();

Local<Value> scheme =
base_obj->Get(env->context(), env->scheme_string()).ToLocalChecked();
Expand Down Expand Up @@ -2238,8 +2238,7 @@ void ToUSVString(const FunctionCallbackInfo<Value>& args) {

TwoByteValue value(env->isolate(), args[0]);

int64_t start;
args[1]->IntegerValue(env->context()).To(&start);
int64_t start = args[1]->IntegerValue(env->context()).FromJust();
CHECK_GE(start, 0);

for (size_t i = start; i < value.length(); i++) {
Expand Down

0 comments on commit 46e8b91

Please sign in to comment.