diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-09-02 16:56:07 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-09-02 22:11:46 -0700 |
| commit | 01b254b411a954ebed24a38f873e02b7f6edd0a6 (patch) | |
| tree | 7eee87e94a52526d2f4828435d256cfd869fb4d9 /src/rt | |
| parent | a1d71995ec20ab03c0ef7f30424162ad0830d781 (diff) | |
| download | rust-01b254b411a954ebed24a38f873e02b7f6edd0a6.tar.gz rust-01b254b411a954ebed24a38f873e02b7f6edd0a6.zip | |
Rename istr-stuff to str in the runtime. Issue #855
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust.cpp | 6 | ||||
| -rw-r--r-- | src/rt/rust_builtin.cpp | 10 | ||||
| -rw-r--r-- | src/rt/rust_util.h | 2 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp index 86a099c0cc2..25fb9331314 100644 --- a/src/rt/rust.cpp +++ b/src/rt/rust.cpp @@ -43,9 +43,9 @@ command_line_args : public kernel_owned<command_line_args> "command line arg interior"); args->fill = args->alloc = sizeof(rust_vec*) * argc; for (int i = 0; i < argc; ++i) { - rust_vec *str = make_istr(kernel, argv[i], - strlen(argv[i]), - "command line arg"); + rust_vec *str = make_str(kernel, argv[i], + strlen(argv[i]), + "command line arg"); ((rust_vec**)&args->data)[i] = str; } } diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 0ed30a8cbf6..a09e7ac1849 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -40,7 +40,7 @@ last_os_error(rust_task *task) { } #endif - rust_vec * st = make_istr(task->kernel, buf, strlen(buf), + rust_vec * st = make_str(task->kernel, buf, strlen(buf), "last_os_error"); #ifdef __WIN32__ LocalFree((HLOCAL)buf); @@ -63,7 +63,7 @@ rust_getcwd(rust_task *task) { return NULL; } - return make_istr(task->kernel, cbuf, strlen(cbuf), "rust_str(getcwd"); + return make_str(task->kernel, cbuf, strlen(cbuf), "rust_str(getcwd"); } extern "C" CDECL @@ -127,7 +127,7 @@ vec_from_buf_shared(rust_task *task, type_desc *ty, } extern "C" CDECL void -rust_istr_push(rust_task* task, rust_vec** sp, uint8_t byte) { +rust_str_push(rust_task* task, rust_vec** sp, uint8_t byte) { size_t fill = (*sp)->fill; reserve_vec(task, sp, fill + 1); (*sp)->data[fill-1] = byte; @@ -329,7 +329,7 @@ rust_list_files(rust_task *task, rust_vec **path) { HANDLE hFind = FindFirstFile((char*)(*path)->data, &FindFileData); if (hFind != INVALID_HANDLE_VALUE) { do { - rust_vec *str = make_istr(task->kernel, FindFileData.cFileName, + rust_vec *str = make_str(task->kernel, FindFileData.cFileName, strlen(FindFileData.cFileName), "list_files_str"); strings.push(str); @@ -341,7 +341,7 @@ rust_list_files(rust_task *task, rust_vec **path) { if (dirp) { struct dirent *dp; while ((dp = readdir(dirp))) { - rust_vec *str = make_istr(task->kernel, dp->d_name, + rust_vec *str = make_str(task->kernel, dp->d_name, strlen(dp->d_name), "list_files_str"); strings.push(str); diff --git a/src/rt/rust_util.h b/src/rt/rust_util.h index dc8eea20f72..25886aef74b 100644 --- a/src/rt/rust_util.h +++ b/src/rt/rust_util.h @@ -189,7 +189,7 @@ inline void reserve_vec(rust_task* task, rust_vec** vpp, size_t size) { } inline rust_vec * -make_istr(rust_kernel* kernel, char* c, size_t strlen, const char* name) { +make_str(rust_kernel* kernel, char* c, size_t strlen, const char* name) { size_t str_fill = strlen + 1; size_t str_alloc = str_fill; rust_vec *str = (rust_vec *) diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 550155a8345..ef215ce68c8 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -47,7 +47,7 @@ rust_file_is_dir rust_get_stdin rust_get_stdout rust_get_stderr -rust_istr_push +rust_str_push rust_list_files rust_process_wait rust_ptr_eq |