jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes ptr to cstring warnings[backport] (#20848)

Browse source 
* fix =#13790 ptr char (+friends) should not implicitly convert to cstring

* Apply suggestions from code review

* first round; compiles on windows

* nimPreviewSlimSystem

* conversion is unsafe, cast needed

* fixes more tests

* fixes asyncnet

* another try another error

* last one

* true

* one more

* why bugs didn't show at once

* add `nimPreviewCstringConversion` switch

* typo

* fixes ptr to cstring warnings[backport]

* add fixes

Co-authored-by: xflywind <43030857+xflywind@users.noreply.github.com>
This commit is contained in:
ringabout 2022-11-16 17:22:51 +08:00 • committed by GitHub
commit 06cd15663d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/std/private/oscommon.nim
View file

@ -63,7 +63,7 @@ when defined(windows) and not weirdTarget:
template findNextFile*(a, b: untyped): untyped = findNextFileA(a, b)
template getCommandLine*(): untyped = getCommandLineA()
template getFilename*(f: untyped): untyped = $cstring(addr f.cFileName)
template getFilename*(f: untyped): untyped = $cast[cstring](addr f.cFileName)
proc skipFindData*(f: WIN32_FIND_DATA): bool {.inline.} =
# Note - takes advantage of null delimiter in the cstring

2
lib/std/private/osdirs.nim
View file

@ -231,7 +231,7 @@ iterator walkDir*(dir: string; relative = false, checkDir = false,
while true:
var x = readdir(d)
if x == nil: break
var y = $cstring(addr x.d_name)
var y = $cast[cstring](addr x.d_name)
if y != "." and y != "..":
var s: Stat
let path = dir / y

2
lib/std/private/strimpl.nim
View file

@ -106,7 +106,7 @@ func find*(s, sub: cstring, start: Natural = 0, last = 0): int =
if sub.len > s.len - start: return -1
if sub.len == 1: return find(s, sub[0], start, last)
if last == 0 and s.len > start:
let found = c_strstr(s[start].unsafeAddr, sub)
let found = c_strstr(cast[cstring](s[start].unsafeAddr), sub)
if not found.isNil:
result = cast[ByteAddress](found) -% cast[ByteAddress](s)
else:

4
lib/std/private/win_setenv.nim
View file

@ -94,9 +94,9 @@ else:
var buf = newSeq[char](requiredSize + 1)
let buf2 = buf[0].addr
if wcstombs(buf2, wideName, csize_t(requiredSize + 1)) != high(csize_t):
var ptrToEnv = c_getenv(buf2)
var ptrToEnv = c_getenv(cast[cstring](buf2))
ptrToEnv[0] = '\0'
ptrToEnv = c_getenv(buf2)
ptrToEnv = c_getenv(cast[cstring](buf2))
ptrToEnv[1] = '='
# And now, we have to update the outer environment to have a proper empty value.