Skip to content
Closed
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
src: fix compile warnings in node_url.cc
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++) {
          |               ^
  • Loading branch information
addaleax committed Feb 7, 2020
commit e3e135c964314aa5867a7000264bea25fbd2b94b
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