Skip to content

Commit ebe660e

Browse files
committed
---
yaml --- r: 44388 b: refs/heads/master c: 44b80ed h: refs/heads/master v: v3
1 parent 579fc3c commit ebe660e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 70185fdcc22e2cd11ee5d6171395f3c223bc21e6
2+
refs/heads/master: 44b80ed0d6de641cd95a8b9d0b8f8844ea46accf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
55
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/libcore/os.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ pub fn last_os_error() -> ~str {
831831

832832
// GNU libc provides a non-compliant version of strerror_r by default
833833
// and requires macros to instead use the POSIX compliant variant.
834-
// So instead we just use __xpg_strerror_r which is always POSIX compliant
834+
// So we just use __xpg_strerror_r which is always POSIX compliant
835835
#[cfg(target_os = "linux")]
836836
fn strerror_r(errnum: c_int, buf: *c_char, buflen: size_t) -> c_int {
837837
#[nolink]
@@ -884,7 +884,8 @@ pub fn last_os_error() -> ~str {
884884
let res = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
885885
FORMAT_MESSAGE_IGNORE_INSERTS,
886886
ptr::mut_null(), err, langId,
887-
&mut buf[0], TMPBUF_SZ as DWORD, ptr::null());
887+
&mut buf[0], TMPBUF_SZ as DWORD,
888+
ptr::null());
888889
if res == 0 {
889890
die!(fmt!("[%?] FormatMessage failure", errno()));
890891
}

0 commit comments

Comments
 (0)