rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

from_cstr and from_cstr_len are not unsafe, I think

Browse Source
This commit is contained in:
Tomoki Aonuma
2012-02-13 04:43:47 +09:00
parent 8d29e87056
commit 4d788be80d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcore/str.rs
View File

@@ -194,7 +194,7 @@ Function: from_cstr
Create a Rust string from a null-terminated C string Create a Rust string from a null-terminated C string
*/ */
unsafe fn from_cstr(cstr: sbuf) -> str { fn from_cstr(cstr: sbuf) -> str unsafe {
let start = cstr; let start = cstr;
let curr = start; let curr = start;
let i = 0u; let i = 0u;
@@ -210,7 +210,7 @@ Function: from_cstr_len
Create a Rust string from a C string of the given length Create a Rust string from a C string of the given length
*/ */
unsafe fn from_cstr_len(cstr: sbuf, len: uint) -> str { fn from_cstr_len(cstr: sbuf, len: uint) -> str unsafe {
let buf: [u8] = []; let buf: [u8] = [];
vec::reserve(buf, len + 1u); vec::reserve(buf, len + 1u);
vec::as_buf(buf) {|b| ptr::memcpy(b, cstr, len); } vec::as_buf(buf) {|b| ptr::memcpy(b, cstr, len); }