diff options
author | bptato <nincsnevem662@gmail.com> | 2024-09-15 18:42:52 +0200 |
---|---|---|
committer | bptato <nincsnevem662@gmail.com> | 2024-09-15 19:13:08 +0200 |
commit | 7656357382d603243c6b3e5f80557a23e4666313 (patch) | |
tree | ac4123261ea0b007cf9212d23635ea5f11375bd0 /src | |
parent | b7ac2954a90e44fd727c770c47e8f9706b40004f (diff) | |
download | chawan-7656357382d603243c6b3e5f80557a23e4666313.tar.gz |
blob: make size signed int
it was already being treated as such
Diffstat (limited to 'src')
-rw-r--r-- | src/local/term.nim | 4 | ||||
-rw-r--r-- | src/types/blob.nim | 16 | ||||
-rw-r--r-- | src/types/formdata.nim | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/local/term.nim b/src/local/term.nim index 47d79e54..d9ece88f 100644 --- a/src/local/term.nim +++ b/src/local/term.nim @@ -847,7 +847,7 @@ proc outputSixelImage(term: Terminal; x, y: int; image: CanvasImage; proc outputSixelImage(term: Terminal; x, y: int; image: CanvasImage) = var p = cast[ptr UncheckedArray[char]](image.data.buffer) if image.data.size > 0: - let H = int(image.data.size - 1) + let H = image.data.size - 1 term.outputSixelImage(x, y, image, p.toOpenArray(0, H)) proc outputKittyImage(term: Terminal; x, y: int; image: CanvasImage) = @@ -870,7 +870,7 @@ proc outputKittyImage(term: Terminal; x, y: int; image: CanvasImage) = var i = MaxBytes # transcode to RGB let p = cast[ptr UncheckedArray[uint8]](image.data.buffer) - let L = int(image.data.size) + let L = image.data.size let m = if i < L: '1' else: '0' outs &= ",a=T,f=100,m=" & m & ';' outs.btoa(p.toOpenArray(0, min(L, i) - 1)) diff --git a/src/types/blob.nim b/src/types/blob.nim index cc69fd7c..672163a0 100644 --- a/src/types/blob.nim +++ b/src/types/blob.nim @@ -13,7 +13,7 @@ type DeallocFun = proc(opaque, p: pointer) {.nimcall, raises: [].} Blob* = ref object of RootObj - size* {.jsget.}: uint64 + size* {.jsget.}: int ctype* {.jsget: "type".}: string buffer*: pointer opaque*: pointer @@ -43,7 +43,7 @@ proc swrite*(writer: var BufferedWriter; blob: Blob) = writer.swrite(blob.ctype) writer.swrite(blob.size) if blob.size > 0: - writer.writeData(blob.buffer, int(blob.size)) + writer.writeData(blob.buffer, blob.size) proc sread*(reader: var BufferedReader; blob: var Blob) = var isWebFile: bool @@ -59,7 +59,7 @@ proc sread*(reader: var BufferedReader; blob: var Blob) = reader.sread(blob.size) if blob.size > 0: let buffer = alloc(blob.size) - reader.readData(blob.buffer, int(blob.size)) + reader.readData(blob.buffer, blob.size) blob.buffer = buffer blob.deallocFun = deallocBlob @@ -67,7 +67,7 @@ proc newBlob*(buffer: pointer; size: int; ctype: string; deallocFun: DeallocFun; opaque: pointer = nil): Blob = return Blob( buffer: buffer, - size: uint64(size), + size: size, ctype: ctype, deallocFun: deallocFun, opaque: opaque @@ -119,7 +119,7 @@ proc newWebFile(ctx: JSContext; fileBits: seq[string]; fileName: string; if blobPart.len > 0: copyMem(addr buf[i], unsafeAddr blobPart[0], blobPart.len) i += blobPart.len - file.size = uint64(len) + file.size = len block ctype: for c in options.`type`: if c notin char(0x20)..char(0x7E): @@ -129,15 +129,15 @@ proc newWebFile(ctx: JSContext; fileBits: seq[string]; fileName: string; #TODO File, Blob constructors -proc getSize*(this: Blob): uint64 = +proc getSize*(this: Blob): int = if this.fd.isSome: var statbuf: Stat if fstat(this.fd.get, statbuf) < 0: return 0 - return uint64(statbuf.st_size) + return int(statbuf.st_size) return this.size -proc size*(this: WebFile): uint64 {.jsfget.} = +proc size*(this: WebFile): int {.jsfget.} = return this.getSize() #TODO lastModified diff --git a/src/types/formdata.nim b/src/types/formdata.nim index c57eda10..711ca4dc 100644 --- a/src/types/formdata.nim +++ b/src/types/formdata.nim @@ -111,7 +111,7 @@ proc writeEntry*(stream: DynStream; entry: FormDataEntry; boundary: string) = if n < buf.len: break else: - stream.sendDataLoop(blob.buffer, int(blob.size)) + stream.sendDataLoop(blob.buffer, blob.size) stream.write("\r\n") proc writeEnd*(stream: DynStream; boundary: string) = |