Remove Allocator stuff
This commit is contained in:
@@ -115,14 +115,14 @@ os_write_file(String filename, String filecontent){
|
||||
}
|
||||
|
||||
function String
|
||||
os_read_file(Allocator *a, String name){
|
||||
os_read_file(Arena *a, String name){
|
||||
String result = {0};
|
||||
FILE *f = fopen((char *)name.str, "rb");
|
||||
if(f){
|
||||
fseek(f, 0, SEEK_END);
|
||||
result.len = ftell(f);
|
||||
fseek(f, 0, SEEK_SET);
|
||||
result.str = (U8 *)exp_alloc(a, result.len + 1);
|
||||
result.str = (U8 *)arena_push_size(a, result.len + 1);
|
||||
fread(result.str, result.len, 1, f);
|
||||
fclose(f);
|
||||
result.str[result.len] = 0;
|
||||
@@ -132,7 +132,7 @@ os_read_file(Allocator *a, String name){
|
||||
}
|
||||
|
||||
function String
|
||||
os_get_working_dir(Allocator *a){
|
||||
os_get_working_dir(Arena *a){
|
||||
wchar_t buffer[2048];
|
||||
DWORD written = GetCurrentDirectoryW(2048, buffer);
|
||||
assert(written != 0);
|
||||
@@ -143,7 +143,7 @@ os_get_working_dir(Allocator *a){
|
||||
}
|
||||
|
||||
function String
|
||||
os_get_exe_dir(Allocator *a){
|
||||
os_get_exe_dir(Arena *a){
|
||||
wchar_t buffer[2048];
|
||||
DWORD written = GetModuleFileNameW(0, buffer, 2048);
|
||||
assert(written != 0);
|
||||
@@ -158,11 +158,11 @@ os_get_exe_dir(Allocator *a){
|
||||
}
|
||||
|
||||
function String
|
||||
os_get_absolute_path(Allocator *a, String path){
|
||||
os_get_absolute_path(Arena *a, String path){
|
||||
Scratch scratch(a);
|
||||
String16 path16 = string8_to_string16(scratch, path);
|
||||
|
||||
wchar_t *buffer = exp_alloc_array(scratch, wchar_t, 2048);
|
||||
wchar_t *buffer = arena_push_array(scratch, wchar_t, 2048);
|
||||
DWORD written = GetFullPathNameW((wchar_t *)path16.str, 2048, buffer, 0);
|
||||
if(written == 0) return {};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user