Skip to content

Commit 0350f70

Browse files
implausibleimplausible
committed
Fix deprecated calls
1 parent 1f7d487 commit 0350f70

16 files changed

Lines changed: 77 additions & 65 deletions

‎generate/templates/manual/commit/extract_signature.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ void GitCommit::ExtractSignatureWorker::HandleOKCallback()
115115
Nan::Null(),
116116
result
117117
};
118-
callback->Call(2, argv);
118+
callback->Call(2, argv, async_resource);
119119
}
120120
else if (baton->error)
121121
{
122122
Local<v8::Value> argv[1] = {
123123
Nan::Error(baton->error->message)
124124
};
125-
callback->Call(1, argv);
125+
callback->Call(1, argv, async_resource);
126126
if (baton->error->message)
127127
{
128128
free((void *)baton->error->message);
@@ -138,11 +138,11 @@ void GitCommit::ExtractSignatureWorker::HandleOKCallback()
138138
Local<v8::Value> argv[1] = {
139139
err
140140
};
141-
callback->Call(1, argv);
141+
callback->Call(1, argv, async_resource);
142142
}
143143
else
144144
{
145-
callback->Call(0, NULL);
145+
callback->Call(0, NULL, async_resource);
146146
}
147147

148148
git_buf_free(&baton->signature);

‎generate/templates/manual/patches/convenient_patches.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void GitPatch::ConvenientFromDiffWorker::HandleOKCallback() {
8989
Nan::Null(),
9090
result
9191
};
92-
callback->Call(2, argv);
92+
callback->Call(2, argv, async_resource);
9393

9494
return;
9595
}
@@ -106,7 +106,7 @@ void GitPatch::ConvenientFromDiffWorker::HandleOKCallback() {
106106
Local<v8::Value> argv[1] = {
107107
err
108108
};
109-
callback->Call(1, argv);
109+
callback->Call(1, argv, async_resource);
110110
if (baton->error->message)
111111
{
112112
free((void *)baton->error->message);
@@ -124,7 +124,7 @@ void GitPatch::ConvenientFromDiffWorker::HandleOKCallback() {
124124
Local<v8::Value> argv[1] = {
125125
err
126126
};
127-
callback->Call(1, argv);
127+
callback->Call(1, argv, async_resource);
128128

129129
return;
130130
}

‎generate/templates/manual/remote/ls.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ void GitRemote::ReferenceListWorker::HandleOKCallback()
6868
Nan::Null(),
6969
result
7070
};
71-
callback->Call(2, argv);
71+
callback->Call(2, argv, async_resource);
7272
}
7373
else if (baton->error)
7474
{
7575
Local<v8::Value> argv[1] = {
7676
Nan::Error(baton->error->message)
7777
};
78-
callback->Call(1, argv);
78+
callback->Call(1, argv, async_resource);
7979
if (baton->error->message)
8080
{
8181
free((void *)baton->error->message);
@@ -91,10 +91,10 @@ void GitRemote::ReferenceListWorker::HandleOKCallback()
9191
Local<v8::Value> argv[1] = {
9292
err
9393
};
94-
callback->Call(1, argv);
94+
callback->Call(1, argv, async_resource);
9595
}
9696
else
9797
{
98-
callback->Call(0, NULL);
98+
callback->Call(0, NULL, async_resource);
9999
}
100100
}

‎generate/templates/manual/revwalk/fast_walk.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ NAN_METHOD(GitRevwalk::FastWalk)
1212

1313
baton->error_code = GIT_OK;
1414
baton->error = NULL;
15-
baton->max_count = (unsigned int)info[0]->ToNumber()->Value();
15+
baton->max_count = Nan::To<unsigned int>(info[0]).FromJust();
1616
baton->out = new std::vector<git_oid*>;
1717
baton->out->reserve(baton->max_count);
1818
baton->walk = Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue();
@@ -82,7 +82,7 @@ void GitRevwalk::FastWalkWorker::HandleOKCallback()
8282
Nan::Null(),
8383
result
8484
};
85-
callback->Call(2, argv);
85+
callback->Call(2, argv, async_resource);
8686
}
8787
else
8888
{
@@ -99,7 +99,7 @@ void GitRevwalk::FastWalkWorker::HandleOKCallback()
9999
Local<v8::Value> argv[1] = {
100100
err
101101
};
102-
callback->Call(1, argv);
102+
callback->Call(1, argv, async_resource);
103103
if (baton->error->message)
104104
{
105105
free((void *)baton->error->message);
@@ -139,7 +139,7 @@ void GitRevwalk::FastWalkWorker::HandleOKCallback()
139139
Local<v8::Value> argv[1] = {
140140
checkValue->ToObject()
141141
};
142-
callback->Call(1, argv);
142+
callback->Call(1, argv, async_resource);
143143
callbackFired = true;
144144
break;
145145
}
@@ -164,12 +164,12 @@ void GitRevwalk::FastWalkWorker::HandleOKCallback()
164164
Local<v8::Value> argv[1] = {
165165
err
166166
};
167-
callback->Call(1, argv);
167+
callback->Call(1, argv, async_resource);
168168
}
169169
}
170170
else
171171
{
172-
callback->Call(0, NULL);
172+
callback->Call(0, NULL, async_resource);
173173
}
174174
}
175175
}

‎generate/templates/manual/revwalk/file_history_walk.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ NAN_METHOD(GitRevwalk::FileHistoryWalk)
1818
baton->error = NULL;
1919
String::Utf8Value from_js_file_path(info[0]->ToString());
2020
baton->file_path = strdup(*from_js_file_path);
21-
baton->max_count = (unsigned int)info[1]->ToNumber()->Value();
21+
baton->max_count = Nan::To<unsigned int>(info[1]).FromJust();
2222
baton->out = new std::vector< std::pair<git_commit *, std::pair<char *, git_delta_t> > *>;
2323
baton->out->reserve(baton->max_count);
2424
baton->walk = Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue();
@@ -282,7 +282,7 @@ void GitRevwalk::FileHistoryWalkWorker::HandleOKCallback()
282282
Nan::Null(),
283283
result
284284
};
285-
callback->Call(2, argv);
285+
callback->Call(2, argv, async_resource);
286286

287287
delete baton->out;
288288
return;
@@ -300,7 +300,7 @@ void GitRevwalk::FileHistoryWalkWorker::HandleOKCallback()
300300
Local<v8::Value> argv[1] = {
301301
err
302302
};
303-
callback->Call(1, argv);
303+
callback->Call(1, argv, async_resource);
304304
if (baton->error->message)
305305
{
306306
free((void *)baton->error->message);
@@ -317,9 +317,9 @@ void GitRevwalk::FileHistoryWalkWorker::HandleOKCallback()
317317
Local<v8::Value> argv[1] = {
318318
err
319319
};
320-
callback->Call(1, argv);
320+
callback->Call(1, argv, async_resource);
321321
return;
322322
}
323323

324-
callback->Call(0, NULL);
324+
callback->Call(0, NULL, async_resource);
325325
}

‎generate/templates/manual/src/convenient_hunk.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void ConvenientHunk::LinesWorker::HandleOKCallback() {
135135
Nan::Null(),
136136
result
137137
};
138-
callback->Call(2, argv);
138+
callback->Call(2, argv, async_resource);
139139
}
140140

141141
NAN_METHOD(ConvenientHunk::OldStart) {

‎generate/templates/manual/src/convenient_patch.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ void ConvenientPatch::HunksWorker::HandleOKCallback() {
268268
Nan::Null(),
269269
result
270270
};
271-
callback->Call(2, argv);
271+
callback->Call(2, argv, async_resource);
272272
}
273273

274274
NAN_METHOD(ConvenientPatch::LineStats) {

‎generate/templates/manual/src/filter_registry.cc‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void GitFilterRegistry::InitializeComponent(v8::Local<v8::Object> target) {
2828

2929
Nan::SetMethod(object, "register", GitFilterRegister);
3030
Nan::SetMethod(object, "unregister", GitFilterUnregister);
31-
31+
3232
Nan::Set(target, Nan::New<String>("FilterRegistry").ToLocalChecked(), object);
3333
GitFilterRegistry::persistentHandle.Reset(object);
3434
}
@@ -56,14 +56,14 @@ NAN_METHOD(GitFilterRegistry::GitFilterRegister) {
5656

5757
baton->filter = Nan::ObjectWrap::Unwrap<GitFilter>(info[1]->ToObject())->GetValue();
5858
String::Utf8Value name(info[0]->ToString());
59-
59+
6060
baton->filter_name = (char *)malloc(name.length() + 1);
6161
memcpy((void *)baton->filter_name, *name, name.length());
6262
memset((void *)(((char *)baton->filter_name) + name.length()), 0, 1);
6363

6464
baton->error_code = GIT_OK;
65-
baton->filter_priority = (int)info[2]->ToNumber()->Value();
66-
65+
baton->filter_priority = Nan::To<int>(info[2]).FromJust();
66+
6767
Nan::New(GitFilterRegistry::persistentHandle)->Set(info[0]->ToString(), info[1]->ToObject());
6868

6969
Nan::Callback *callback = new Nan::Callback(Local<Function>::Cast(info[3]));
@@ -97,8 +97,8 @@ void GitFilterRegistry::RegisterWorker::HandleOKCallback() {
9797
Nan::Null(),
9898
result
9999
};
100-
callback->Call(2, argv);
101-
}
100+
callback->Call(2, argv, async_resource);
101+
}
102102
else if (baton->error) {
103103
v8::Local<v8::Object> err;
104104
if (baton->error->message) {
@@ -111,7 +111,7 @@ void GitFilterRegistry::RegisterWorker::HandleOKCallback() {
111111
v8::Local<v8::Value> argv[1] = {
112112
err
113113
};
114-
callback->Call(1, argv);
114+
callback->Call(1, argv, async_resource);
115115
if (baton->error->message)
116116
free((void *)baton->error->message);
117117
free((void *)baton->error);
@@ -123,10 +123,10 @@ void GitFilterRegistry::RegisterWorker::HandleOKCallback() {
123123
v8::Local<v8::Value> argv[1] = {
124124
err
125125
};
126-
callback->Call(1, argv);
126+
callback->Call(1, argv, async_resource);
127127
}
128128
else {
129-
callback->Call(0, NULL);
129+
callback->Call(0, NULL, async_resource);
130130
}
131131
delete baton;
132132
return;
@@ -183,8 +183,8 @@ void GitFilterRegistry::UnregisterWorker::HandleOKCallback() {
183183
Nan::Null(),
184184
result
185185
};
186-
callback->Call(2, argv);
187-
}
186+
callback->Call(2, argv, async_resource);
187+
}
188188
else if (baton->error) {
189189
v8::Local<v8::Object> err;
190190
if (baton->error->message) {
@@ -197,7 +197,7 @@ void GitFilterRegistry::UnregisterWorker::HandleOKCallback() {
197197
v8::Local<v8::Value> argv[1] = {
198198
err
199199
};
200-
callback->Call(1, argv);
200+
callback->Call(1, argv, async_resource);
201201
if (baton->error->message)
202202
free((void *)baton->error->message);
203203
free((void *)baton->error);
@@ -209,10 +209,10 @@ void GitFilterRegistry::UnregisterWorker::HandleOKCallback() {
209209
v8::Local<v8::Value> argv[1] = {
210210
err
211211
};
212-
callback->Call(1, argv);
212+
callback->Call(1, argv, async_resource);
213213
}
214214
else {
215-
callback->Call(0, NULL);
215+
callback->Call(0, NULL, async_resource);
216216
}
217217
delete baton;
218218
return;

‎generate/templates/manual/src/promise_completion.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include <iostream>
12
#include "../include/promise_completion.h"
23

34
Nan::Persistent<v8::Function> PromiseCompletion::newFn;
@@ -19,7 +20,7 @@ bool PromiseCompletion::ForwardIfPromise(v8::Local<v8::Value> result, AsyncBaton
1920
Nan::HandleScope scope;
2021

2122
// check if the result is a promise
22-
if (result->IsObject()) {
23+
if (!result.IsEmpty() && result->IsObject()) {
2324
Nan::MaybeLocal<v8::Value> maybeThenProp = Nan::Get(result->ToObject(), Nan::New("then").ToLocalChecked());
2425
if (!maybeThenProp.IsEmpty()) {
2526
v8::Local<v8::Value> thenProp = maybeThenProp.ToLocalChecked();

‎generate/templates/manual/src/wrapper.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ NAN_METHOD(Wrapper::ToBuffer) {
6363
return Nan::ThrowError("Number is required.");
6464
}
6565

66-
int len = info[0]->ToNumber()->Value();
66+
int len = Nan::To<int>(info[0]).FromJust();
6767

6868
Local<Function> bufferConstructor = Local<Function>::Cast(
6969
Nan::Get(Nan::GetCurrentContext()->Global(), Nan::New("Buffer").ToLocalChecked()).ToLocalChecked());

0 commit comments

Comments
 (0)