diff --git a/src/asset_cache.c b/src/asset_cache.c index 44fe093c..afb7d0d0 100644 --- a/src/asset_cache.c +++ b/src/asset_cache.c @@ -138,7 +138,7 @@ struct asset *asset_cache_touch(struct string key, u64 hash, b32 *is_first_touch { /* Copy key to store */ struct asset_cache_store store = asset_cache_store_open(); - key_stored = string_cpy(store.arena, key); + key_stored = string_copy(store.arena, key); asset_cache_store_close(&store); } /* Initialize asset data */ diff --git a/src/game.c b/src/game.c index c2333e01..ab960523 100644 --- a/src/game.c +++ b/src/game.c @@ -141,7 +141,7 @@ INTERNAL void publish_game_tick(void) __prof; sys_mutex_lock(&L.published_tick_mutex); L.tick.published_ts = sys_timestamp(); - tick_cpy(&L.published_tick, &L.tick); + tick_copy(&L.published_tick, &L.tick); sys_mutex_unlock(&L.published_tick_mutex); } @@ -568,7 +568,7 @@ void game_shutdown(void) void game_get_latest_tick(struct tick *dest) { sys_mutex_lock(&L.published_tick_mutex); - tick_cpy(dest, &L.published_tick); + tick_copy(dest, &L.published_tick); sys_mutex_unlock(&L.published_tick_mutex); } diff --git a/src/json.c b/src/json.c index 0a755445..a44ea073 100644 --- a/src/json.c +++ b/src/json.c @@ -666,7 +666,7 @@ const struct json_ir *json_parse(struct arena *arena, struct buffer bytes, struc if (error) { struct string err_msg = p.error.len > 0 ? p.error : STR("Parsing error"); *error = arena_push(arena, struct string); - **error = string_cpy(arena, err_msg); + **error = string_copy(arena, err_msg); } } @@ -707,7 +707,7 @@ INTERNAL struct json_val json_format_internal(struct arena *arena, const struct u32 index = 0; while (cur) { entries[index] = (struct json_object_entry) { - .key = string_cpy(arena, cur->key), + .key = string_copy(arena, cur->key), .value = json_format_internal(arena, cur) }; @@ -757,7 +757,7 @@ INTERNAL struct json_val json_format_internal(struct arena *arena, const struct case JSON_TYPE_STRING: { struct string *str = arena_push(arena, struct string); - *str = string_cpy(arena, ir->val.string); + *str = string_copy(arena, ir->val.string); val = (struct json_val){ .type = JSON_TYPE_STRING, .val.string = str @@ -815,7 +815,7 @@ const struct json_val *json_parse_and_format(struct arena *arena, struct buffer if (error) { /* Copy error message out of scratch */ *error = arena_push(arena, struct string); - **error = string_cpy(arena, *error_temp); + **error = string_copy(arena, *error_temp); } } else { root_val = arena_push(arena, struct json_val); @@ -931,38 +931,38 @@ INTERNAL struct string json_dump_to_string_internal(struct arena *arena, const s u32 count = val->child_count; u32 last_entry_index = (u32)max_u64(count, 1) - 1; const struct json_object_entry *entries = get_object_entries(val); - final_len += string_cpy(arena, STR("{\n")).len; + final_len += string_copy(arena, STR("{\n")).len; for (u32 i = 0; i < count; ++i) { const struct json_object_entry *entry = &entries[i]; struct string value_str = json_dump_to_string_internal(arena, &entry->key, &entry->value, indent, level + 1); final_len += value_str.len; if (i != last_entry_index) { - final_len += string_cpy(arena, STR(",\n")).len; + final_len += string_copy(arena, STR(",\n")).len; } else { - final_len += string_cpy(arena, STR("\n")).len; + final_len += string_copy(arena, STR("\n")).len; } } final_len += string_repeat(arena, STR(" "), indent_len).len; - final_len += string_cpy(arena, STR("}")).len; + final_len += string_copy(arena, STR("}")).len; } break; case JSON_TYPE_ARRAY: { u32 count = val->child_count; u32 last_entry_index = (u32)max_u64(count, 1) - 1; - final_len += string_cpy(arena, STR("[\n")).len; + final_len += string_copy(arena, STR("[\n")).len; for (u32 i = 0; i < count; ++i) { const struct json_val *child = &val->val.array_children[i]; struct string value_str = json_dump_to_string_internal(arena, NULL, child, indent, level + 1); final_len += value_str.len; if (i != last_entry_index) { - final_len += string_cpy(arena, STR(",\n")).len; + final_len += string_copy(arena, STR(",\n")).len; } else { - final_len += string_cpy(arena, STR("\n")).len; + final_len += string_copy(arena, STR("\n")).len; } } final_len += string_repeat(arena, STR(" "), indent_len).len; - final_len += string_cpy(arena, STR("]")).len; + final_len += string_copy(arena, STR("]")).len; } break; case JSON_TYPE_STRING: { @@ -977,16 +977,16 @@ INTERNAL struct string json_dump_to_string_internal(struct arena *arena, const s if (string_ends_with(num_str, precision_str)) { num_str.len -= precision_str.len; } - final_len += string_cpy(arena, num_str).len; + final_len += string_copy(arena, num_str).len; } break; case JSON_TYPE_NULL: { - final_len += string_cpy(arena, STR("null")).len; + final_len += string_copy(arena, STR("null")).len; } break; case JSON_TYPE_BOOL: { struct string str = val->val.boolean ? STR("true") : STR("false"); - final_len += string_cpy(arena, str).len; + final_len += string_copy(arena, str).len; } break; case JSON_TYPE_INVALID: { diff --git a/src/renderer_d3d11.c b/src/renderer_d3d11.c index b727a85a..62715ce6 100644 --- a/src/renderer_d3d11.c +++ b/src/renderer_d3d11.c @@ -282,7 +282,7 @@ INTERNAL b32 handle_eq(struct renderer_handle h1, struct renderer_handle h2) INTERNAL void process_shader_compilation_error(ID3DBlob *error_blob) { struct temp_arena scratch = scratch_begin_no_conflict(); - struct string error_prefix = string_cpy(scratch.arena, STR("Failed to compile shader:\n")); + struct string error_prefix = string_copy(scratch.arena, STR("Failed to compile shader:\n")); if (error_blob) { char *compile_error_cstr = (char *)ID3D10Blob_GetBufferPointer(error_blob); struct string error_msg = string_cat(scratch.arena, error_prefix, string_from_cstr(compile_error_cstr)); diff --git a/src/sheet.c b/src/sheet.c index 6fdfe64a..d85045ef 100644 --- a/src/sheet.c +++ b/src/sheet.c @@ -100,7 +100,7 @@ INTERNAL struct sheet sheet_from_ase(struct arena *arena, struct ase_decode_shee if (ase.num_tags > 0) { sheet.tags_dict = fixed_dict_init(arena, (u64)(ase.num_tags * SHEET_LOOKUP_TABLE_CAPACITY_FACTOR)); for (struct ase_tag *ase_tag = ase.tag_head; ase_tag; ase_tag = ase_tag->next) { - struct string name = string_cpy(arena, ase_tag->name); + struct string name = string_copy(arena, ase_tag->name); struct sheet_tag *tag = arena_push(arena, struct sheet_tag); *tag = (struct sheet_tag) { .name = name, diff --git a/src/string.c b/src/string.c index 33bd59ab..49bd24b1 100644 --- a/src/string.c +++ b/src/string.c @@ -86,7 +86,7 @@ struct string string_from_int(struct arena *arena, i64 n, u32 base) struct string string_from_ptr(struct arena *arena, void *ptr) { - struct string prepend = string_cpy(arena, STR("0x")); + struct string prepend = string_copy(arena, STR("0x")); struct string uint_str = string_from_uint(arena, (u64)ptr, 16); return (struct string) { .len = prepend.len + uint_str.len, @@ -107,7 +107,7 @@ struct string string_from_float(struct arena *arena, f64 f, u32 precision) b32 nan = f != f; if (nan) { - final_len += string_cpy(arena, STR("NaN")).len; + final_len += string_copy(arena, STR("NaN")).len; } else if (too_large) { string_from_char(arena, '?'); ++final_len; @@ -150,7 +150,7 @@ struct string string_from_float(struct arena *arena, f64 f, u32 precision) * String operations * ========================== */ -struct string string_cpy(struct arena *arena, struct string src) +struct string string_copy(struct arena *arena, struct string src) { struct string str = { .len = src.len, @@ -276,7 +276,7 @@ struct string string_indent(struct arena *arena, struct string str, u32 indent) string_from_char(arena, ' '); ++final_len; } - string_cpy(arena, piece); + string_copy(arena, piece); final_len += piece.len; if (i < split.count - 1) { string_from_char(arena, '\n'); @@ -466,7 +466,7 @@ struct string string_formatv(struct arena *arena, struct string fmt, va_list arg } break; case FMT_TYPE_STR: { - parsed_str = string_cpy(arena, arg.value.string); + parsed_str = string_copy(arena, arg.value.string); } break; case FMT_TYPE_UINT: { @@ -492,14 +492,14 @@ struct string string_formatv(struct arena *arena, struct string fmt, va_list arg case FMT_TYPE_END: { /* Unexpected end. Not enough FMT args passed to function. */ ASSERT(false); - parsed_str = string_cpy(arena, STR("")); + parsed_str = string_copy(arena, STR("")); no_more_args = true; } break; case FMT_TYPE_NONE: { /* Unknown format type */ ASSERT(false); - parsed_str = string_cpy(arena, STR("")); + parsed_str = string_copy(arena, STR("")); no_more_args = true; } break; } diff --git a/src/string.h b/src/string.h index 59bab997..1d162f72 100644 --- a/src/string.h +++ b/src/string.h @@ -20,7 +20,7 @@ struct string string_from_float(struct arena *arena, f64 f, u32 precision); * String operations * ========================== */ -struct string string_cpy(struct arena *arena, struct string src); +struct string string_copy(struct arena *arena, struct string src); struct string string_from_cstr(char *cstr); struct string string_from_cstr_len(char *cstr, u64 len); struct string string_repeat(struct arena *arena, struct string src, u64 count); diff --git a/src/sys_win32.c b/src/sys_win32.c index ae8d4a0c..3b66bf1f 100644 --- a/src/sys_win32.c +++ b/src/sys_win32.c @@ -469,7 +469,7 @@ struct sys_dir_iter_info *sys_dir_iter_next(struct arena *arena, struct sys_dir_ } else { info = arena_push_zero(arena, struct sys_dir_iter_info); info->is_dir = find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; - info->file_name = string_cpy(arena, file_name); + info->file_name = string_copy(arena, file_name); } } diff --git a/src/tick.c b/src/tick.c index 23454046..1376ffb1 100644 --- a/src/tick.c +++ b/src/tick.c @@ -1,6 +1,6 @@ #include "tick.h" -void tick_cpy(struct tick *dst, struct tick *src) +void tick_copy(struct tick *dst, struct tick *src) { __prof; /* Copy non-entity fields */ diff --git a/src/tick.h b/src/tick.h index 1e479434..ed8d8608 100644 --- a/src/tick.h +++ b/src/tick.h @@ -17,6 +17,6 @@ struct tick { struct entity entities[MAX_ENTITIES]; }; -void tick_cpy(struct tick *dst, struct tick *src); +void tick_copy(struct tick *dst, struct tick *src); #endif diff --git a/src/user.c b/src/user.c index 1a6a0c55..8786b590 100644 --- a/src/user.c +++ b/src/user.c @@ -490,7 +490,7 @@ INTERNAL void user_update(void) sys_timestamp_t tick_publish_delta = t1->published_ts - t0->published_ts; f32 tick_blend = (f32)((sys_timestamp() - t1->published_ts) / (f64)tick_publish_delta); - tick_cpy(tick, t1); + tick_copy(tick, t1); #if 1 /* Blend time */