Skip to content

Commit 6343675

Browse files
committed
Make the code for create_function more idiomatic
1 parent c58414c commit 6343675

File tree

1 file changed

+12
-29
lines changed

1 file changed

+12
-29
lines changed

src/api.js

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -876,38 +876,24 @@ Module["onRuntimeInitialized"] = (function onRuntimeInitialized() {
876876
Database.prototype["create_function"] = function create_function(name, func) {
877877
var func_ptr;
878878
function wrapped_func(cx, argc, argv) {
879-
var arg;
880-
var args;
881-
var blobptr;
882-
var data_func;
883-
var error;
884-
var i;
885879
var result;
886-
var value_ptr;
887-
var value_type;
888-
args = [];
889880
function data_func_blob(ptr) {
890-
var blob_arg;
891-
var blob_ptr;
892-
var j;
893-
var size;
894-
size = sqlite3_value_bytes(ptr);
895-
blob_ptr = sqlite3_value_blob(ptr);
896-
blob_arg = new Uint8Array(size);
897-
j = 0;
898-
while (j < size) {
881+
var size = sqlite3_value_bytes(ptr);
882+
var blob_ptr = sqlite3_value_blob(ptr);
883+
var blob_arg = new Uint8Array(size);
884+
for (var j = 0; j < size; j += 1) {
899885
blob_arg[j] = HEAP8[blob_ptr + j];
900-
j += 1;
901886
}
902887
return blob_arg;
903888
}
904889
function data_func_null() {
905890
return null;
906891
}
907-
i = 0;
908-
while (i < argc) {
909-
value_ptr = getValue(argv + (4 * i), "i32");
910-
value_type = sqlite3_value_type(value_ptr);
892+
var args = [];
893+
for (var i = 0; i < argc; i += 1) {
894+
var value_ptr = getValue(argv + (4 * i), "i32");
895+
var value_type = sqlite3_value_type(value_ptr);
896+
var data_func;
911897
switch (value_type) {
912898
case 1:
913899
data_func = sqlite3_value_double;
@@ -924,14 +910,11 @@ Module["onRuntimeInitialized"] = (function onRuntimeInitialized() {
924910
default:
925911
data_func = data_func_null;
926912
}
927-
arg = data_func(value_ptr);
928-
args.push(arg);
929-
i += 1;
913+
args.push(data_func(value_ptr));
930914
}
931915
try {
932916
result = func.apply(null, args);
933-
} catch (error1) {
934-
error = error1;
917+
} catch (error) {
935918
sqlite3_result_error(cx, error, -1);
936919
return;
937920
}
@@ -949,7 +932,7 @@ Module["onRuntimeInitialized"] = (function onRuntimeInitialized() {
949932
if (result === null) {
950933
sqlite3_result_null(cx);
951934
} else if (result.length != null) {
952-
blobptr = allocate(result, "i8", ALLOC_NORMAL);
935+
var blobptr = allocate(result, "i8", ALLOC_NORMAL);
953936
sqlite3_result_blob(cx, blobptr, result.length, -1);
954937
_free(blobptr);
955938
} else {

0 commit comments

Comments
 (0)