@@ -20,7 +20,6 @@ using v8::Local;
20
20
using v8::NewStringType;
21
21
using v8::Object;
22
22
using v8::String;
23
- using v8::Undefined;
24
23
using v8::Value;
25
24
26
25
Local<String> Utf8String (Isolate* isolate, const std::string& str) {
@@ -46,18 +45,20 @@ enum url_update_action {
46
45
kHref = 9 ,
47
46
};
48
47
49
- void SetArgs (Environment* env, Local<Value> argv[10 ], const ada::result& url) {
48
+ void SetArgs (Environment* env,
49
+ Local<Value> (*argv)[10],
50
+ const ada::result& url) {
50
51
Isolate* isolate = env->isolate ();
51
- argv[0 ] = Utf8String (isolate, url->get_href ());
52
- argv[1 ] = Utf8String (isolate, url->get_origin ());
53
- argv[2 ] = Utf8String (isolate, url->get_protocol ());
54
- argv[3 ] = Utf8String (isolate, url->get_hostname ());
55
- argv[4 ] = Utf8String (isolate, url->get_pathname ());
56
- argv[5 ] = Utf8String (isolate, url->get_search ());
57
- argv[6 ] = Utf8String (isolate, url->get_username ());
58
- argv[7 ] = Utf8String (isolate, url->get_password ());
59
- argv[8 ] = Utf8String (isolate, url->get_port ());
60
- argv[9 ] = Utf8String (isolate, url->get_hash ());
52
+ (* argv) [0 ] = Utf8String (isolate, url->get_href ());
53
+ (* argv) [1 ] = Utf8String (isolate, url->get_origin ());
54
+ (* argv) [2 ] = Utf8String (isolate, url->get_protocol ());
55
+ (* argv) [3 ] = Utf8String (isolate, url->get_hostname ());
56
+ (* argv) [4 ] = Utf8String (isolate, url->get_pathname ());
57
+ (* argv) [5 ] = Utf8String (isolate, url->get_search ());
58
+ (* argv) [6 ] = Utf8String (isolate, url->get_username ());
59
+ (* argv) [7 ] = Utf8String (isolate, url->get_password ());
60
+ (* argv) [8 ] = Utf8String (isolate, url->get_port ());
61
+ (* argv) [9 ] = Utf8String (isolate, url->get_hash ());
61
62
}
62
63
63
64
void Parse (const FunctionCallbackInfo<Value>& args) {
@@ -69,7 +70,6 @@ void Parse(const FunctionCallbackInfo<Value>& args) {
69
70
Local<Function> success_callback_ = args[2 ].As <Function>();
70
71
71
72
Environment* env = Environment::GetCurrent (args);
72
- Isolate* isolate = env->isolate ();
73
73
HandleScope handle_scope (env->isolate ());
74
74
Context::Scope context_scope (env->context ());
75
75
@@ -89,20 +89,8 @@ void Parse(const FunctionCallbackInfo<Value>& args) {
89
89
return args.GetReturnValue ().Set (false );
90
90
}
91
91
92
- const Local<Value> undef = Undefined (isolate);
93
- Local<Value> argv[] = {
94
- undef,
95
- undef,
96
- undef,
97
- undef,
98
- undef,
99
- undef,
100
- undef,
101
- undef,
102
- undef,
103
- undef,
104
- };
105
- SetArgs (env, argv, out);
92
+ Local<Value> argv[10 ];
93
+ SetArgs (env, &argv, out);
106
94
USE (success_callback_->Call (
107
95
env->context (), args.This (), arraysize (argv), argv));
108
96
args.GetReturnValue ().Set (true );
@@ -235,20 +223,8 @@ void UpdateUrl(const FunctionCallbackInfo<Value>& args) {
235
223
}
236
224
}
237
225
238
- const Local<Value> undef = Undefined (isolate);
239
- Local<Value> argv[] = {
240
- undef,
241
- undef,
242
- undef,
243
- undef,
244
- undef,
245
- undef,
246
- undef,
247
- undef,
248
- undef,
249
- undef,
250
- };
251
- SetArgs (env, argv, out);
226
+ Local<Value> argv[10 ];
227
+ SetArgs (env, &argv, out);
252
228
USE (success_callback_->Call (
253
229
env->context (), args.This (), arraysize (argv), argv));
254
230
args.GetReturnValue ().Set (result);
0 commit comments