Some more modifications on globals after Mark's feedback livecode#6

livecodepanos · livecodepanos · commit 4eee62cdaed7 · 2013-08-27T14:49:29.000+01:00
diff --git a/engine/src/dskmain.cpp b/engine/src/dskmain.cpp
@@ -131,21 +131,11 @@ bool X_init(int argc, char *argv[], char *envp[])
 	delete MCeerror;
 	delete MCresult;
 #endif
-
-	////
 	
 	/* UNCHECKED */ MCStringCreateWithCString(argv[0], MCcmd);
 
 #if defined(_MAC_DESKTOP)
-	{
-		char *t_new_cmd;
-		uint4 t_length;
-		t_length = MCStringGetLength(MCcmd);
-		t_new_cmd = new char[t_length + 1];
-		MCS_utf8tonative(MCStringGetCString(MCcmd), t_length, t_new_cmd, t_length);
-		t_new_cmd[t_length] = 0;
-		/* UNCHECKED */ MCStringCreateWithCString(t_new_cmd, MCcmd);
-	}
+	/* UNCHECKED */ MCStringCreateWithBytes(argv[0], strlen(argv[0]), kMCStringEncodingUTF8, MCcmd);
 #endif
 		
 #if defined(_LINUX_DESKTOP) || defined(_MAC_DESKTOP)   //get fullpath
diff --git a/engine/src/hc.cpp b/engine/src/hc.cpp
@@ -189,7 +189,6 @@ static MCBitmap *convert_bitmap(uint1 *sptr, uint2 width, uint2 height)
 	uint1 *startptr = sptr;
 	uint2 repcount = 1;
 	uint2 line = 0;
-	char *MChcstat_cstring;
 	while (dptr < deptr)
 	{
 		uint2 hrepcount = bpl;
@@ -1350,7 +1349,6 @@ IO_stat MCHccard::parse(char *sptr)
 	maxid = MCU_max(id, maxid);
 	uint2 ntext;
 	uint4 offset;
-	char *MChcstat_cstring;
 	if (version == 1)
 	{
 		bmapid = swap_uint4(&uint4ptr[3]);
@@ -1420,7 +1418,7 @@ IO_stat MCHccard::parse(char *sptr)
 	if (sptr[offset])
 		name = strclone(&sptr[offset]);
 	script = convert_script(&sptr[offset + strlen(&sptr[offset]) + 1]);
-	delete MChcstat_cstring;
+	
 	return IO_NORMAL;
 }
 
diff --git a/engine/src/mode_development.cpp b/engine/src/mode_development.cpp
@@ -138,7 +138,7 @@ static MCStringRef s_command_path = NULL;
 static void restart_revolution(void)
 {
 #if defined(TARGET_PLATFORM_WINDOWS)
-	_spawnl(_P_NOWAIT, strdup(MCStringGetCString(s_command_path)), strdup(MCStringGetCString(s_command_path)), NULL);
+	_spawnl(_P_NOWAIT, MCStringGetCString(s_command_path), MCStringGetCString(s_command_path), NULL);
 #elif defined(TARGET_PLATFORM_MACOS_X)
 	if (fork() == 0)
 	{
diff --git a/engine/src/osxspec.cpp b/engine/src/osxspec.cpp
@@ -952,7 +952,9 @@ void MCS_init()
 				if (err == noErr)
 				{
 					p2cstr(proxystr);
-					/* UNCHECKED */ MCStringCreateWithCString((char *)proxystr, MChttpproxy);
+					MCAutoStringRef t_proxystr;
+					/* UNCHECKED */ MCStringCreateWithCString((char *)proxystr, &t_proxystr);
+					MCValueAssign(MChttpproxy, *t_proxystr);
 				}
 			}
 			ICStop(icinst);
diff --git a/engine/src/property.cpp b/engine/src/property.cpp
@@ -3737,7 +3737,7 @@ Exec_stat MCProperty::eval(MCExecPoint &ep)
 			MCdialogdata->fetch(ep);
 			break;
 		case P_HC_IMPORT_STAT:
-			ep.setsvalue(MCStringGetCString(MChcstat));
+			ep.setsvalue(MChcstat);
 			break;
 		case P_SCRIPT_TEXT_FONT:
 			ep.setsvalue(MCscriptfont);
@@ -3828,7 +3828,7 @@ Exec_stat MCProperty::eval(MCExecPoint &ep)
 			ep.setboolean(MCsystemPS);
 			break;
 		case P_FILE_TYPE:
-			ep.setsvalue(MCStringGetCString(MCfiletype));
+			ep.setsvalue(MCfiletype);
 			break;
 		case P_STACK_FILE_TYPE:
 			ep.setsvalue(MCstackfiletype);
@@ -3897,13 +3897,13 @@ Exec_stat MCProperty::eval(MCExecPoint &ep)
 			if (MChttpheaders == NULL)
 				ep.clear();
 			else
-				ep.setsvalue(MCStringGetCString(MChttpheaders));
+				ep.setsvalue(MChttpheaders);
 			break;
 		case P_HTTP_PROXY:
 			if (MChttpproxy == NULL)
 				ep . clear();
 			else
-				ep . copysvalue(MCStringGetCString(MChttpproxy));
+				ep . copysvalue(MChttpproxy);
 			break;
 		case P_SHOW_INVISIBLES:
 			ep.setboolean(MCshowinvisibles);

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ static MCStringRef s_command_path = NULL;`
`138`	`138`	`static void restart_revolution(void)`
`139`	`139`	`{`
`140`	`140`	`#if defined(TARGET_PLATFORM_WINDOWS)`
`141`		`- _spawnl(_P_NOWAIT, strdup(MCStringGetCString(s_command_path)), strdup(MCStringGetCString(s_command_path)), NULL);`
	`141`	`+ _spawnl(_P_NOWAIT, MCStringGetCString(s_command_path), MCStringGetCString(s_command_path), NULL);`
`142`	`142`	`#elif defined(TARGET_PLATFORM_MACOS_X)`
`143`	`143`	`if (fork() == 0)`
`144`	`144`	`{`
Original file line number	Diff line number	Diff line change
`@@ -952,7 +952,9 @@ void MCS_init()`
`952`	`952`	`if (err == noErr)`
`953`	`953`	`{`
`954`	`954`	`p2cstr(proxystr);`
`955`		`- /* UNCHECKED / MCStringCreateWithCString((char )proxystr, MChttpproxy);`
	`955`	`+ MCAutoStringRef t_proxystr;`
	`956`	`+ /* UNCHECKED / MCStringCreateWithCString((char )proxystr, &t_proxystr);`
	`957`	`+ MCValueAssign(MChttpproxy, *t_proxystr);`
`956`	`958`	`}`
`957`	`959`	`}`
`958`	`960`	`ICStop(icinst);`