[[ Mac64 ]] Avoid the deprecated Pascal string APIs in revspeech

livecodefraser · livecodefraser · commit 587d22c7bafc · 2015-11-02T12:59:40.000Z
diff --git a/revspeech/src/osxspeech.cpp b/revspeech/src/osxspeech.cpp
@@ -134,8 +134,8 @@ bool OSXSpeechNarrator::ListVoices(NarratorGender p_gender, NarratorListVoicesCa
             &&(GetVoiceDescription(&tVoice, &myInfo, sizeof(myInfo)) == noErr))
         {
             if ((t_gender != -1) && (myInfo.gender != t_gender)) continue;
-            char cvoice[255];
-            CopyPascalStringToC(myInfo.name, cvoice);
+            char cvoice[256];
+            strncpy(cvoice, (const char*)&myInfo.name[1], myInfo.name[0]);
 			p_callback(p_context, p_gender, cvoice);
 		}
 	}
@@ -276,7 +276,7 @@ void OSXSpeechNarrator::FindAndSelect()
 {
     VoiceSpec *FoundVoice = nil;
     VoiceSpec tVoice;
-    char cvoice[255];
+    char cvoice[256];
     short NumVoices;
     if (CountVoices(&NumVoices) == noErr) {
         for (short count = 1;count<=NumVoices;count++)
@@ -285,7 +285,7 @@ void OSXSpeechNarrator::FindAndSelect()
             {
                 VoiceDescription myInfo;
                 if (GetVoiceDescription(&tVoice, &myInfo, sizeof(myInfo)) == noErr) {
-                    CopyPascalStringToC(myInfo.name,cvoice);
+                    strncpy(cvoice, (const char*)&myInfo.name[1], myInfo.name[0]);
                     if (strcmp(cvoice,speechvoice) == 0)
                     {
                         FoundVoice = &tVoice;

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ bool OSXSpeechNarrator::ListVoices(NarratorGender p_gender, NarratorListVoicesCa`
`134`	`134`	`&&(GetVoiceDescription(&tVoice, &myInfo, sizeof(myInfo)) == noErr))`
`135`	`135`	`{`
`136`	`136`	`if ((t_gender != -1) && (myInfo.gender != t_gender)) continue;`
`137`		`- char cvoice[255];`
`138`		`- CopyPascalStringToC(myInfo.name, cvoice);`
	`137`	`+ char cvoice[256];`
	`138`	`+ strncpy(cvoice, (const char*)&myInfo.name[1], myInfo.name[0]);`
`139`	`139`	`p_callback(p_context, p_gender, cvoice);`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -276,7 +276,7 @@ void OSXSpeechNarrator::FindAndSelect()`
`276`	`276`	`{`
`277`	`277`	`VoiceSpec *FoundVoice = nil;`
`278`	`278`	`VoiceSpec tVoice;`
`279`		`- char cvoice[255];`
	`279`	`+ char cvoice[256];`
`280`	`280`	`short NumVoices;`
`281`	`281`	`if (CountVoices(&NumVoices) == noErr) {`
`282`	`282`	`for (short count = 1;count<=NumVoices;count++)`
`@@ -285,7 +285,7 @@ void OSXSpeechNarrator::FindAndSelect()`
`285`	`285`	`{`
`286`	`286`	`VoiceDescription myInfo;`
`287`	`287`	`if (GetVoiceDescription(&tVoice, &myInfo, sizeof(myInfo)) == noErr) {`
`288`		`- CopyPascalStringToC(myInfo.name,cvoice);`
	`288`	`+ strncpy(cvoice, (const char*)&myInfo.name[1], myInfo.name[0]);`
`289`	`289`	`if (strcmp(cvoice,speechvoice) == 0)`
`290`	`290`	`{`
`291`	`291`	`FoundVoice = &tVoice;`