Skip to content

[library_sockfs.js] Use callUserCallback. NFC #22986

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

Merged
merged 1 commit into from
Nov 21, 2024
Merged

[library_sockfs.js] Use callUserCallback. NFC #22986

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
19 changes: 7 additions & 12 deletions src/library_sockfs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,24 +728,19 @@ addToLibrary({
* Passing a NULL callback function to a emscripten_set_socket_*_callback call
* will deregister the callback registered for that Event.
*/
$_setNetworkCallback__deps: ['$stackSave', '$stackRestore', '$stringToUTF8OnStack'],
$_setNetworkCallback__deps: ['$withStackSave', '$callUserCallback', '$stringToUTF8OnStack'],
$_setNetworkCallback: (event, userData, callback) => {
function _callback(data) {
try {
callUserCallback(() => {
if (event === 'error') {
var sp = stackSave();
var msg = stringToUTF8OnStack(data[2]);
{{{ makeDynCall('viiii', 'callback') }}}(data[0], data[1], msg, userData);
stackRestore(sp);
withStackSave(() => {
var msg = stringToUTF8OnStack(data[2]);
{{{ makeDynCall('viiii', 'callback') }}}(data[0], data[1], msg, userData);
});
} else {
{{{ makeDynCall('vii', 'callback') }}}(data, userData);
}
} catch (e) {
if (!(e instanceof ExitStatus)) {
if (e && typeof e == 'object' && e.stack) err('exception thrown: ' + [e, e.stack]);
throw e;
}
}
});
};

// FIXME(sbc): This has no corresponding Pop so will currently keep the
Expand Down
Loading