From 2837788849fa4f103a54203fb15421663d4d1a31 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 8 Feb 2020 00:01:12 +0100 Subject: [PATCH] src: fix compile warnings in node_url.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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&)’: ../src/node_url.cc:2242:43: warning: ignoring return value of ‘bool v8::Maybe::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)’: ../src/node_url.cc:1206:34: warning: ignoring return value of ‘bool v8::Maybe::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::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&)’: ../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: https://github.com/nodejs/node/pull/31689 Reviewed-By: James M Snell Reviewed-By: Michaël Zasso Reviewed-By: David Carlier Reviewed-By: Colin Ihrig --- src/node_url.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/node_url.cc b/src/node_url.cc index d3513f095c8294..27e89e8d9b7652 100644 --- a/src/node_url.cc +++ b/src/node_url.cc @@ -1203,12 +1203,12 @@ url_data HarvestBase(Environment* env, Local base_obj) { Local 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 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 scheme = base_obj->Get(env->context(), env->scheme_string()).ToLocalChecked(); @@ -2238,8 +2238,7 @@ void ToUSVString(const FunctionCallbackInfo& 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++) {