Some more removals of MCStringGetCString from customprinter.cpp

livecodepanos · livecodepanos · commit 76aa07b9103a · 2013-11-18T14:33:51.000Z
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -2040,16 +2040,17 @@ Exec_stat MCCustomPrinterCreate(MCStringRef p_destination, MCStringRef p_filenam
 				t_module = MCS_loadmodule(*t_module_path_str2);
 			}
 #elif defined(_LINUX)
-			const char *t_engine_dir_end;
-			t_engine_dir_end = strrchr(MCStringGetCString(MCcmd), '/');
+            
+			uindex_t t_engine_dir_end;
+            /* UNCHECKED */ MCStringLastIndexOfChar(MCcmd, '/', 0, kMCCompareExact, t_engine_dir_end);
 			MCAutoStringRef t_module_path;
-			/* UNCHECKED */ MCStringFormat(&t_module_path, "%.*s/revpdfprinter.so", t_engine_dir_end - MCStringGetCString(MCcmd), MCStringGetCString(MCcmd));
+			/* UNCHECKED */ MCStringFormat(&t_module_path, "%.*@/revpdfprinter.so", MCRangeMake(0, t_engine_dir_end), MCcmd);
 			t_module = MCS_loadmodule(*t_module_path);
 #elif defined(TARGET_SUBPLATFORM_IPHONE)
-			const char *t_engine_dir_end;
-			t_engine_dir_end = strrchr(MCStringGetCString(MCcmd), '/');
+			uindex_t t_engine_dir_end;
+            /* UNCHECKED */ MCStringLastIndexOfChar(MCcmd, '/', 0, kMCCompareExact, t_engine_dir_end);
 			MCAutoStringRef t_module_path;            
-			MCStringFormat(&t_module_path, "%.*s/revpdfprinter.dylib", t_engine_dir_end - MCStringGetCString(MCcmd), MCStringGetCString(MCcmd));
+			MCStringFormat(&t_module_path, "%.*@/revpdfprinter.dylib", MCRangeMake(0, t_engine_dir_end), MCcmd);
 			t_module = MCS_loadmodule(*t_module_path);
 #elif defined(_SERVER)
 			
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -116,7 +116,7 @@ void MCB_setmsg(MCExecContext &ctxt, MCStringRef p_string)
 {
 	if (MCnoui)
 	{
-		MCS_write(MCStringGetCString(p_string), sizeof(char), MCStringGetLength(p_string), IO_stdout);
+		IO_write_stringref(p_string, IO_stdout);
 		uint4 length = MCStringGetLength(p_string);
 		if (length && MCStringGetCharAtIndex(p_string, length - 1) != '\n')
 			MCS_write("\n", sizeof(char), 1, IO_stdout);

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void MCB_setmsg(MCExecContext &ctxt, MCStringRef p_string)`
`116`	`116`	`{`
`117`	`117`	`if (MCnoui)`
`118`	`118`	`{`
`119`		`- MCS_write(MCStringGetCString(p_string), sizeof(char), MCStringGetLength(p_string), IO_stdout);`
	`119`	`+ IO_write_stringref(p_string, IO_stdout);`
`120`	`120`	`uint4 length = MCStringGetLength(p_string);`
`121`	`121`	`if (length && MCStringGetCharAtIndex(p_string, length - 1) != '\n')`
`122`	`122`	`MCS_write("\n", sizeof(char), 1, IO_stdout);`