Skip to content

Fix issue with multiple return values #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue with multiple return values #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions src/encoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ namespace Encoder {
}

bool EncodeObject(Local<Value> value, DBusMessageIter *iter,
const DBusSignatureIter *siter,
const DBusSignatureIter *concreteSiter) {
DBusSignatureIter *siter,
DBusSignatureIter *concreteSiter) {

Nan::HandleScope scope;
int type;
Expand All @@ -167,6 +167,17 @@ namespace Encoder {
// Get type of current value
type = dbus_signature_iter_get_current_type(siter);

if (type != DBUS_TYPE_ARRAY && value->IsArray()) {
Local<Array> arrayData = Local<Array>::Cast(value);
for (unsigned int i = 0; i < arrayData->Length(); ++i) {
Local<Value> arrayItem = arrayData->Get(i);
if (!EncodeObject(arrayItem, iter, siter, concreteSiter))
return false;
dbus_signature_iter_next(siter);
}
return true;
}

switch (type) {
case DBUS_TYPE_INVALID: {
printf("Invalid type\n");
Expand Down Expand Up @@ -456,9 +467,9 @@ namespace Encoder {
}

}

return true;
}


}

2 changes: 1 addition & 1 deletion src/encoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Encoder {
// elements will be inferred based on the V8 type (and, in the case of numbers,
// their values)
bool EncodeObject(Local<Value> value, DBusMessageIter *iter,
const DBusSignatureIter *siter, const DBusSignatureIter *concreteSiter = nullptr);
DBusSignatureIter *siter, DBusSignatureIter *concreteSiter = nullptr);
}

#endif