From 8d29e8705626e28d3bf96d194dd97311e1967995 Mon Sep 17 00:00:00 2001
From: Tomoki Aonuma <uasi@99cm.org>
Date: Mon, 13 Feb 2012 04:42:10 +0900
Subject: [PATCH] core::str::from_cstr uses from_cstr_len

---
 src/libcore/str.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index d1a606d5177d3..831a96962d41f 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -195,16 +195,14 @@ Function: from_cstr
 Create a Rust string from a null-terminated C string
 */
 unsafe fn from_cstr(cstr: sbuf) -> str {
-    let res = [];
     let start = cstr;
     let curr = start;
     let i = 0u;
     while *curr != 0u8 {
-        vec::push(res, *curr);
         i += 1u;
         curr = ptr::offset(start, i);
     }
-    ret from_bytes(res);
+    ret from_cstr_len(cstr, i);
 }
 
 /*