SF.net SVN: frontierkernel: [1474] Frontier/branches/FSRef_Migration/Common/source/langipc.c

[<cre...@us...>]

Revision: 1474
Author:   creecode
Date:     2006-07-30 10:37:30 -0700 (Sun, 30 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1474&view=rev

Log Message:
-----------
minor formatting tweaks

in langipchandleverb and langipcopendocroutine functions, clearbytes of fs first thing

in langipcbuildmessage function, for call to landsetverbattr pass typeFSRef for third param

Modified Paths:
--------------
    Frontier/branches/FSRef_Migration/Common/source/langipc.c
Modified: Frontier/branches/FSRef_Migration/Common/source/langipc.c
===================================================================
--- Frontier/branches/FSRef_Migration/Common/source/langipc.c	2006-07-26 17:48:23 UTC (rev 1473)
+++ Frontier/branches/FSRef_Migration/Common/source/langipc.c	2006-07-30 17:37:30 UTC (rev 1474)
@@ -1629,7 +1629,7 @@
 static pascal boolean langipchandleverb (hdlverbrecord hverb) {
 	
 	//
-	// 2006-06-25 creedon: FSRef-ized
+	// 2006-07-25 creedon: FSRef-ized
 	//
 	// 4.1b7 dmb: allow a specific root file to be targed with the "subject" 
 	// event attribute. Bug: right now, langipcfindhandler doesn't have this 
@@ -1644,14 +1644,16 @@
 	AEDesc subject;
 	WindowPtr wroot = nil;
 	
-	oserror (noErr); /*make sure it's clear*/
+	oserror ( noErr ); // make sure it's clear
 	
-	if (landgetverbattr (hverb, 'subj', typeFSS, &subject) == noErr) { /*4.1b7 dmb*/
+	if ( landgetverbattr ( hverb, 'subj', typeFSS, &subject ) == noErr ) {
 		
 		FSSpec fs;
 		Handle h;
 		tyfilespec fst;
 		
+		clearbytes ( &fst, sizeof ( fst ) );
+		
 		copydatahandle (&subject, &h);
 		
 		fs = **(FSSpec **) h;
@@ -1665,10 +1667,11 @@
 		if (wroot == nil) {
 		
 			// landreturnerror 
+			
 			}
 		else {
 			
-			(**hverb).landrefcon = 0; /*don't use trap script found in other root*/
+			(**hverb).landrefcon = 0; // don't use trap script found in other root
 			
 			shellpushglobals (wroot);
 			
@@ -1679,7 +1682,7 @@
 	switch ((**hverb).verbtoken) {
 		
 		case idrunning:
-			fl = landreturnboolean (hverb, true); /*for old IACTK compatibility*/
+			fl = landreturnboolean (hverb, true); // for old IACTK compatibility
 			
 			break;
 		
@@ -1689,48 +1692,22 @@
 			break;
 		
 		case runscripttoken:
-			fl = langipchandletrapverb (hverb, &flfoundhandler); /*let traps have a shot at it first*/
+			fl = langipchandletrapverb (hverb, &flfoundhandler); // let traps have a shot at it first
 			
 			if (!flfoundhandler)
 				fl = langipchandlerunscript (hverb);
 			
 			break;
 		
-		/*
-		case schedulescripttoken:
-			fl = langipchandleschedulescript (hverb);
-			
-			break;
-		*/
+		// case schedulescripttoken:
+		// 	fl = langipchandleschedulescript (hverb);
+		//	
+		// 	break;
 		
-#ifndef PIKE
-	#if TARGET_API_MAC_OS8
-		case getmenuarraytoken:
-			fl = langipcgetmenuarrayverb (hverb);
-			
-			break;
-		
-		case getmenuhandletoken:
-			fl = langipcgetmenuhandleverb (hverb);
-			
-			break;
-		
-		case idrunmenuitem:
-			fl = langipcrunmenuitemverb (hverb);
-			
-			break;
-		
-		case killscripttoken:
-			fl = langipckillscriptverb (hverb);
-			
-			break;
-	#endif
-#endif
-		
 		default:
 			fl = langipchandletrapverb (hverb, &flfoundhandler);
 			
-			if (!flfoundhandler) /*getoserror () == noErr*/
+			if (!flfoundhandler) // getoserror () == noErr
 				landreturnerror (hverb, undefinedverberror);
 			
 			break;
@@ -1750,7 +1727,8 @@
 		}
 
 	return (fl);
-	} /*langipchandleverb*/
+	
+	} // langipchandleverb
 
 
 static pascal boolean langipcfindhandler (hdlverbrecord hverb) {
@@ -2869,7 +2847,7 @@
 	
 		tyfilespec fs = **ipcaddress.val.data.filespecvalue;
 		
-		landsetverbattr (hv, 'subj', typeFSS, &fs, sizeof (fs));
+		landsetverbattr ( hv, 'subj', typeFSRef, &fs, sizeof ( fs ) );
 		}
 	
 	while (true) { /*pop off pairs of key+param combos*/
@@ -4132,21 +4110,24 @@
 	} /*langipcopenapproutine*/
 
 
-static pascal OSErr langipcopendocroutine (FSSpec *fs) {
+static pascal OSErr langipcopendocroutine ( FSSpec *fs ) {
 
 	//
-	// 2006-06-25 creedon: FSRef=ized
+	// 2006-07-25 creedon: FSRef=ized
 	//
 
 	tyfilespec fst;
 	
+	clearbytes ( &fst, sizeof ( fst ) );
+	
 	FSpMakeFSRef ( fs, &fst.fsref );
 	
-	if (!shellopenfile ( &fst, false, nil))
-		return (getoserror ());
+	if ( ! shellopenfile ( &fst, false, nil ) )
+		return ( getoserror ( ) );
 	
-	return (noErr);
-	} /*langipcopendocroutine*/
+	return ( noErr );
+	
+	} // langipcopendocroutine
 
 
 static pascal OSErr langipcquitapproutine (void) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.