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

Merge pull request #4436 from miere43/patch-2

Browse source 
Remove line breaks in OSError messages (Windows)
This commit is contained in:
Andreas Rumpf 2016-07-02 17:25:12 +02:00 • committed by GitHub
commit a9d86d16ab
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pure/os.nim
View file

@ -66,13 +66,13 @@ proc osErrorMsg*(): string {.rtl, extern: "nos$1", deprecated.} =
if err != 0'i32: if err != 0'i32:
when useWinUnicode: when useWinUnicode:
var msgbuf: WideCString var msgbuf: WideCString
if formatMessageW(0x00000100 or 0x00001000 or 0x00000200, if formatMessageW(0x00000100 or 0x00001000 or 0x00000200 or 0x000000FF,
nil, err, 0, addr(msgbuf), 0, nil) != 0'i32: nil, err, 0, addr(msgbuf), 0, nil) != 0'i32:
result = $msgbuf result = $msgbuf
if msgbuf != nil: localFree(cast[pointer](msgbuf)) if msgbuf != nil: localFree(cast[pointer](msgbuf))
else: else:
var msgbuf: cstring var msgbuf: cstring
if formatMessageA(0x00000100 or 0x00001000 or 0x00000200, if formatMessageA(0x00000100 or 0x00001000 or 0x00000200 or 0x000000FF,
nil, err, 0, addr(msgbuf), 0, nil) != 0'i32: nil, err, 0, addr(msgbuf), 0, nil) != 0'i32:
result = $msgbuf result = $msgbuf
if msgbuf != nil: localFree(msgbuf) if msgbuf != nil: localFree(msgbuf)