Skip to content

Commit 38086c0

Browse files
committed
glaring typo, hopefully fix #61 and #63
1 parent 3a21b2f commit 38086c0

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/utils.cc

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ namespace OZW {
240240
}
241241

242242
bool isOzwValue(Local<Object>& o) {
243-
return (!Nan::HasOwnProperty(o, Nan::New<String>("nodeid").ToLocalChecked()).IsNothing()
243+
return (!Nan::HasOwnProperty(o, Nan::New<String>("node_id").ToLocalChecked()).IsNothing()
244244
&& !Nan::HasOwnProperty(o, Nan::New<String>("class_id").ToLocalChecked()).IsNothing()
245245
&& !Nan::HasOwnProperty(o, Nan::New<String>("instance").ToLocalChecked()).IsNothing()
246246
&& !Nan::HasOwnProperty(o, Nan::New<String>("index").ToLocalChecked()).IsNothing());
@@ -261,20 +261,15 @@ namespace OZW {
261261
if ( (info.Length() >= offset) && info[offset]->IsObject() ) {
262262
Local<Object> o = info[offset]->ToObject();
263263
if (isOzwValue(o)) {
264-
nodeid = Nan::Get(o, Nan::New<String>("nodeid").ToLocalChecked()).ToLocalChecked()->ToNumber()->Value();
264+
nodeid = Nan::Get(o, Nan::New<String>("node_id").ToLocalChecked()).ToLocalChecked()->ToNumber()->Value();
265265
comclass = Nan::Get(o, Nan::New<String>("class_id").ToLocalChecked()).ToLocalChecked()->ToNumber()->Value();
266266
instance = Nan::Get(o, Nan::New<String>("instance").ToLocalChecked()).ToLocalChecked()->ToNumber()->Value();
267267
index = Nan::Get(o, Nan::New<String>("index").ToLocalChecked()).ToLocalChecked()->ToNumber()->Value();
268268
} else {
269269
return ( NULL );
270270
}
271-
} else if (
272-
(info.Length() >= offset+4)
273-
&& info[offset]->IsNumber()
274-
&& info[offset+1]->IsNumber()
275-
&& info[offset+2]->IsNumber()
276-
&& info[offset+3]->IsNumber()
277-
) { // legacy mode
271+
} else if ((info.Length() >= offset+4)) {
272+
// legacy mode
278273
nodeid = info[offset]->ToNumber()->Value();
279274
comclass = info[offset+1]->ToNumber()->Value();
280275
instance = info[offset+2]->ToNumber()->Value();

0 commit comments

Comments
 (0)