Skip to content

Commit 4e21d62

Browse files
olsonjefferybrson
authored andcommitted
---
yaml --- r: 51291 b: refs/heads/incoming c: cf82360 h: refs/heads/master i: 51289: 8953c53 51287: 5430336 v: v3
1 parent 41df724 commit 4e21d62

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: a04ba76f8e436d1c1919b0a97bc91190c7252d7a
9+
refs/heads/incoming: cf82360e729eb941c2de080fbcf715dea3417edd
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/os.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ pub fn list_dir(p: &Path) -> ~[~str] {
685685
log(debug, "os::list_dir -- BEFORE OPENDIR");
686686
let dir_ptr = opendir(input_ptr);
687687
if (dir_ptr as uint != 0) {
688-
log(debug, "os::list_dir -- opendir() SUCCESS");
688+
log(debug, "os::list_dir -- opendir() SUCCESS");
689689
let mut entry_ptr = readdir(dir_ptr);
690690
while (entry_ptr as uint != 0) {
691691
strings.push(
@@ -697,9 +697,11 @@ pub fn list_dir(p: &Path) -> ~[~str] {
697697
closedir(dir_ptr);
698698
}
699699
else {
700-
log(debug, "os::list_dir -- opendir() FAILURE");
700+
log(debug, "os::list_dir -- opendir() FAILURE");
701701
}
702-
log(debug, fmt!("os::list_dir -- AFTER ITERATION -- # of results: %?", strings.len()));
702+
log(debug,
703+
fmt!("os::list_dir -- AFTER -- #: %?",
704+
strings.len()));
703705
strings
704706
}
705707
#[cfg(windows)]

0 commit comments

Comments
 (0)