Skip to content

Commit 1a64b6b

Browse files
committed
Merge pull request godotengine#106913 from Ivorforce/string-resize-uninitialized
Rename `String::resize` to `resize_uninitialized`
2 parents e0072e9 + b13a0e1 commit 1a64b6b

26 files changed

+103
-98
lines changed

core/config/project_settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ Error ProjectSettings::_load_settings_binary(const String &p_path) {
824824
for (uint32_t i = 0; i < count; i++) {
825825
uint32_t slen = f->get_32();
826826
CharString cs;
827-
cs.resize(slen + 1);
827+
cs.resize_uninitialized(slen + 1);
828828
cs[slen] = 0;
829829
f->get_buffer((uint8_t *)cs.ptr(), slen);
830830
String key = String::utf8(cs.ptr(), slen);

core/extension/gdextension_interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ static void gdextension_string_operator_plus_eq_c32str(GDExtensionStringPtr p_se
10451045

10461046
static GDExtensionInt gdextension_string_resize(GDExtensionStringPtr p_self, GDExtensionInt p_length) {
10471047
String *self = (String *)p_self;
1048-
return (*self).resize(p_length);
1048+
return (*self).resize_uninitialized(p_length);
10491049
}
10501050

10511051
static void gdextension_string_name_new_with_latin1_chars(GDExtensionUninitializedStringNamePtr r_dest, const char *p_contents, GDExtensionBool p_is_static) {

core/io/file_access.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ bool FileAccess::store_pascal_string(const String &p_string) {
769769
String FileAccess::get_pascal_string() {
770770
uint32_t sl = get_32();
771771
CharString cs;
772-
cs.resize(sl + 1);
772+
cs.resize_uninitialized(sl + 1);
773773
get_buffer((uint8_t *)cs.ptr(), sl);
774774
cs[sl] = 0;
775775

core/io/file_access_pack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
306306
for (int i = 0; i < file_count; i++) {
307307
uint32_t sl = f->get_32();
308308
CharString cs;
309-
cs.resize(sl + 1);
309+
cs.resize_uninitialized(sl + 1);
310310
f->get_buffer((uint8_t *)cs.ptr(), sl);
311311
cs[sl] = 0;
312312

core/io/plist.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ Ref<PListNode> PList::read_bplist_obj(Ref<FileAccess> p_file, uint64_t p_offset_
553553
marker_size = read_bplist_var_size_int(p_file, std::pow(2, ext));
554554
}
555555
node->data_type = PL_NODE_TYPE_STRING;
556-
node->data_string.resize(marker_size + 1);
556+
node->data_string.resize_uninitialized(marker_size + 1);
557557
p_file->get_buffer(reinterpret_cast<uint8_t *>(node->data_string.ptrw()), marker_size);
558558
} break;
559559
case 0x60: {
@@ -562,7 +562,7 @@ Ref<PListNode> PList::read_bplist_obj(Ref<FileAccess> p_file, uint64_t p_offset_
562562
marker_size = read_bplist_var_size_int(p_file, std::pow(2, ext));
563563
}
564564
Char16String cs16;
565-
cs16.resize(marker_size + 1);
565+
cs16.resize_uninitialized(marker_size + 1);
566566
for (uint64_t i = 0; i < marker_size; i++) {
567567
cs16[i] = BSWAP16(p_file->get_16());
568568
}

core/io/resource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ String Resource::generate_scene_unique_id() {
143143
static constexpr uint32_t char_count = ('z' - 'a');
144144
static constexpr uint32_t base = char_count + ('9' - '0');
145145
String id;
146-
id.resize(characters + 1);
146+
id.resize_uninitialized(characters + 1);
147147
char32_t *ptr = id.ptrw();
148148
for (uint32_t i = 0; i < characters; i++) {
149149
uint32_t c = random_num % base;

core/io/resource_uid.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ String ResourceUID::id_to_text(ID p_id) const {
6666

6767
// tmp_size + uid:// (6) + 1 for null.
6868
String txt;
69-
txt.resize(tmp_size + 7);
69+
txt.resize_uninitialized(tmp_size + 7);
7070

7171
char32_t *p = txt.ptrw();
7272
p[0] = 'u';
@@ -273,7 +273,7 @@ Error ResourceUID::load_from_cache(bool p_reset) {
273273
int64_t id = f->get_64();
274274
int32_t len = f->get_32();
275275
Cache c;
276-
c.cs.resize(len + 1);
276+
c.cs.resize_uninitialized(len + 1);
277277
ERR_FAIL_COND_V(c.cs.size() != len + 1, ERR_FILE_CORRUPT); // Out of memory.
278278
c.cs[len] = 0;
279279
int32_t rl = f->get_buffer((uint8_t *)c.cs.ptrw(), len);
@@ -333,7 +333,7 @@ String ResourceUID::get_path_from_cache(Ref<FileAccess> &p_cache_file, const Str
333333
for (uint32_t i = 0; i < entry_count; i++) {
334334
int64_t id = p_cache_file->get_64();
335335
int32_t len = p_cache_file->get_32();
336-
cs.resize(len + 1);
336+
cs.resize_uninitialized(len + 1);
337337
ERR_FAIL_COND_V(cs.size() != len + 1, String());
338338
cs[len] = 0;
339339
int32_t rl = p_cache_file->get_buffer((uint8_t *)cs.ptrw(), len);

core/math/color.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void _append_hex(float p_val, char32_t *string) {
119119

120120
String Color::to_html(bool p_alpha) const {
121121
String txt;
122-
txt.resize(p_alpha ? 9 : 7);
122+
txt.resize_uninitialized(p_alpha ? 9 : 7);
123123
char32_t *ptr = txt.ptrw();
124124

125125
_append_hex(r, ptr + 0);

core/string/optimized_translation.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,20 @@ void OptimizedTranslation::generate(const Ref<Translation> &p_from) {
8282

8383
if (ps.orig_len != 0) {
8484
CharString dst_s;
85-
dst_s.resize(src_s.size());
85+
dst_s.resize_uninitialized(src_s.size());
8686
int ret = smaz_compress(src_s.get_data(), src_s.size(), dst_s.ptrw(), src_s.size());
8787
if (ret >= src_s.size()) {
8888
//if compressed is larger than original, just use original
8989
ps.orig_len = src_s.size();
9090
ps.compressed = src_s;
9191
} else {
92-
dst_s.resize(ret);
92+
dst_s.resize_uninitialized(ret);
9393
//ps.orig_len=;
9494
ps.compressed = dst_s;
9595
}
9696
} else {
9797
ps.orig_len = 1;
98-
ps.compressed.resize(1);
98+
ps.compressed.resize_uninitialized(1);
9999
ps.compressed[0] = 0;
100100
}
101101

@@ -256,7 +256,7 @@ StringName OptimizedTranslation::get_message(const StringName &p_src_text, const
256256
return String::utf8(&sptr[bucket.elem[idx].str_offset], bucket.elem[idx].uncomp_size);
257257
} else {
258258
CharString uncomp;
259-
uncomp.resize(bucket.elem[idx].uncomp_size + 1);
259+
uncomp.resize_uninitialized(bucket.elem[idx].uncomp_size + 1);
260260
smaz_decompress(&sptr[bucket.elem[idx].str_offset], bucket.elem[idx].comp_size, uncomp.ptrw(), bucket.elem[idx].uncomp_size);
261261
return String::utf8(uncomp.get_data());
262262
}
@@ -282,7 +282,7 @@ Vector<String> OptimizedTranslation::get_translated_message_list() const {
282282
msgs.push_back(rstr);
283283
} else {
284284
CharString uncomp;
285-
uncomp.resize(bucket.elem[j].uncomp_size + 1);
285+
uncomp.resize_uninitialized(bucket.elem[j].uncomp_size + 1);
286286
smaz_decompress(&sptr[bucket.elem[j].str_offset], bucket.elem[j].comp_size, uncomp.ptrw(), bucket.elem[j].uncomp_size);
287287
String rstr = String::utf8(uncomp.get_data());
288288
msgs.push_back(rstr);

core/string/string_buffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ StringBuffer<SHORT_BUFFER_SIZE> &StringBuffer<SHORT_BUFFER_SIZE>::reserve(int p_
123123
}
124124

125125
bool need_copy = string_length > 0 && buffer.is_empty();
126-
buffer.resize(next_power_of_2((uint32_t)p_size));
126+
buffer.resize_uninitialized(next_power_of_2((uint32_t)p_size));
127127
if (need_copy) {
128128
memcpy(buffer.ptrw(), short_buffer, string_length * sizeof(char32_t));
129129
}
@@ -142,7 +142,7 @@ String StringBuffer<SHORT_BUFFER_SIZE>::as_string() {
142142
if (buffer.is_empty()) {
143143
return String(short_buffer);
144144
} else {
145-
buffer.resize(string_length + 1);
145+
buffer.resize_uninitialized(string_length + 1);
146146
return buffer;
147147
}
148148
}

0 commit comments

Comments
 (0)