Remove more /*UNCHECKED*/s from AppleEvents handling

livecodefraser · livecodefraser · commit d00bc32f48de · 2015-12-01T10:30:04.000Z
diff --git a/engine/src/dskmac.cpp b/engine/src/dskmac.cpp
@@ -8413,6 +8413,7 @@ static OSStatus getAEParams(const AppleEvent *ae, AEKeyword key, MCStringRef &r_
 	Size rSize;
 	DescType dt;
 	Size s;
+    bool t_success = true;
 	if ((errno = AESizeOfParam(ae, key, &dt, &s)) == noErr)
 	{
 		switch (dt)
@@ -8428,14 +8429,14 @@ static OSStatus getAEParams(const AppleEvent *ae, AEKeyword key, MCStringRef &r_
             {
                 byte_t *result = new byte_t[s + 1];
                 AEGetParamPtr(ae, key, dt, &rType, result, s, &rSize);
-                /* UNCHECKED */ MCStringCreateWithBytesAndRelease(result, s, kMCStringEncodingUTF8, false, r_result);
+                t_success = MCStringCreateWithBytesAndRelease(result, s, kMCStringEncodingUTF8, false, r_result);
                 break;
             }
             case typeChar:
             {
                 char_t *result = new char_t[s + 1];
                 AEGetParamPtr(ae, key, dt, &rType, result, s, &rSize);
-                /* UNCHECKED */ MCStringCreateWithNativeChars(result, s, r_result);
+                t_success = MCStringCreateWithNativeChars(result, s, r_result);
                 delete[] result;
                 break;
             }
@@ -8445,64 +8446,64 @@ static OSStatus getAEParams(const AppleEvent *ae, AEKeyword key, MCStringRef &r_
                 AEGetParamPtr(ae, key, dt, &rType, &t_type, s, &rSize);
                 char *result;
                 result = FourCharCodeToString(t_type);
-                /* UNCHECKED */ MCStringCreateWithNativeChars((char_t*)result, 4, r_result);
+                t_success = MCStringCreateWithNativeChars((char_t*)result, 4, r_result);
                 delete[] result;
 			}
                 break;
             case typeSInt16:
 			{
 				int16_t i;
 				AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);
-                /* UNCHECKED */ MCStringFormat(r_result, PRId16, i);
+                t_success = MCStringFormat(r_result, PRId16, i);
 				break;
 			}
             case typeSInt32:
 			{
 				int32_t i;
 				AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);
-                /* UNCHECKED */ MCStringFormat(r_result, PRId32, i);
+                t_success = MCStringFormat(r_result, PRId32, i);
 				break;
 			}
             case typeSInt64:
             {
                 int64_t i;
                 AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);
-                /* UNCHECKED */ MCStringFormat(r_result, PRId64, i);
+                t_success = MCStringFormat(r_result, PRId64, i);
                 break;
             }
             case typeIEEE32BitFloatingPoint:
 			{
 				float32_t f;
 				AEGetParamPtr(ae, key, dt, &rType, &f, s, &rSize);
-                /* UNCHECKED */ MCStringFormat(r_result, "%12.12g", f);
+                t_success = MCStringFormat(r_result, "%12.12g", f);
 				break;
 			}
             case typeIEEE64BitFloatingPoint:
 			{
 				float64_t f;
 				AEGetParamPtr(ae, key, dt, &rType, &f, s, &rSize);
-                /* UNCHECKED */ MCStringFormat(r_result, "%12.12g", f);
+                t_success = MCStringFormat(r_result, "%12.12g", f);
 				break;
 			}
             case typeUInt16:
             {
                 uint16_t i;
                 AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);
-                /* UNCHECKED */ MCStringFormat(r_result, PRIu16, i);
+                t_success = MCStringFormat(r_result, PRIu16, i);
                 break;
             }
             case typeUInt32:
 			{
 				uint32_t i;
 				AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);
-                /* UNCHECKED */ MCStringFormat(r_result, PRIu32, i);
+                t_success = MCStringFormat(r_result, PRIu32, i);
 				break;
 			}
             case typeUInt64:
             {
                 uint64_t i;
                 AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);
-                /* UNCHECKED */ MCStringFormat(r_result, PRIu64, i);
+                t_success = MCStringFormat(r_result, PRIu64, i);
                 break;
             }
             case typeNull:
@@ -8513,22 +8514,26 @@ static OSStatus getAEParams(const AppleEvent *ae, AEKeyword key, MCStringRef &r_
 			{
 				FSSpec fs;
 				errno = AEGetParamPtr(ae, key, dt, &rType, &fs, s, &rSize);
-				/* UNCHECKED */ MCS_mac_FSSpec2path(&fs, r_result);
+				t_success = MCS_mac_FSSpec2path(&fs, r_result);
 			}
                 break;
 #endif
             case typeFSRef:
 			{
 				FSRef t_fs_ref;
 				errno = AEGetParamPtr(ae, key, dt, &rType, &t_fs_ref, s, &rSize);
-                /* UNCHECKED */ MCS_mac_fsref_to_path(t_fs_ref, r_result);
+                t_success = MCS_mac_fsref_to_path(t_fs_ref, r_result);
 			}
                 break;
             default:
-                /* UNCHECKED */ MCStringFormat(r_result, "unknown type %4.4s", (char*)&dt);
+               t_success = MCStringFormat(r_result, "unknown type %4.4s", (char*)&dt);
                 break;
 		}
 	}
+    
+    if (!t_success && errno == 0)
+        errno = ioErr;
+    
 	return errno;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8413,6 +8413,7 @@ static OSStatus getAEParams(const AppleEvent *ae, AEKeyword key, MCStringRef &r_`
`8413`	`8413`	`Size rSize;`
`8414`	`8414`	`DescType dt;`
`8415`	`8415`	`Size s;`
	`8416`	`+ bool t_success = true;`
`8416`	`8417`	`if ((errno = AESizeOfParam(ae, key, &dt, &s)) == noErr)`
`8417`	`8418`	`{`
`8418`	`8419`	`switch (dt)`
`@@ -8428,14 +8429,14 @@ static OSStatus getAEParams(const AppleEvent *ae, AEKeyword key, MCStringRef &r_`
`8428`	`8429`	`{`
`8429`	`8430`	`byte_t *result = new byte_t[s + 1];`
`8430`	`8431`	`AEGetParamPtr(ae, key, dt, &rType, result, s, &rSize);`
`8431`		`- /* UNCHECKED */ MCStringCreateWithBytesAndRelease(result, s, kMCStringEncodingUTF8, false, r_result);`
	`8432`	`+ t_success = MCStringCreateWithBytesAndRelease(result, s, kMCStringEncodingUTF8, false, r_result);`
`8432`	`8433`	`break;`
`8433`	`8434`	`}`
`8434`	`8435`	`case typeChar:`
`8435`	`8436`	`{`
`8436`	`8437`	`char_t *result = new char_t[s + 1];`
`8437`	`8438`	`AEGetParamPtr(ae, key, dt, &rType, result, s, &rSize);`
`8438`		`- /* UNCHECKED */ MCStringCreateWithNativeChars(result, s, r_result);`
	`8439`	`+ t_success = MCStringCreateWithNativeChars(result, s, r_result);`
`8439`	`8440`	`delete[] result;`
`8440`	`8441`	`break;`
`8441`	`8442`	`}`
`@@ -8445,64 +8446,64 @@ static OSStatus getAEParams(const AppleEvent *ae, AEKeyword key, MCStringRef &r_`
`8445`	`8446`	`AEGetParamPtr(ae, key, dt, &rType, &t_type, s, &rSize);`
`8446`	`8447`	`char *result;`
`8447`	`8448`	`result = FourCharCodeToString(t_type);`
`8448`		`- /* UNCHECKED / MCStringCreateWithNativeChars((char_t)result, 4, r_result);`
	`8449`	`+ t_success = MCStringCreateWithNativeChars((char_t*)result, 4, r_result);`
`8449`	`8450`	`delete[] result;`
`8450`	`8451`	`}`
`8451`	`8452`	`break;`
`8452`	`8453`	`case typeSInt16:`
`8453`	`8454`	`{`
`8454`	`8455`	`int16_t i;`
`8455`	`8456`	`AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);`
`8456`		`- /* UNCHECKED */ MCStringFormat(r_result, PRId16, i);`
	`8457`	`+ t_success = MCStringFormat(r_result, PRId16, i);`
`8457`	`8458`	`break;`
`8458`	`8459`	`}`
`8459`	`8460`	`case typeSInt32:`
`8460`	`8461`	`{`
`8461`	`8462`	`int32_t i;`
`8462`	`8463`	`AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);`
`8463`		`- /* UNCHECKED */ MCStringFormat(r_result, PRId32, i);`
	`8464`	`+ t_success = MCStringFormat(r_result, PRId32, i);`
`8464`	`8465`	`break;`
`8465`	`8466`	`}`
`8466`	`8467`	`case typeSInt64:`
`8467`	`8468`	`{`
`8468`	`8469`	`int64_t i;`
`8469`	`8470`	`AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);`
`8470`		`- /* UNCHECKED */ MCStringFormat(r_result, PRId64, i);`
	`8471`	`+ t_success = MCStringFormat(r_result, PRId64, i);`
`8471`	`8472`	`break;`
`8472`	`8473`	`}`
`8473`	`8474`	`case typeIEEE32BitFloatingPoint:`
`8474`	`8475`	`{`
`8475`	`8476`	`float32_t f;`
`8476`	`8477`	`AEGetParamPtr(ae, key, dt, &rType, &f, s, &rSize);`
`8477`		`- /* UNCHECKED */ MCStringFormat(r_result, "%12.12g", f);`
	`8478`	`+ t_success = MCStringFormat(r_result, "%12.12g", f);`
`8478`	`8479`	`break;`
`8479`	`8480`	`}`
`8480`	`8481`	`case typeIEEE64BitFloatingPoint:`
`8481`	`8482`	`{`
`8482`	`8483`	`float64_t f;`
`8483`	`8484`	`AEGetParamPtr(ae, key, dt, &rType, &f, s, &rSize);`
`8484`		`- /* UNCHECKED */ MCStringFormat(r_result, "%12.12g", f);`
	`8485`	`+ t_success = MCStringFormat(r_result, "%12.12g", f);`
`8485`	`8486`	`break;`
`8486`	`8487`	`}`
`8487`	`8488`	`case typeUInt16:`
`8488`	`8489`	`{`
`8489`	`8490`	`uint16_t i;`
`8490`	`8491`	`AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);`
`8491`		`- /* UNCHECKED */ MCStringFormat(r_result, PRIu16, i);`
	`8492`	`+ t_success = MCStringFormat(r_result, PRIu16, i);`
`8492`	`8493`	`break;`
`8493`	`8494`	`}`
`8494`	`8495`	`case typeUInt32:`
`8495`	`8496`	`{`
`8496`	`8497`	`uint32_t i;`
`8497`	`8498`	`AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);`
`8498`		`- /* UNCHECKED */ MCStringFormat(r_result, PRIu32, i);`
	`8499`	`+ t_success = MCStringFormat(r_result, PRIu32, i);`
`8499`	`8500`	`break;`
`8500`	`8501`	`}`
`8501`	`8502`	`case typeUInt64:`
`8502`	`8503`	`{`
`8503`	`8504`	`uint64_t i;`
`8504`	`8505`	`AEGetParamPtr(ae, key, dt, &rType, &i, s, &rSize);`
`8505`		`- /* UNCHECKED */ MCStringFormat(r_result, PRIu64, i);`
	`8506`	`+ t_success = MCStringFormat(r_result, PRIu64, i);`
`8506`	`8507`	`break;`
`8507`	`8508`	`}`
`8508`	`8509`	`case typeNull:`
`@@ -8513,22 +8514,26 @@ static OSStatus getAEParams(const AppleEvent *ae, AEKeyword key, MCStringRef &r_`
`8513`	`8514`	`{`
`8514`	`8515`	`FSSpec fs;`
`8515`	`8516`	`errno = AEGetParamPtr(ae, key, dt, &rType, &fs, s, &rSize);`
`8516`		`- /* UNCHECKED */ MCS_mac_FSSpec2path(&fs, r_result);`
	`8517`	`+ t_success = MCS_mac_FSSpec2path(&fs, r_result);`
`8517`	`8518`	`}`
`8518`	`8519`	`break;`
`8519`	`8520`	`#endif`
`8520`	`8521`	`case typeFSRef:`
`8521`	`8522`	`{`
`8522`	`8523`	`FSRef t_fs_ref;`
`8523`	`8524`	`errno = AEGetParamPtr(ae, key, dt, &rType, &t_fs_ref, s, &rSize);`
`8524`		`- /* UNCHECKED */ MCS_mac_fsref_to_path(t_fs_ref, r_result);`
	`8525`	`+ t_success = MCS_mac_fsref_to_path(t_fs_ref, r_result);`
`8525`	`8526`	`}`
`8526`	`8527`	`break;`
`8527`	`8528`	`default:`
`8528`		`- /* UNCHECKED / MCStringFormat(r_result, "unknown type %4.4s", (char)&dt);`
	`8529`	`+ t_success = MCStringFormat(r_result, "unknown type %4.4s", (char*)&dt);`
`8529`	`8530`	`break;`
`8530`	`8531`	`}`
`8531`	`8532`	`}`
	`8533`	`+`
	`8534`	`+ if (!t_success && errno == 0)`
	`8535`	`+ errno = ioErr;`
	`8536`	`+`
`8532`	`8537`	`return errno;`
`8533`	`8538`	`}`
`8534`	`8539`