From a76b07a802ddddcb1ac5791de73554f1e553bd0f Mon Sep 17 00:00:00 2001 From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Date: Tue, 4 Jul 2023 01:18:13 -0700 Subject: cleanup --- src/napi/napi.zig | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/napi/napi.zig b/src/napi/napi.zig index 92b03aef0..5caef4547 100644 --- a/src/napi/napi.zig +++ b/src/napi/napi.zig @@ -339,9 +339,11 @@ inline fn maybeAppendNull(ptr: anytype, doit: bool) void { ptr.* = 0; } } -pub export fn napi_get_value_string_latin1(env: napi_env, value: napi_value, buf_ptr: [*c]u8, bufsize: usize, result_ptr: ?*usize) napi_status { +pub export fn napi_get_value_string_latin1(env: napi_env, value: napi_value, buf_ptr_: ?[*:0]c_char, bufsize: usize, result_ptr: ?*usize) napi_status { log("napi_get_value_string_latin1", .{}); defer value.ensureStillAlive(); + var buf_ptr = @ptrCast(?[*:0]u8, buf_ptr_); + const str = value.toBunString(env); var buf = buf_ptr orelse { if (result_ptr) |result| { @@ -362,8 +364,8 @@ pub export fn napi_get_value_string_latin1(env: napi_env, value: napi_value, buf var buf_ = buf[0..bufsize]; - if (bufsize == 0) { - buf_ = bun.sliceTo(buf_ptr, 0); + if (bufsize == NAPI_AUTO_LENGTH) { + buf_ = bun.sliceTo(buf_ptr.?, 0); if (buf_.len == 0) { if (result_ptr) |result| { result.* = 0; @@ -372,7 +374,7 @@ pub export fn napi_get_value_string_latin1(env: napi_env, value: napi_value, buf } } const written = str.encodeInto(buf_, .latin1) catch unreachable; - const max_buf_len = if (bufsize == 0) buf_.len else bufsize; + const max_buf_len = buf_.len; if (result_ptr) |result| { result.* = written; @@ -391,7 +393,7 @@ pub export fn napi_get_value_string_latin1(env: napi_env, value: napi_value, buf /// If buf is NULL, this method returns the length of the string (in bytes) /// via the result parameter. /// The result argument is optional unless buf is NULL. -pub extern fn napi_get_value_string_utf8(env: napi_env, value: napi_value, buf_ptr: [*c]u8, bufsize: usize, result_ptr: ?*usize) napi_status ; +pub extern fn napi_get_value_string_utf8(env: napi_env, value: napi_value, buf_ptr: [*c]u8, bufsize: usize, result_ptr: ?*usize) napi_status; pub export fn napi_get_value_string_utf16(env: napi_env, value: napi_value, buf_ptr: ?[*]char16_t, bufsize: usize, result_ptr: ?*usize) napi_status { log("napi_get_value_string_utf16", .{}); defer value.ensureStillAlive(); @@ -415,8 +417,8 @@ pub export fn napi_get_value_string_utf16(env: napi_env, value: napi_value, buf_ var buf_ = buf[0..bufsize]; - if (bufsize == 0) { - buf_ = bun.sliceTo(buf_ptr, 0); + if (bufsize == NAPI_AUTO_LENGTH) { + buf_ = bun.sliceTo(@ptrCast([*:0]u16, buf_ptr.?), 0); if (buf_.len == 0) { if (result_ptr) |result| { result.* = 0; @@ -425,7 +427,7 @@ pub export fn napi_get_value_string_utf16(env: napi_env, value: napi_value, buf_ } } - const max_buf_len = if (bufsize == 0) buf_.len else bufsize; + const max_buf_len = buf_.len; const written = (str.encodeInto(std.mem.sliceAsBytes(buf_), .utf16le) catch unreachable) >> 1; if (result_ptr) |result| { -- cgit v1.2.3 ttp-lowercase-headers'>derrick/fix/http-lowercase-headers Unnamed repository; edit this file 'description' to name the repository.
aboutsummaryrefslogtreecommitdiff
path: root/src/api/demo/styles/Home.module.css (unfollow)
AgeCommit message (Collapse)AuthorFilesLines
2021-10-031% perf improvements on Linuxjarred/linuxGravatar Jarred SUmner 1-0/+1
2021-10-03Add Three.js benchmarkGravatar Jarred SUmner 5-14/+33
2021-10-02Linux works now.Gravatar Jarred SUmner 21-100/+320
2021-10-01Add support for INotify-based filesystem watcherGravatar Jarred Sumner 6-93/+287
2021-10-01Build stuffGravatar Jarred SUmner 9-1371/+71
2021-10-01Bump webkitGravatar Jarred Sumner 1-0/+0
2021-10-01Split out the macOS specific partsGravatar Jarred Sumner 4-207/+238
2021-09-30Update README.mdGravatar Jarred Sumner 1-1/+1
2021-09-30Update README.mdGravatar Jarred Sumner 1-1/+1
2021-09-30Update README.mdGravatar Jarred Sumner 1-1/+1
2021-09-30Update README.mdGravatar Jarred Sumner 1-5/+5
2021-09-30Fix up readmeGravatar Jarred Sumner 2-9/+24
2021-09-30Bump versionGravatar Jarred Sumner 3-3/+3
2021-09-30Add a readmeGravatar Jarred Sumner 3-3/+119
2021-09-30Bump build-idbun-v0.0.27jarred/relayGravatar Jarred Sumner 1-1/+1
2021-09-30runtime.versionGravatar Jarred Sumner 1-1/+1
2021-09-30SnapshotsGravatar Jarred Sumner 9-36/+63