Updates after feedback livecode#4

livecodepanos · livecodepanos · commit 39ed892ea8f7 · 2013-11-20T14:24:02.000Z
diff --git a/engine/src/exec-network.cpp b/engine/src/exec-network.cpp
@@ -745,9 +745,9 @@ void MCNetworkSetDefaultNetworkInterface(MCExecContext& ctxt, MCStringRef p_valu
 		if (t_net_int_valid != 0)
 		{
 			delete MCdefaultnetworkinterface;
-            MCAutoPointer<char> t_value;
-            /* UNCHECKED */ MCStringConvertToCString(p_value, &t_value);
-			MCdefaultnetworkinterface = *t_value;
+            char* t_value;
+            /* UNCHECKED */ MCStringConvertToCString(p_value, t_value);
+			MCdefaultnetworkinterface = t_value;
 		}
 		else
 			ctxt . LegacyThrow(EE_PROPERTY_BADNETWORKINTERFACE);
diff --git a/engine/src/socket_resolve.cpp b/engine/src/socket_resolve.cpp
@@ -368,20 +368,21 @@ bool MCS_name_to_sockaddr(MCStringRef p_name_in, struct sockaddr_in *r_addr, MCH
 	if (!MCS_init_sockets())
 		return false;
     
-	MCAutoStringRef t_substring, t_name, t_port;
+	MCAutoStringRef t_name_in, t_name, t_port;
     uindex_t t_or, t_colon;
     
     // support multiple opens to same host:port
     if (MCStringFirstIndexOfChar(p_name_in, '|', 0, kMCCompareExact, t_or))
     {
-        /* UNCHECKED */ MCStringCopySubstring(p_name_in, MCRangeMake(0, t_or), &t_substring);
-        MCValueAssign(p_name_in, *t_substring);
+        /* UNCHECKED */ MCStringCopySubstring(p_name_in, MCRangeMake(0, t_or), &t_name_in);
     }
+    else
+        t_name_in = MCValueRetain(p_name_in);
     
     uinteger_t port = 80;
-    if (MCStringFirstIndexOfChar(p_name_in, ':', 0, kMCCompareExact, t_colon))
+    if (MCStringFirstIndexOfChar(*t_name_in, ':', 0, kMCCompareExact, t_colon))
     {
-        /* UNCHECKED */ MCStringDivideAtIndex(p_name_in, t_colon, &t_name, &t_port);
+        /* UNCHECKED */ MCStringDivideAtIndex(*t_name_in, t_colon, &t_name, &t_port);
         MCAutoNumberRef t_port_number;
         if (!MCNumberParse(*t_port, &t_port_number))
 		{
@@ -405,7 +406,7 @@ bool MCS_name_to_sockaddr(MCStringRef p_name_in, struct sockaddr_in *r_addr, MCH
             port = MCNumberFetchAsInteger(*t_port_number);
     }
     else
-        t_name = MCValueRetain(p_name_in);
+        t_name = MCValueRetain(*t_name_in);
     
 	bool t_success = true;
     

Original file line number	Diff line number	Diff line change
`@@ -745,9 +745,9 @@ void MCNetworkSetDefaultNetworkInterface(MCExecContext& ctxt, MCStringRef p_valu`
`745`	`745`	`if (t_net_int_valid != 0)`
`746`	`746`	`{`
`747`	`747`	`delete MCdefaultnetworkinterface;`
`748`		`- MCAutoPointer<char> t_value;`
`749`		`- /* UNCHECKED */ MCStringConvertToCString(p_value, &t_value);`
`750`		`- MCdefaultnetworkinterface = *t_value;`
	`748`	`+ char* t_value;`
	`749`	`+ /* UNCHECKED */ MCStringConvertToCString(p_value, t_value);`
	`750`	`+ MCdefaultnetworkinterface = t_value;`
`751`	`751`	`}`
`752`	`752`	`else`
`753`	`753`	`ctxt . LegacyThrow(EE_PROPERTY_BADNETWORKINTERFACE);`