Skip to content

Commit a2578fb

Browse files
livecodepanoslivecodepanos
committed
Updates after Seb's feedback#4
1 parent f5619a1 commit a2578fb

File tree

4 files changed

+18
-22
lines changed

4 files changed

+18
-22
lines changed

‎engine/src/deploy_windows.cpp‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,22 +1115,20 @@ static bool MCWindowsResourcesAddVersionInfo(MCWindowsResources& self, MCArrayRe
11151115
t_file_version = t_product_version = 0;
11161116
if (t_success)
11171117
{
1118-
MCValueRef t_value1, t_value2;
1118+
MCValueRef t_value;
11191119

1120-
if (MCArrayFetchValue(p_info, false, MCNAME("FileVersion"), t_value1))
1120+
if (MCArrayFetchValue(p_info, false, MCNAME("FileVersion"), t_value))
11211121
{
1122-
MCAutoStringRef t_string1;
1123-
/* UNCHECKED */ ctxt . ConvertToString(t_value1, &t_string1);
1124-
t_file_version = MCWindowsVersionInfoParseVersion(*t_string1);
1122+
MCAutoStringRef t_string;
1123+
/* UNCHECKED */ ctxt . ConvertToString(t_value, &t_string);
1124+
t_file_version = MCWindowsVersionInfoParseVersion(*t_string);
11251125
}
1126-
if (MCArrayFetchValue(p_info, false, MCNAME("ProductVersion"), t_value2))
1126+
if (MCArrayFetchValue(p_info, false, MCNAME("ProductVersion"), t_value))
11271127
{
1128-
MCAutoStringRef t_string2;
1129-
/* UNCHECKED */ ctxt . ConvertToString(t_value2, &t_string2);
1130-
t_product_version = MCWindowsVersionInfoParseVersion(*t_string2);
1128+
MCAutoStringRef t_string;
1129+
/* UNCHECKED */ ctxt . ConvertToString(t_value, &t_string);
1130+
t_product_version = MCWindowsVersionInfoParseVersion(*t_string);
11311131
}
1132-
MCValueRelease(t_value1);
1133-
MCValueRelease(t_value2);
11341132
}
11351133

11361134
MCWindowsVersionInfo *t_version_info;

‎engine/src/fieldstyledtext.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ void MCField::parsestyledtextappendblock(MCParagraph *p_paragraph, MCArrayRef p_
580580
if (MCStringFirstIndexOfChar(*t_string, ',', 0, kMCCompareExact, t_comma))
581581
{
582582
MCAutoStringRef t_substring;
583-
MCStringCopySubstringAndRelease(*t_string, MCRangeMake(0, t_comma), &t_substring);
583+
MCStringCopySubstring(*t_string, MCRangeMake(0, t_comma), &t_substring);
584584
t_valueref = MCValueRetain(*t_substring);
585585
}
586586
}
@@ -591,7 +591,6 @@ void MCField::parsestyledtextappendblock(MCParagraph *p_paragraph, MCArrayRef p_
591591
MCAutoStringRef t_string;
592592
/* UNCHECKED */ ctxt . ConvertToString(t_valueref, &t_string);
593593
t_block -> setatts(P_TEXT_FONT, (void *)MCStringGetCString(*t_string));
594-
MCValueRelease(t_valueref);
595594
}
596595

597596
// Set textsize
@@ -647,12 +646,13 @@ void MCField::parsestyledtextblockarray(MCArrayRef p_block_value, MCParagraph*&
647646
if (!MCArrayFetchValueAtIndex(p_block_value, j, t_block_entry))
648647
continue;
649648

649+
MCAutoArrayRef t_array;
650650
if (!MCValueIsArray(t_block_entry))
651-
{
652-
MCArrayRef t_array;
653-
/* UNCHECKED */ ctxt . ConvertToArray(t_block_entry, &t_array);
654-
651+
{
652+
/* UNCHECKED */ ctxt . ConvertToArray(t_block_entry, &t_array);
653+
}
655654
parsestyledtextblockarray(*t_array, x_paragraphs);
655+
656656
}
657657
return;
658658
}
@@ -728,8 +728,6 @@ void MCField::parsestyledtextblockarray(MCArrayRef p_block_value, MCParagraph*&
728728
parsestyledtextappendblock(t_paragraph, *t_style_entry, t_text_initial_ptr, t_text_final_ptr, t_metadata, t_is_unicode);
729729

730730
MCValueRelease(t_metadata);
731-
if (!MCValueIsEmpty(t_valueref))
732-
MCValueRelease(t_valueref);
733731

734732
// And, if we need a new paragraph, add it.
735733
if (t_add_paragraph)

‎engine/src/mbliphonedc.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,8 +1305,8 @@ static void MCIPhoneDoDidBecomeActive(void *)
13051305

13061306
if (MCValueGetTypeCode(MCresult -> getvalueref()) == kMCValueTypeCodeString)
13071307
{
1308-
MCStringRef t_value;
1309-
t_value = (MCStringRef) MCValueRetain(MCresult -> getvalueref());
1308+
MCAutoStringRef t_value;
1309+
t_value = MCresult -> getvalueref();
13101310
NSLog(@"Startup error: %s\n", MCStringGetCString(t_value));
13111311
abort();
13121312
return;

‎engine/src/mode_installer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ class MCInternalPayloadExtract: public MCStatement
647647
MCExecContext ctxt(ep);
648648
MCAutoStringRef t_data;
649649
/* UNCHECKED */ MCStringCreateWithBytes((const byte_t *)p_data, p_data_length, kMCStringEncodingNative, false, &t_data);
650-
MCAutoStringRef t_value;
650+
MCStringRef t_value;
651651
/* UNCHECKED */ ctxt . ConvertToString(context -> var -> value, t_value);
652652
/* UNCHECHED */ MCStringMutableCopyAndRelease(t_value, t_value);
653653
if (!MCStringAppend(t_value, *t_data))

0 commit comments

Comments
 (0)