quickjs-tart

commit 7d5315a0487e6a5c73af15efa10c1008394ac80b
parent 9b744a5be04440daba6cdac70f8199dd93caedec
Author: Florian Dold <florian@dold.me>
Date:   Mon, 10 Mar 2025 20:08:11 +0100

disambiguate JS_NewTypedArray, quickjs now has a function of the same name

Diffstat:
M
quickjs/quickjs.c
 | 
2
+-
M
quickjs/quickjs.h
 | 
4
++--
M
tart_module.c
 | 
8
++++----

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/quickjs/quickjs.c b/quickjs/quickjs.c
@@ -55200,7 +55200,7 @@ static int typed_array_init(JSContext *ctx, JSValueConst obj,
     return 0;
 }
 
-JSValue JS_NewTypedArray(JSContext *ctx, JSValue array_buf, size_t bytes_per_element)
+JSValue JS_NewTypedArraySimple(JSContext *ctx, JSValue array_buf, size_t bytes_per_element)
 {
     JSValue obj;
     JSObject *p = JS_VALUE_GET_OBJ(array_buf);
diff --git a/quickjs/quickjs.h b/quickjs/quickjs.h
@@ -831,7 +831,7 @@ typedef void JSFreeArrayBufferDataFunc(JSRuntime *rt, void *opaque, void *ptr);
 JSValue JS_NewArrayBuffer(JSContext *ctx, uint8_t *buf, size_t len,
                           JSFreeArrayBufferDataFunc *free_func, void *opaque,
                           JS_BOOL is_shared);
-JSValue JS_NewTypedArray(JSContext *ctx, JSValue array_buf, size_t bytes_per_element);
+JSValue JS_NewTypedArraySimple(JSContext *ctx, JSValue array_buf, size_t bytes_per_element);
 JSValue JS_NewArrayBufferCopy(JSContext *ctx, const uint8_t *buf, size_t len);
 void JS_DetachArrayBuffer(JSContext *ctx, JSValueConst obj);
 JS_BOOL JS_IsArrayBuffer(JSValueConst obj);
@@ -852,7 +852,7 @@ typedef enum JSTypedArrayEnum {
 } JSTypedArrayEnum;
 
 JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValueConst *argv,
-                         JSTypedArrayEnum array_type);
+                               JSTypedArrayEnum array_type);
 JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValueConst obj,
                                size_t *pbyte_offset,
                                size_t *pbyte_length,
diff --git a/tart_module.c b/tart_module.c
@@ -276,7 +276,7 @@ static JSValue js_talercrypto_decode_crock(JSContext *ctx, JSValue this_val,
   if (JS_IsException(abuf)) {
     goto exception;
   }
-  ret_val = JS_NewTypedArray(ctx, abuf, 1);
+  ret_val = JS_NewTypedArraySimple(ctx, abuf, 1);
 done:
   JS_FreeCString(ctx, enc);
   if (uout) {
@@ -405,7 +405,7 @@ static JSValue make_js_ta_copy(JSContext *ctx, uint8_t *data, size_t size)
   if (JS_IsException(array_buf)) {
     return JS_EXCEPTION;
   }
-  return JS_NewTypedArray(ctx, array_buf, 1);
+  return JS_NewTypedArraySimple(ctx, array_buf, 1);
 }
 
 /**
@@ -436,7 +436,7 @@ static JSValue make_js_ta_mpi(JSContext *ctx, const mbedtls_mpi *v)
         ret_val = JS_EXCEPTION;
         goto cleanup;
     }
-    ret_val = JS_NewTypedArray(ctx, array_buf, 1);
+    ret_val = JS_NewTypedArraySimple(ctx, array_buf, 1);
 cleanup:
     if (buf) {
         free(buf);
@@ -1941,7 +1941,7 @@ static int extract_result_row(JSContext *ctx, sqlite3_stmt *stmt, JSValueConst t
             const uint8_t *blobdata = sqlite3_column_blob(stmt, i);
             size_t bloblen = sqlite3_column_bytes(stmt, i);
             abuf = JS_NewArrayBufferCopy(ctx, blobdata, bloblen);
-            JS_SetPropertyStr(ctx, target, colname, JS_NewTypedArray(ctx, abuf, 1));
+            JS_SetPropertyStr(ctx, target, colname, JS_NewTypedArraySimple(ctx, abuf, 1));
             break;
         }
         case SQLITE_NULL: