frontierkernel-commits — Mailing list for Subversion commit messages.

SF.net SVN: frontierkernel: [1214] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1214
Author:   karstenw
Date:     2006-04-05 18:43:43 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1214&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/filelaunch.c
    Frontier/trunk/Common/source/shell.c
Modified: Frontier/trunk/Common/source/filelaunch.c
===================================================================
--- Frontier/trunk/Common/source/filelaunch.c	2006-04-06 01:02:50 UTC (rev 1213)
+++ Frontier/trunk/Common/source/filelaunch.c	2006-04-06 01:43:43 UTC (rev 1214)
@@ -126,15 +126,20 @@
 	OSType fndrCreator;
 	Boolean wasChanged;
 	AliasHandle targetAlias;
-	long index;
+	long idx;	// 2006-04-03 - kw --- renamed
 	long nTargets = 1;
 	FSSpec	targets[1];
 	FSSpec	*targetList;
 	targets[0] = fs2;
 	targetList = targets;
-		/* verify parameters */
-	if ((nTargets == 0) || (targetList == NULL)) return paramErr;
 
+	/* verify parameters */
+	if (	(nTargets == 0)
+		 || (targetList == NULL))
+	{
+		return paramErr;
+	}
+
 		/* set up locals  */
 	AECreateDesc(typeNull, NULL, 0, &theAEvent);
 	AECreateDesc(typeNull, NULL, 0, &fndrAddress);
@@ -155,13 +160,13 @@
 		/* create the list of files to open */
 	err = AECreateList(NULL, 0, false, &targetListDesc);
 	if (err != noErr) goto bail;
-	for ( index=0; index < nTargets; index++) {
+	for ( idx = 0; idx < nTargets; idx++) {
 		if (targetAlias == NULL)
-			err = NewAlias(NULL, (targetList + index), &targetAlias);
-		else err = UpdateAlias(NULL, (targetList + index), targetAlias, &wasChanged);
+			err = NewAlias(NULL, (targetList + idx), &targetAlias);
+		else err = UpdateAlias(NULL, (targetList + idx), targetAlias, &wasChanged);
 		if (err != noErr) goto bail;
 		HLock((Handle) targetAlias);
-		err = AEPutPtr(&targetListDesc, (index + 1), typeAlias, *targetAlias, GetHandleSize((Handle) targetAlias));
+		err = AEPutPtr(&targetListDesc, (idx + 1), typeAlias, *targetAlias, GetHandleSize((Handle) targetAlias));
 		HUnlock((Handle) targetAlias);
 		if (err != noErr) goto bail;
 	}

Modified: Frontier/trunk/Common/source/shell.c
===================================================================
--- Frontier/trunk/Common/source/shell.c	2006-04-06 01:02:50 UTC (rev 1213)
+++ Frontier/trunk/Common/source/shell.c	2006-04-06 01:43:43 UTC (rev 1214)
@@ -1288,15 +1288,14 @@
 	
 	#if TARGET_API_MAC_CARBON == 1
 	
-		initservices ();
-	
-	#endif
+	initservices ();
 
-	
+#endif
+
 #if isFrontier || flruntime || winhybrid
 
 	initlang (); /*init callbacks and other basic inits*/
-	
+
 	langcallbacks.processeventcallback = &shellprocessevent; /*4.1b13 dmb - new*/
 	
 	if (!inittablestructure ()) /*create initial hashtable structure*/
@@ -1377,21 +1376,21 @@
 										NULL,
 										&theTimer);*/
 										
-		/*Install dock menu handler.*/
+	/*Install dock menu handler.*/
 		
-		EventHandlerUPP dockmenuUPP;										
-		OSStatus ec = noErr;
-		EventTypeSpec eventTypes [1];
-		
-		eventTypes[0].eventClass = kEventClassApplication;
-		eventTypes[0].eventKind  = 20; /*kEventAppGetDockTileMenu; -- not in CodeWarrior yet 11/12/01*/
-		
-		dockmenuUPP = NewEventHandlerUPP (dockmenuhandler);
-		
-		ec = InstallApplicationEventHandler (dockmenuUPP, 1, eventTypes, NULL, NULL);
+	EventHandlerUPP dockmenuUPP;										
+	OSStatus ec = noErr;
+	EventTypeSpec eventTypes [1];
 
-    	/*If it fails, oh well, there's nothing to be done. So ec isn't checked.*/
-    	}
+	eventTypes[0].eventClass = kEventClassApplication;
+	eventTypes[0].eventKind  = kEventAppGetDockTileMenu;
+
+	dockmenuUPP = NewEventHandlerUPP (dockmenuhandler);
+
+	ec = InstallApplicationEventHandler (dockmenuUPP, 1, eventTypes, NULL, NULL);
+
+	/*If it fails, oh well, there's nothing to be done. So ec isn't checked.*/
+	}
     
 	#endif
 


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

SF.net SVN: frontierkernel: [1213] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1213
Author:   karstenw
Date:     2006-04-05 18:02:50 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1213&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/md5.c
    Frontier/trunk/Common/source/quickdraw.c
    Frontier/trunk/Common/source/uisharing.c
Modified: Frontier/trunk/Common/source/md5.c
===================================================================
--- Frontier/trunk/Common/source/md5.c	2006-04-06 01:00:11 UTC (rev 1212)
+++ Frontier/trunk/Common/source/md5.c	2006-04-06 01:02:50 UTC (rev 1213)
@@ -126,38 +126,37 @@
 unsigned char *input;                                /* input block */
 unsigned int inputLen;                     /* length of input block */
 {
-  unsigned int i, index, partLen;
-
-  /* Compute number of bytes mod 64 */
-  index = (unsigned int)((context->count[0] >> 3) & 0x3F);
-
-  /* Update number of bits */
-  if ((context->count[0] += ((UINT4)inputLen << 3)) < ((UINT4)inputLen << 3))
-    context->count[1]++;
-
-  context->count[1] += ((UINT4)inputLen >> 29);
-
-  partLen = 64 - index;
-
-  /* Transform as many times as possible.
-*/
-  if (inputLen >= partLen) {
- MD5_memcpy
-   ((POINTER)&context->buffer[index], (POINTER)input, partLen);
- MD5Transform (context->state, context->buffer);
-
- for (i = partLen; i + 63 < inputLen; i += 64)
-   MD5Transform (context->state, &input[i]);
-
- index = 0;
-  }
-  else
- i = 0;
-
-  /* Buffer remaining input */
-  MD5_memcpy
- ((POINTER)&context->buffer[index], (POINTER)&input[i],
-  inputLen-i);
+	unsigned int i, idx, partLen;
+	
+	/* Compute number of bytes mod 64 */
+	idx = (unsigned int)((context->count[0] >> 3) & 0x3F);
+	
+	/* Update number of bits */
+	if ((context->count[0] += ((UINT4)inputLen << 3)) < ((UINT4)inputLen << 3))
+		context->count[1]++;
+	
+	context->count[1] += ((UINT4)inputLen >> 29);
+	
+	partLen = 64 - idx;
+	
+	/* Transform as many times as possible. */
+	if (inputLen >= partLen) {
+		MD5_memcpy
+		((POINTER)&context->buffer[idx], (POINTER)input, partLen);
+		MD5Transform (context->state, context->buffer);
+		
+		for (i = partLen; i + 63 < inputLen; i += 64)
+			MD5Transform (context->state, &input[i]);
+		
+		idx = 0;
+	}
+	else
+		i = 0;
+	
+	/* Buffer remaining input */
+	MD5_memcpy ((POINTER)&context->buffer[idx],
+				(POINTER)&input[i],
+				inputLen-i);
 }
 
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
@@ -167,27 +166,25 @@
 unsigned char digest[16];                         /* message digest */
 MD5_CTX *context;                                       /* context */
 {
-  unsigned char bits[8];
-  unsigned int index, padLen;
-
-  /* Save number of bits */
-  Encode (bits, context->count, 8);
-
-  /* Pad out to 56 mod 64.
-*/
-  index = (unsigned int)((context->count[0] >> 3) & 0x3f);
-  padLen = (index < 56) ? (56 - index) : (120 - index);
-  MD5Update (context, PADDING, padLen);
-
-  /* Append length (before padding) */
-  MD5Update (context, bits, 8);
-
-  /* Store state in digest */
-  Encode (digest, context->state, 16);
-
-  /* Zeroize sensitive information.
-   */
-  MD5_memset ((POINTER)context, 0, sizeof (*context));
+	unsigned char bits[8];
+	unsigned int idx, padLen;
+	
+	/* Save number of bits */
+	Encode (bits, context->count, 8);
+	
+	/* Pad out to 56 mod 64. */
+	idx = (unsigned int)((context->count[0] >> 3) & 0x3f);
+	padLen = (idx < 56) ? (56 - idx) : (120 - idx);
+	MD5Update (context, PADDING, padLen);
+	
+	/* Append length (before padding) */
+	MD5Update (context, bits, 8);
+	
+	/* Store state in digest */
+	Encode (digest, context->state, 16);
+	
+	/* Zeroize sensitive information. */
+	MD5_memset ((POINTER)context, 0, sizeof (*context));
 }
 
 /* MD5 basic transformation. Transforms state based on block.

Modified: Frontier/trunk/Common/source/quickdraw.c
===================================================================
--- Frontier/trunk/Common/source/quickdraw.c	2006-04-06 01:00:11 UTC (rev 1212)
+++ Frontier/trunk/Common/source/quickdraw.c	2006-04-06 01:02:50 UTC (rev 1213)
@@ -2202,17 +2202,17 @@
 #endif
 
 
-void setrect (Rect *rset, short top, short left, short bottom, short right) {
+void setrect (Rect *rset, short top, short pleft, short bottom, short pright) {
 	
 	register Rect *r = rset;
 	
 	(*r).top = top;
 	
-	(*r).left = left;
+	(*r).left = pleft;
 	
 	(*r).bottom = bottom;
 	
-	(*r).right = right;
+	(*r).right = pright;
 	} /*setrect*/
 	
 

Modified: Frontier/trunk/Common/source/uisharing.c
===================================================================
--- Frontier/trunk/Common/source/uisharing.c	2006-04-06 01:00:11 UTC (rev 1212)
+++ Frontier/trunk/Common/source/uisharing.c	2006-04-06 01:02:50 UTC (rev 1213)
@@ -1309,11 +1309,11 @@
 
 #endif
 
-Boolean uisOpenHandle (Handle h, Boolean flscriptedcard, Str255 windowname, short top, short left, uisEventCallback filter) {
+Boolean uisOpenHandle (Handle h, Boolean flscriptedcard, Str255 windowname, short top, short pleft, uisEventCallback filter) {
 	
 	Point pt;
 	
-	pt.h = left; pt.v = top;
+	pt.h = pleft; pt.v = top;
 	
 	if (wsGlobals.windowserver == 0)
 		return (false);
@@ -1324,7 +1324,7 @@
 	} /*uisOpenHandle*/
 	
 	
-Boolean uisOpenCardResource (short id, Boolean flscriptedcard, Str255 windowname, short top, short left, uisEventCallback filter) {
+Boolean uisOpenCardResource (short id, Boolean flscriptedcard, Str255 windowname, short top, short pleft, uisEventCallback filter) {
 	
 	Handle h;
 	
@@ -1339,15 +1339,15 @@
 		
 	DetachResource (h);
 	
-	return (uisOpenHandle (h, flscriptedcard, windowname, top, left, filter));
+	return (uisOpenHandle (h, flscriptedcard, windowname, top, pleft, filter));
 	} /*uisOpenCardResource*/
 	
 	
-Boolean uisRunModalHandle (Handle h, Boolean flscriptedcard, Str255 windowname, short top, short left, uisEventCallback filter) {
+Boolean uisRunModalHandle (Handle h, Boolean flscriptedcard, Str255 windowname, short top, short pleft, uisEventCallback filter) {
 	
 	Point pt;
 	
-	pt.h = left; pt.v = top;
+	pt.h = pleft; pt.v = top;
 	
 	if (wsGlobals.windowserver == 0)
 		return (false);
@@ -1358,7 +1358,7 @@
 	} /*uisRunModalHandle*/
 	
 	
-Boolean uisRunModalResource (short id, Boolean flscriptedcard, Str255 windowname, short top, short left, uisEventCallback filter) {
+Boolean uisRunModalResource (short id, Boolean flscriptedcard, Str255 windowname, short top, short pleft, uisEventCallback filter) {
 	
 	Handle h;
 	
@@ -1373,7 +1373,7 @@
 		
 	DetachResource (h);
 	
-	return (uisRunModalHandle (h, flscriptedcard, windowname, top, left, filter));
+	return (uisRunModalHandle (h, flscriptedcard, windowname, top, pleft, filter));
 	} /*uisRunModalResource*/
 	
 #ifndef isFrontier
@@ -1433,12 +1433,12 @@
 	} /*uisEdit*/
 	
 
-Boolean uisInit (ProcPtr callback, short idinsertafter, OSType idclientapp, unsigned short bitarray) {
+Boolean uisInit (ProcPtr pcallback, short idinsertafter, OSType idclientapp, unsigned short bitarray) {
 	
 	/*
 	initialize window sharing and menu sharing. 
 	
-	the callback is a routine that receives a Str255 as a parameter. it should
+	the pcallback is a routine that receives a Str255 as a parameter. it should
 	display the string in a modal dialog box and wait for the user to click 
 	on OK. it's used for reporting script compiling or runtime errors. pass in
 	nil if you want errors to not be reported to the user (not a great thing
@@ -1503,7 +1503,7 @@
 			if (initsharedmenusGlue (msGlobals.menuserver) != noErr)
 				goto error;
 		
-			if (setscripterrorcallbackGlue (msGlobals.menuserver, callback) != noErr)
+			if (setscripterrorcallbackGlue (msGlobals.menuserver, pcallback) != noErr)
 				goto error;
 			}
 		}


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

SF.net SVN: frontierkernel: [1212] Frontier/trunk/Common/source/shellwindowverbs.c

[<kar...@us...>]

Revision: 1212
Author:   karstenw
Date:     2006-04-05 18:00:11 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1212&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/shellwindowverbs.c
Modified: Frontier/trunk/Common/source/shellwindowverbs.c
===================================================================
--- Frontier/trunk/Common/source/shellwindowverbs.c	2006-04-06 00:20:14 UTC (rev 1211)
+++ Frontier/trunk/Common/source/shellwindowverbs.c	2006-04-06 01:00:11 UTC (rev 1212)
@@ -274,6 +274,7 @@
 
 
 static boolean openverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+#pragma unused (bserror)
 
 	/*
 	7.0b6 PBS: optional flReadOnly parameter allows outline-type windows
@@ -290,7 +291,7 @@
 	hdlwindowinfo hinfo;
 	short ctparams;
 	boolean flreadonly = false; /*editable by default*/
-	boolean flreturn = false;
+	boolean lflreturn = false;
 	boolean flbuttontable = false;
 	boolean flvisible = true;
 
@@ -332,15 +333,15 @@
 	
 	if ((flreadonly) && ((**hv).id == idwordprocessor)) { /*7.0b6 PBS: read-only wp-text is an error.*/
 	
-		hdlwindowinfo hinfo;
+		hdlwindowinfo lhinfo;
 				
 		langerrormessage ("\x5a""Can't open window as read-only because windows of type wp text don't support this feature.");	
 		
-		if (shellfinddatawindow ((Handle) (**hv).variabledata, &hinfo)) { /*window may be hidden -- if so, close*/
+		if (shellfinddatawindow ((Handle) (**hv).variabledata, &lhinfo)) { /*window may be hidden -- if so, close*/
 			
-			if ((**hinfo).flhidden) { /*if hidden, close the window*/
+			if ((**lhinfo).flhidden) { /*if hidden, close the window*/
 				
-				shellclose ((**hinfo).macwindow, false);
+				shellclose ((**lhinfo).macwindow, false);
 				} /*if*/
 			} /*if*/
 		
@@ -349,15 +350,15 @@
 	
 	if ((flbuttontable) && ((**hv).id != idoutlineprocessor)) { /*7.1b18 PBS: buttons for non-outlines is an error.*/
 
-		hdlwindowinfo hinfo;
+		hdlwindowinfo lhinfo;
 
 		langerrormessage ("\x52""Can't attach buttons to window because windows only outlines support this feature.");
 
-		if (shellfinddatawindow ((Handle) (**hv).variabledata, &hinfo)) { /*window may be hidden -- if so, close*/
+		if (shellfinddatawindow ((Handle) (**hv).variabledata, &lhinfo)) { /*window may be hidden -- if so, close*/
 			
-			if ((**hinfo).flhidden) { /*if hidden, close the window*/
+			if ((**lhinfo).flhidden) { /*if hidden, close the window*/
 				
-				shellclose ((**hinfo).macwindow, false);
+				shellclose ((**lhinfo).macwindow, false);
 				} /*if*/
 			} /*if*/
 		
@@ -414,17 +415,18 @@
 			shelladjustaftergrow ((**hinfo).macwindow);
 
 			shellpopglobals ();
-		#endif
+#endif
 		} /*if*/		
 	
 	if (!langzoomvalwindow (htable, bsname, val, true)) /*now make it visible*/
+
 		return (false);
 	
-	flreturn = langexternalsetreadonly (hv, flreadonly); /*7.0b6 PBS: set the read-only flag.*/
+	lflreturn = langexternalsetreadonly (hv, flreadonly); /*7.0b6 PBS: set the read-only flag.*/
 	
-	(*vreturned).data.flvalue = flreturn;
+	(*vreturned).data.flvalue = lflreturn;
 	
-	return (flreturn);
+	return (lflreturn);
 	} /*openverb*/
 
 
@@ -659,20 +661,20 @@
 static boolean closeverb (hdltreenode hparam1, tyvaluerecord *vreturned) {
 	
 	/*
-	2005-09-14 creedon: added fldialog parameter
-
-	8/26/92 dmb: don't allow the root window to be closed with this verb.
+	 2005-09-14 creedon: added fldialog parameter
+	 
+	 8/26/92 dmb: don't allow the root window to be closed with this verb.
+	 
+	 (note: used to crash; need to call shellclose to handle root windows)
+	 */
 	
-	(note: used to crash; need to call shellclose to handle root windows)
-	*/
-	
 	register boolean fl = false;
 	hdlwindowinfo hinfo;
 	boolean fldialog;
 	tyvaluerecord val;
 	short ctconsumed = 1;
 	short ctpositional = 1;
-
+	
 	setbooleanvalue (false, &val); /* defaults to false */
 	
 	if (!getwinparam (hparam1, 1, &hinfo))
@@ -684,17 +686,17 @@
 		return (false);
 	
 	fldialog = val.data.flvalue;
-
+	
 	if (hinfo != nil) { /* close it if it isn't a root window */
 		
 		// if ((**hinfo).parentwindow != nil /*|| shellgetexternaldata (hinfo, &hdata)*/)
-			fl = shellclose ((**hinfo).macwindow, fldialog);
-		}
+		fl = shellclose ((**hinfo).macwindow, fldialog);
+	}
 	
 	setbooleanvalue (fl, vreturned);
 	
 	return (true); 
-	} /* closeverb */
+} /*closeverb*/
 	
 
 static boolean updateverb (hdltreenode hparam1, tyvaluerecord *vreturned) {


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

SF.net SVN: frontierkernel: [1211] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1211
Author:   karstenw
Date:     2006-04-05 17:20:14 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1211&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/claybrowserexpand.c
    Frontier/trunk/Common/source/timedate.c
Modified: Frontier/trunk/Common/source/claybrowserexpand.c
===================================================================
--- Frontier/trunk/Common/source/claybrowserexpand.c	2006-04-06 00:02:31 UTC (rev 1210)
+++ Frontier/trunk/Common/source/claybrowserexpand.c	2006-04-06 00:20:14 UTC (rev 1211)
@@ -423,7 +423,8 @@
 	
 	
 static boolean expandcancelledvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	if ((**hnode).tmpbit) {
 		
 		opstartinternalchange ();

Modified: Frontier/trunk/Common/source/timedate.c
===================================================================
--- Frontier/trunk/Common/source/timedate.c	2006-04-06 00:02:31 UTC (rev 1210)
+++ Frontier/trunk/Common/source/timedate.c	2006-04-06 00:20:14 UTC (rev 1211)
@@ -524,9 +524,9 @@
 #endif
 
 
-void timestamp (long *time) {
+void timestamp (long *ptime) {
 	
-	GetDateTime ((unsigned long *) time);
+	GetDateTime ((unsigned long *) ptime);
 	} /*timestamp*/
 	
 	
@@ -571,42 +571,49 @@
 			}
 
 		return (true);
-	#endif
+#endif
 	} /*setsystemclock*/
 
 
-static void adjustforcurrenttimezone (unsigned long *time) {
-	
+static void
+adjustforcurrenttimezone (unsigned long *ptime)
+{
 	/*
 	5.1b23 dmb: avoid wraparound for near-zero dates
 	*/
 
-	unsigned long adjustedtime = *time + getcurrenttimezonebias ();
-	
-	if (sgn (*time) == sgn (adjustedtime))
-		*time = adjustedtime;
+	unsigned long adjustedtime = *ptime + getcurrenttimezonebias ();
+
+	if (sgn (*ptime) == sgn (adjustedtime))
+		*ptime = adjustedtime;
 	} /*adjustforcurrenttimezone*/
 
 
-boolean timegreaterthan (unsigned long time1, unsigned long time2) {
-	
+boolean
+timegreaterthan (
+		unsigned long time1,
+		unsigned long time2)
+{
 	return (time1 > time2);
 	} /*timegreaterthan*/
-	
-	
-boolean timelessthan (unsigned long time1, unsigned long time2) {
-	
+
+
+boolean
+timelessthan (
+		unsigned long time1,
+		unsigned long time2)
+{
 	return (time1 < time2);
-	} /*timelessthan*/
+} /*timelessthan*/
 
 
-boolean timetotimestring (unsigned long time, bigstring bstime, boolean flwantseconds) {
+boolean timetotimestring (unsigned long ptime, bigstring bstime, boolean flwantseconds) {
 
-	#ifdef MACVERSION
-		//Code change by Timothy Paustian Sunday, June 25, 2000 9:45:30 PM
-		//updated call for carbon, the nil parameter says use the current script
-		//for formatting the time.
-		TimeString (time, flwantseconds, bstime, nil);
+#ifdef MACVERSION
+	//Code change by Timothy Paustian Sunday, June 25, 2000 9:45:30 PM
+	//updated call for carbon, the nil parameter says use the current script
+	//for formatting the time.
+	TimeString (ptime, flwantseconds, bstime, nil);
 
 		return (true);
 	#endif
@@ -616,7 +623,7 @@
 		FILETIME filetime;
 		int len;
 
-		secondstofiletime (time, &filetime);
+		secondstofiletime (ptime, &filetime);
 
 		FileTimeToSystemTime (&filetime, &date);
 
@@ -629,14 +636,14 @@
 	} /*timetotimestring*/
 
 
-boolean timetodatestring (unsigned long time, bigstring bsdate, boolean flabbreviate) {
+boolean timetodatestring (unsigned long ptime, bigstring bsdate, boolean flabbreviate) {
 
-	#ifdef MACVERSION
-		//Code change by Timothy Paustian Sunday, June 25, 2000 9:45:49 PM
-		//Updated call for carbon
-		DateString (time, flabbreviate? abbrevDate : shortDate, bsdate, nil);
+#ifdef MACVERSION
+	//Code change by Timothy Paustian Sunday, June 25, 2000 9:45:49 PM
+	//Updated call for carbon
+	DateString (ptime, flabbreviate? abbrevDate : shortDate, bsdate, nil);
 
-		return (true);
+	return (true);
 	#endif
 
 	#ifdef WIN95VERSION
@@ -644,7 +651,7 @@
 		FILETIME filetime;
 		int len;
 
-		secondstofiletime (time, &filetime);
+		secondstofiletime (ptime, &filetime);
 
 		FileTimeToSystemTime (&filetime, &date);
 
@@ -657,7 +664,7 @@
 	} /*timetodatestring*/
 
 
-boolean stringtotime (bigstring bsdate, unsigned long *time) {
+boolean stringtotime (bigstring bsdate, unsigned long *ptime) {
 	
 	/*
 	9/13/91 dmb: use the script manager to translate a string to a 
@@ -681,20 +688,20 @@
 		boolean flgottime;
 		DateTimeRec shortdate;
 		boolean flUseGMT = false;
-		long index;
+		long idx;
 		
-		index = stringlength (bsdate);
+		idx = stringlength (bsdate);
 
-		while (getstringcharacter(bsdate, index-1) == ' ')
-			--index;
+		while (getstringcharacter(bsdate, idx-1) == ' ')
+			--idx;
 
-		if (index > 3) {
-			if ((getstringcharacter(bsdate, index - 3) == 'G') && (getstringcharacter(bsdate, index - 2) == 'M') && (getstringcharacter(bsdate, index -1) == 'T')) {
+		if (idx > 3) {
+			if ((getstringcharacter(bsdate, idx - 3) == 'G') && (getstringcharacter(bsdate, idx - 2) == 'M') && (getstringcharacter(bsdate, idx -1) == 'T')) {
 				flUseGMT = true;
 				}
 			}
 
-		*time = 0; /*default return value*/
+		*ptime = 0; /*default return value*/
 		
 		clearbytes (&longdate, sizeof (longdate));
 		
@@ -731,10 +738,10 @@
 		
 		shortdate.second = longdate.ld.second;
 		
-		DateToSeconds (&shortdate, time);
+		DateToSeconds (&shortdate, ptime);
 
 		if (flUseGMT) {
-			adjustforcurrenttimezone (time);
+			adjustforcurrenttimezone (ptime);
 			}
 		
 	#endif
@@ -746,7 +753,7 @@
 		unsigned long vu;
 		tyvalidationerror errinfo;
 		bigstring bsdate1, bstime1;
-		short index;
+		short idx;
 		tyinternationalinfo * ii;
 		boolean flUseGMT = false;
 		boolean flSaveTimeFormat;
@@ -756,36 +763,36 @@
 		if (ii == NULL)
 			return (false);
 
-		index = stringlength (bsdate);
+		idx = stringlength (bsdate);
 		
-		if (index > 128) //5.0b17 dmb: too long for a date, avoid crash
+		if (idx > 128) //5.0b17 dmb: too long for a date, avoid crash
 			return (false);
 
-		while (getstringcharacter(bsdate, index-1) == ' ')
-			--index;
+		while (getstringcharacter(bsdate, idx-1) == ' ')
+			--idx;
 
-		if (index > 3) {
-			if ((getstringcharacter(bsdate, index - 3) == 'G') && (getstringcharacter(bsdate, index - 2) == 'M') && (getstringcharacter(bsdate, index -1) == 'T')) {
+		if (idx > 3) {
+			if ((getstringcharacter(bsdate, idx - 3) == 'G') && (getstringcharacter(bsdate, idx - 2) == 'M') && (getstringcharacter(bsdate, idx -1) == 'T')) {
 				flUseGMT = true;
 				flSaveTimeFormat = ii->defaultTimeFormat;
 				ii->defaultTimeFormat = true;
 				}
 			}
 
-		index = 1;
-		if (scanstring (getstringcharacter(ii->timesep, 0), bsdate, &index)) {
-			--index;
+		idx = 1;
+		if (scanstring (getstringcharacter(ii->timesep, 0), bsdate, &idx)) {
+			--idx;
 			/* now check to see if this is a time preceded by a date */
-			if (index > 5) {  /*blank digit colon - 3 min, possibly 4 - date must be at least 3 i.e. 1/5 */
-				if (isnumeric (getstringcharacter(bsdate, index-1))) {
-					if (index + 1 < stringlength (bsdate)) {
-						if (isnumeric (getstringcharacter(bsdate, index+1))) {
-							if (getstringcharacter(bsdate, index-2) == ' ') {
-								setstringcharacter(bsdate, index-2, ';');
+			if (idx > 5) {  /*blank digit colon - 3 min, possibly 4 - date must be at least 3 i.e. 1/5 */
+				if (isnumeric (getstringcharacter(bsdate, idx-1))) {
+					if (idx + 1 < stringlength (bsdate)) {
+						if (isnumeric (getstringcharacter(bsdate, idx+1))) {
+							if (getstringcharacter(bsdate, idx-2) == ' ') {
+								setstringcharacter(bsdate, idx-2, ';');
 								}
 							else {
-								if ((getstringcharacter(bsdate, index-3) == ' ') && (isnumeric (getstringcharacter(bsdate, index-2)))) {
-									setstringcharacter(bsdate, index-3, ';');
+								if ((getstringcharacter(bsdate, idx-3) == ' ') && (isnumeric (getstringcharacter(bsdate, idx-2)))) {
+									setstringcharacter(bsdate, idx-3, ';');
 									}
 								}
 							}
@@ -794,20 +801,20 @@
 				}
 			}
 		else {
-			index = 1;
-			if (scanstring (':', bsdate, &index)) {
-				--index;
+			idx = 1;
+			if (scanstring (':', bsdate, &idx)) {
+				--idx;
 				/* now check to see if this is a time preceded by a date */
-				if (index > 5) {  /*blank digit colon - 3 min, possibly 4 - date must be at least 3 i.e. 1/5 */
-					if (isnumeric (getstringcharacter(bsdate, index-1))) {
-						if (index + 1 < stringlength (bsdate)) {
-							if (isnumeric (getstringcharacter(bsdate, index+1))) {
-								if (getstringcharacter(bsdate, index-2) == ' ') {
-									setstringcharacter(bsdate, index-2, ';');
+				if (idx > 5) {  /*blank digit colon - 3 min, possibly 4 - date must be at least 3 i.e. 1/5 */
+					if (isnumeric (getstringcharacter(bsdate, idx-1))) {
+						if (idx + 1 < stringlength (bsdate)) {
+							if (isnumeric (getstringcharacter(bsdate, idx+1))) {
+								if (getstringcharacter(bsdate, idx-2) == ' ') {
+									setstringcharacter(bsdate, idx-2, ';');
 									}
 								else {
-									if ((getstringcharacter(bsdate, index-3) == ' ') && (isnumeric (getstringcharacter(bsdate, index-2)))) {
-										setstringcharacter(bsdate, index-3, ';');
+									if ((getstringcharacter(bsdate, idx-3) == ' ') && (isnumeric (getstringcharacter(bsdate, idx-2)))) {
+										setstringcharacter(bsdate, idx-3, ';');
 										}
 									}
 								}
@@ -819,14 +826,14 @@
 
 		/* if the string contains a semicolon ";" then split into two strings are parse date;time */
 
-		index = 1;
-		if (scanstring (';', bsdate, &index)) {
-			midstring (bsdate, 1, index-1, bsdate1);
-			midstring (bsdate, index + 1, stringlength(bsdate) - index, bstime1);
+		idx = 1;
+		if (scanstring (';', bsdate, &idx)) {
+			midstring (bsdate, 1, idx-1, bsdate1);
+			midstring (bsdate, idx + 1, stringlength(bsdate) - idx, bstime1);
 
-			++index;
-			if (scanstring (';', bsdate, &index)) {
-				midstring (bsdate, index + 1, stringlength(bsdate) - index, bstime1);
+			++idx;
+			if (scanstring (';', bsdate, &idx)) {
+				midstring (bsdate, idx + 1, stringlength(bsdate) - idx, bstime1);
 				}
 
 
@@ -836,11 +843,11 @@
 				{
 				ValidTime (stringbaseaddress (bstime1), stringlength (bstime1), &return2DT, &actualDT, &vu, &errinfo); 
 
-				*time = datetimetoseconds (returnDT.day, returnDT.month, returnDT.year, return2DT.hour, return2DT.minute, return2DT.second);
+				*ptime = datetimetoseconds (returnDT.day, returnDT.month, returnDT.year, return2DT.hour, return2DT.minute, return2DT.second);
 
 				if (errinfo.errorNumber == 0) {
 					if (flUseGMT) {
-						adjustforcurrenttimezone (time);
+						adjustforcurrenttimezone (ptime);
 						ii->defaultTimeFormat = flSaveTimeFormat;
 						}
 					return (true);
@@ -853,18 +860,18 @@
 
 		ValidDate (stringbaseaddress (bsdate), stringlength (bsdate), &returnDT, &actualDT, &vu, &errinfo); 
 
-		*time = datetimetoseconds (returnDT.day, returnDT.month, returnDT.year, 0,0,0);
+		*ptime = datetimetoseconds (returnDT.day, returnDT.month, returnDT.year, 0,0,0);
 
 		if (errinfo.errorNumber != 0)
 			{
 			if (errinfo.errorNumber == err_kInvalidPunctuation) {
 				ValidTime (stringbaseaddress (bsdate), stringlength (bsdate), &returnDT, &actualDT, &vu, &errinfo); 
 
-				*time = datetimetoseconds (returnDT.day, returnDT.month, returnDT.year, returnDT.hour, returnDT.minute, returnDT.second);
+				*ptime = datetimetoseconds (returnDT.day, returnDT.month, returnDT.year, returnDT.hour, returnDT.minute, returnDT.second);
 
 				if (errinfo.errorNumber == 0) {
 					if (flUseGMT) {
-						adjustforcurrenttimezone (time);
+						adjustforcurrenttimezone (ptime);
 						ii->defaultTimeFormat = flSaveTimeFormat;
 						}
 					return (true);
@@ -896,21 +903,21 @@
 		
 		if (year < 100) { /*use script manager's StringToDate heuristic -- pg 188 in \xA7 docs*/
 			
-			long thisyear, century;
+			long thisyear, lcentury;
 			
 			GetTime (&date);
 			
 			thisyear = date.year % 100;
 			
-			century = date.year - thisyear;
+			lcentury = date.year - thisyear;
 			
 			if ((thisyear <= 10) && (year >= 90)) /*assume last century*/
-				century -= 100;
+				lcentury -= 100;
 			else
 				if ((thisyear >= 90) && (year <= 10)) /*assume next century*/
-					century += 100;
+					lcentury += 100;
 			
-			year += century;
+			year += lcentury;
 			}
 		
 		clearbytes (&date, sizeof (date));
@@ -938,21 +945,21 @@
 		
 		if (year < 100) { /*use script manager's StringToDate heuristic -- pg 188 in \xA7 docs*/
 			
-			long thisyear, century;
+			long thisyear, lcentury;
 			
 			GetSystemTime (&date);
 			
 			thisyear = date.wYear % 100;
 			
-			century = date.wYear - thisyear;
+			lcentury = date.wYear - thisyear;
 			
 			if ((thisyear <= 10) && (year >= 90)) /*assume last century*/
-				century -= 100;
+				lcentury -= 100;
 			else
 				if ((thisyear >= 90) && (year <= 10)) /*assume next century*/
-					century += 100;
+					lcentury += 100;
 			
-			year += century;
+			year += lcentury;
 			}
 		
 		// Win call doesn't wrap around h:m:s


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

SF.net SVN: frontierkernel: [1210] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1210
Author:   karstenw
Date:     2006-04-05 17:02:31 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1210&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/lang.c
    Frontier/trunk/Common/source/langpack.c
    Frontier/trunk/Common/source/shelljuggler.c
Modified: Frontier/trunk/Common/source/lang.c
===================================================================
--- Frontier/trunk/Common/source/lang.c	2006-04-05 23:59:59 UTC (rev 1209)
+++ Frontier/trunk/Common/source/lang.c	2006-04-06 00:02:31 UTC (rev 1210)
@@ -551,7 +551,8 @@
 	
 	
 boolean langdefaultpoptable (hdlhashtable htable) {
-	
+#pragma unused (htable)
+
 	register hdlhashtable ht = currenthashtable;
 	
 	unchainhashtable ();
@@ -629,12 +630,14 @@
 	if (flerror) {
 		
 		if (isemptystring (bserror))
+		{
 			if (getoserror () != noErr)
 				getsystemerrorstring (getoserror (), bserror);
 			else
 				getstringlist (langerrorlist, undefinederror, bserror);
 		}
-	
+	}
+
 	langcallbacks.errormessagecallback = savecallback;
 	
 	langcallbacks.errormessagerefcon = saverefcon;
@@ -697,7 +700,8 @@
 
 
 static boolean renumberlinesvisit (hdltreenode hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	when langrun executes code from within a script, it tries to preserve 
 	the ability to locate errors and step in the debugger.  from the 

Modified: Frontier/trunk/Common/source/langpack.c
===================================================================
--- Frontier/trunk/Common/source/langpack.c	2006-04-05 23:59:59 UTC (rev 1209)
+++ Frontier/trunk/Common/source/langpack.c	2006-04-06 00:02:31 UTC (rev 1210)
@@ -295,12 +295,12 @@
 			break;
 		
 		case externalvaluetype: {
-			register Handle h = val.data.externalvalue;
+			register Handle lh = val.data.externalvalue;
 			Handle hpacked;
 			
 			initbeachball (left);
 			
-			fl = langexternalmemorypack ((hdlexternalvariable) h, &hpacked, hnode);
+			fl = langexternalmemorypack ((hdlexternalvariable) lh, &hpacked, hnode);
 			
 			if (!fl)
 				break;

Modified: Frontier/trunk/Common/source/shelljuggler.c
===================================================================
--- Frontier/trunk/Common/source/shelljuggler.c	2006-04-05 23:59:59 UTC (rev 1209)
+++ Frontier/trunk/Common/source/shelljuggler.c	2006-04-06 00:02:31 UTC (rev 1210)
@@ -90,11 +90,16 @@
 #endif
 	
 	return (true);
-	} /*shellactivate*/
+} /*shellactivate*/
 
 
-static boolean shelljugglervisit (WindowPtr w, ptrvoid refcon) {
-	
+static boolean
+shelljugglervisit (
+		WindowPtr	 w,
+		ptrvoid		 refcon)
+{
+#pragma unused (refcon)
+
 	shellpushglobals (w);
 	
 	(*shellglobals.resumeroutine) (flshellactive);


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

SF.net SVN: frontierkernel: [1209] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1209
Author:   karstenw
Date:     2006-04-05 16:59:59 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1209&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/about.c
    Frontier/trunk/Common/source/command.c
    Frontier/trunk/Common/source/file.c
    Frontier/trunk/Common/source/filealias.c
    Frontier/trunk/Common/source/frontierdebug.c
    Frontier/trunk/Common/source/langexternal.c
    Frontier/trunk/Common/source/langlist.c
    Frontier/trunk/Common/source/langquicktime.c
    Frontier/trunk/Common/source/langsystypes.c
    Frontier/trunk/Common/source/langwinipc.c
    Frontier/trunk/Common/source/langxml.c
    Frontier/trunk/Common/source/op.c
    Frontier/trunk/Common/source/osawindows.c
    Frontier/trunk/Common/source/pictverbs.c
    Frontier/trunk/Common/source/popup.c
    Frontier/trunk/Common/source/shellmouse.c
    Frontier/trunk/Common/source/shellprint.c
    Frontier/trunk/Common/source/shellverbs.c
    Frontier/trunk/Common/source/stringverbs.c
    Frontier/trunk/Common/source/tablefind.c
    Frontier/trunk/Common/source/wpengine.c
Modified: Frontier/trunk/Common/source/about.c
===================================================================
--- Frontier/trunk/Common/source/about.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/about.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -1276,7 +1276,8 @@
 
 
 static boolean aboutmousedown (Point pt, tyclickflags flags) {
-	
+#pragma unused (flags)
+
 	/*
 	1/24/91 dmb: to allow the home window to be dragged with a single click, 
 	even when it's not already the front window, the dontconsumefrontclicks 
@@ -1756,7 +1757,8 @@
 
 
 boolean openabout (boolean flzoom, long ctreservebytes) {
-	
+#pragma unused(flzoom)
+
 	/*
 	2.1b5 dmb: added ctreservebytes parameter. of non-zero, caller wants us to 
 	reserve space in the heap below the dialog record (during initialization)
@@ -1800,7 +1802,8 @@
 
 
 void closeabout (boolean flzoom, short minticks) {
-	
+#pragma unused(flzoom)
+
 	hdlwindowinfo hinfo;
 	
 	if (findaboutwindow (&hinfo)) {

Modified: Frontier/trunk/Common/source/command.c
===================================================================
--- Frontier/trunk/Common/source/command.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/command.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -53,7 +53,8 @@
 
 
 static boolean cmdsavestring (short stringnumber, Handle htext) {
-	
+#pragma unused(stringnumber)
+
 	/*
 	the cmd dialog only has one string, so we ignore the stringnumber param.
 	
@@ -90,7 +91,8 @@
 	
 	
 static boolean cmdloadstring (short stringnumber, Handle *h) {
-	
+#pragma unused(stringnumber)
+
 	/*
 	1/21/93 dmb: don't set superglobals manually anymore
 	
@@ -104,7 +106,8 @@
 
 
 static boolean cmderrorroutine (long refcon, long lnum, short charnum, hdlhashtable *htable, bigstring bsname) {
-	
+#pragma unused (refcon, htable)
+
 	/*
 	a lang error occurred; select the offending text in the quickscript window
 	*/
@@ -137,7 +140,8 @@
 
 
 static boolean cmdtexthit (Point pt) {
-	
+#pragma unused (pt)
+
 	/*
 	2.1b6 dmb: use debugging context for zooming, if available
 	*/
@@ -149,7 +153,7 @@
 		
 		minigetselstring (0, bs);
 		
-		if (scriptgetdebuggingcontext (&hcontext)) /*gauranteed to be non-nil*/
+		if (scriptgetdebuggingcontext (&hcontext)) /*guaranteed to be non-nil*/
 			pushhashtable (hcontext);
 		
 		langzoomobject (bs);

Modified: Frontier/trunk/Common/source/file.c
===================================================================
--- Frontier/trunk/Common/source/file.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/file.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -207,22 +207,22 @@
 	*/
 	
 	#ifdef MACVERSION
-		long filesize;
+		long lfilesize;
 		
-		if (GetEOF (fnum, &filesize) != noErr)
-			filesize = 0;
+		if (GetEOF (fnum, &lfilesize) != noErr)
+			lfilesize = 0;
 		
-		return (filesize);
+		return (lfilesize);
 	#endif
 
 	#ifdef WIN95VERSION
-		long filesize;
+		long lfilesize;
 
-		filesize = GetFileSize (fnum, NULL);
-		if (filesize == -1L)
-			filesize = 0L;
+		lfilesize = GetFileSize (fnum, NULL);
+		if (lfilesize == -1L)
+			lfilesize = 0L;
 
-		return (filesize);
+		return (lfilesize);
 	#endif
 	} /*filegetsize*/
 
@@ -403,17 +403,17 @@
 	indicated handle and return true if it worked.
 	*/
 	
-	register long filesize;
+	register long lfilesize;
 	register Handle h;
 	
-	filesize = filegetsize (fnum);
+	lfilesize = filegetsize (fnum);
 	
-	if (!newclearhandle (filesize, hreturned))
+	if (!newclearhandle (lfilesize, hreturned))
 		return (false);
 		
 	h = *hreturned; /*copy into register*/
 		
-	if (!fileread (fnum, filesize, *h)) {
+	if (!fileread (fnum, lfilesize, *h)) {
 		
 		disposehandle (h);
 		
@@ -462,7 +462,9 @@
 #endif //MACVERSION
 
 boolean flushvolumechanges (const tyfilespec *fs, hdlfilenum fnum) {
-#ifdef MACVERSION	
+#ifdef MACVERSION
+#	pragma unused(fnum)
+
 	/*
 	4.1b7 dmb: was -- FlushVol (nil, (*fs).vRefNum);
 	
@@ -639,10 +641,11 @@
 	
 	setfserrorparam (fs); /*in case error message takes a filename parameter*/
 	
-	if (flreadonly) perm = fsRdPerm;
-	else perm = fsRdWrPerm;
-	
-	
+	if (flreadonly)
+		perm = fsRdPerm;
+	else
+		perm = fsRdWrPerm;
+
 	errcode = FSpOpenDF (fs, perm, fnum);
 	
 	if (oserror (errcode)) {

Modified: Frontier/trunk/Common/source/filealias.c
===================================================================
--- Frontier/trunk/Common/source/filealias.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/filealias.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -262,17 +262,20 @@
 	ParamBlockRec	cpb;
 	OSErr			err;
 	Handle			h;
-	
-	if (!FSpIsVolume(volSpec)) return false;
-	
+
+	if (!FSpIsVolume(volSpec))
+		return false;
+
 	pb.volumeParam.ioNamePtr = NULL;
 	pb.volumeParam.ioVRefNum = volSpec->vRefNum;
 	pb.volumeParam.ioVolIndex = 0;
-	
+
 	err = PBHGetVInfoSync(&pb);
-	if (err != noErr) return false;
-	
-		// set up for Control call
+
+	if (err != noErr)
+		return false;
+
+	// set up for Control call
 	cpb.cntrlParam.ioCRefNum = pb.volumeParam.ioVDRefNum;
 	cpb.cntrlParam.ioVRefNum = pb.volumeParam.ioVDrvInfo;
 	

Modified: Frontier/trunk/Common/source/frontierdebug.c
===================================================================
--- Frontier/trunk/Common/source/frontierdebug.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/frontierdebug.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -216,6 +216,7 @@
 
 
 static void logtodialog (char *str) {
+#pragma unused(str)
 
 	}/*logtodialog*/
 

Modified: Frontier/trunk/Common/source/langexternal.c
===================================================================
--- Frontier/trunk/Common/source/langexternal.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/langexternal.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -2362,7 +2362,7 @@
 	} /*updateconfigsettings*/
 
 
-boolean langexternalgetconfig (tyvaluetype type, short configid, tyconfigrecord *config) {
+boolean langexternalgetconfig (tyvaluetype type, short configid, tyconfigrecord *pconfig) {
 	
 	/*
 	5.0b9 dmb: expose functionality so user prefs hold in all contexts,
@@ -2380,7 +2380,7 @@
 		fltryingtoupdate = false;
 		}
 
-	return (shellgetconfig (configid, config));
+	return (shellgetconfig (configid, pconfig));
 	} /*langexternalgetconfig*/
 
 
@@ -2911,15 +2911,21 @@
 
 
 boolean langexternalsymbolchanged (hdlhashtable htable, const bigstring bsname, hdlhashnode hnode, boolean flvalue) {
+#pragma unused(flvalue)
 
 	return langexternalsymbolinserted (htable, bsname, hnode);
 	} /*langexternalsymbolchanged*/
 
 
 boolean langexternalsymbolinserted (hdlhashtable htable, const bigstring bsname, hdlhashnode hnode) {
+#if !langexternalfind_optimization
+#	pragma unused (htable, bsname, hnode)
+#endif
 
-	#if langexternalfind_optimization
-		if (hnode != nil && hnode != HNoNode && (**hnode).val.valuetype == externalvaluetype) {
+#if langexternalfind_optimization
+	if (	hnode != nil
+		 && hnode != HNoNode
+		 && (**hnode).val.valuetype == externalvaluetype) {
 		
 			hdlexternalvariable	hv = (hdlexternalvariable) (**hnode).val.data.externalvalue;
 

Modified: Frontier/trunk/Common/source/langlist.c
===================================================================
--- Frontier/trunk/Common/source/langlist.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/langlist.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -367,7 +367,7 @@
 	an array of keys for each type.
 	*/
 	
-	register short *pi = (short *) pints;
+	register short *lpi = (short *) pints;
 	boolean flrecord = listtype == recordvaluetype;
 	tyvaluerecord itemval;
 	
@@ -383,7 +383,7 @@
 	
 	while (--ctints >= 0) { /*process each int in the array*/
 		
-		setintvalue (*pi++, &itemval);
+		setintvalue (*lpi++, &itemval);
 
 		if (!langpushlistval (*intlist, nil, &itemval))
 			goto error;
@@ -405,7 +405,7 @@
 	2.1b2 dmb: pull out the array of short integers from the list
 	*/
 	
-	register short *pi = (short *) pints;
+	register short *lpi = (short *) pints;
 	tyvaluerecord val;
 	long ctitems;
 	long n;
@@ -427,7 +427,7 @@
 		if (!coercevalue (&val, intvaluetype))
 			return (false);
 
-		*pi++ = val.data.intvalue;
+		*lpi++ = val.data.intvalue;
 		}
 	
 	return (true);
@@ -447,7 +447,8 @@
 
 
 static boolean nofunctioncallsvisit (hdltreenode hnode, void *refcon) {
-	
+#pragma unused (refcon)
+
 	return ((**hnode).nodetype != functionop);
 	} /*nofunctioncallsvisit*/
 
@@ -692,7 +693,8 @@
 
 
 static boolean coercelistcontents (tyvaluerecord *val, tyvaluetype totype, hdllistrecord hlist, long ctitems) {
-	
+#pragma unused(val)
+
 	/*
 	4.0b7 dmb:  when list->totype coercion otherwise fails, we try to coerce each item 
 	in the list to totype. if we success, we'll return true even though the value we 
@@ -1254,7 +1256,8 @@
 
 
 static boolean langvisitlistvaluesvisit (Handle hdata, ptrstring bskey, ptrvoid refcon) {
-	
+#pragma unused (bskey)
+
 	/*
 	2004-11-04 aradke: helper for langvisitlistvalues, called from opvisitlist.
 	*/

Modified: Frontier/trunk/Common/source/langquicktime.c
===================================================================
--- Frontier/trunk/Common/source/langquicktime.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/langquicktime.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -83,7 +83,8 @@
 
 
 static boolean quicktimeopenverb (hdltreenode hp1, tyvaluerecord *v) {
-	
+#pragma unused(v)
+
 	/*
 	7.0b4 PBS: Open a movie in the QuickTime player window.
 	*/

Modified: Frontier/trunk/Common/source/langsystypes.c
===================================================================
--- Frontier/trunk/Common/source/langsystypes.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/langsystypes.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -154,7 +154,8 @@
 
 
 static boolean findvaluevisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid valfind) {
-	
+#pragma unused (bs, hnode)
+
 	return (val.data.longvalue == (long) valfind);	//.data.longvalue
 	} /*findvaluevisit*/
 
@@ -226,7 +227,8 @@
 
 
 static boolean getostypevalnamevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
-	
+#pragma unused (hnode)
+
 	/*
 	3.0.2b1 dmb: we now look in all loaded app tables for a match when 
 	converting an terminology value (a string4 value) its name

Modified: Frontier/trunk/Common/source/langwinipc.c
===================================================================
--- Frontier/trunk/Common/source/langwinipc.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/langwinipc.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -69,7 +69,8 @@
 
 
 boolean langwinipcerrorroutine (bigstring bs, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	if an error occurs while processing a runscript verb, we want to 
 	return the text that would normally go into the langerror window as 
@@ -881,7 +882,14 @@
 #endif
 
 
-static boolean langkernelbuildparamlist (hdltreenode hcode, tyvaluerecord * listval, hdltreenode *hparams, unsigned int * errarg) {
+static boolean
+langkernelbuildparamlist (
+		hdltreenode		 hcode,
+		tyvaluerecord	*listval,
+		hdltreenode		*hparams,
+		unsigned int	*errarg)
+{
+#pragma unused (hcode)
 	
 	/*
 	take all of the parameters in the incoming verb hverb and build a code 

Modified: Frontier/trunk/Common/source/langxml.c
===================================================================
--- Frontier/trunk/Common/source/langxml.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/langxml.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -958,7 +958,8 @@
 
 
 static boolean parseremotefunction (bigstring bs, ptrstring bsprotocol, ptrstring bsserver, short *port) {
-	
+#pragma unused (port)
+
 	/*
 	5.0.2 dmb: given a string like "rpc2://betty.userland.com:81", set bsprotocol to "rpc2", 
 	server to "betty.userland.com"
@@ -2329,7 +2330,8 @@
 
 
 static boolean xmlvaltostring (tyvaluerecord xmlval, short indentlevel, boolean fltranslatestrings, Handle *string) {
-	
+#pragma unused(indentlevel)
+
 	/*
 	on valToString (val, indentlevel=0) { //http://www.microsoft.com/standards/xml/xmldata.htm#ComplexTypes
 		\xC7Return an XML-Data representation of a Frontier value

Modified: Frontier/trunk/Common/source/op.c
===================================================================
--- Frontier/trunk/Common/source/op.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/op.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -354,7 +354,8 @@
 
 
 static boolean opfindoffsetvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	bigstring bs;
 	short len;
 	
@@ -1130,7 +1131,8 @@
 
 
 static boolean opmovetovisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	(**outlinedata).hbarcursor = hnode; /*move cursor to first headline encountered*/
 	
 	return (false); /*stop visiting*/
@@ -1704,7 +1706,8 @@
 	
 	
 void opsetcursorinfo (long row, short col) {
-	
+#pragma unused (col)
+
 	/*
 	translate a row and column position into the outline's internal data
 	structure.

Modified: Frontier/trunk/Common/source/osawindows.c
===================================================================
--- Frontier/trunk/Common/source/osawindows.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/osawindows.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -97,8 +97,14 @@
 static boolean removewindowsharinghandlers (void);
 
 
-static pascal ComponentResult handlewindoweventcommand (Handle hglobals, EventRecord *ev, tyWindowSharingGlobals *wsGlobals) {
-	
+static pascal ComponentResult
+handlewindoweventcommand (
+		Handle					 hglobals,
+		EventRecord				*ev,
+		tyWindowSharingGlobals	*pwsGlobals)
+{
+#pragma unused (hglobals)
+
 	boolean flcloseallwindows = false;
 	WindowPtr w;
 	boolean fl = false;
@@ -161,7 +167,7 @@
 	
 	shellpopglobals ();
 	
-	(*wsGlobals).flcloseallwindows = flcloseallwindows; /****/
+	(*pwsGlobals).flcloseallwindows = flcloseallwindows; /****/
 	
 	/*
 	processyield ();
@@ -172,19 +178,22 @@
 
 
 static pascal ComponentResult windowiscardcommand (Handle hglobals, WindowPtr w) {
-	
+#pragma unused (hglobals)
+
 	return (isshellwindow (w));
 	} /*windowiscardcommand*/
 
 
 static pascal ComponentResult closewindowcommand (Handle hglobals, WindowPtr w) {
-	
+#pragma unused (hglobals)
+
 	return (shellclosewindow (w));
 	} /*closewindowcommand*/
 
 
 static pascal ComponentResult windoweditcommand (Handle hglobals, short editcmd) {
-	
+#pragma unused (hglobals)
+
 	register WindowPtr w;
 	register boolean fl;
 	
@@ -204,10 +213,16 @@
 	} /*windoweditcommand*/
 
 
-static pascal ComponentResult windowopencommand (Handle hglobals, Handle h, short flscripted, Str255 windowname, Point pt, uisEventCallback filter) {
-	
-	#pragma unused (flscripted, windowname, pt, filter)
-	
+static pascal ComponentResult
+windowopencommand (
+		Handle				 hglobals,
+		Handle				 h,
+		short				 flscripted,
+		Str255				 windowname,
+		Point				 pt,
+		uisEventCallback	 filter) {
+#pragma unused (hglobals, flscripted, windowname, pt, filter)
+
 	/*
 	2.1b8 dmb: new routine so client can open window at will
 	*/
@@ -262,7 +277,8 @@
 
 
 static pascal OSErr handleselectwindow (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) {
-	
+#pragma unused (reply, refcon)
+
 	/*
 	handle the window select event in the current application context.
 	

Modified: Frontier/trunk/Common/source/pictverbs.c
===================================================================
--- Frontier/trunk/Common/source/pictverbs.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/pictverbs.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -107,7 +107,7 @@
 	
 
 boolean pictverbgettypestring (hdlexternalvariable hvariable, bigstring bs) {
-	
+#pragma unused (hvariable)
 	getstringlist (pictstringlist, picttypestring, bs);
 	
 	return (true);
@@ -115,7 +115,8 @@
 
 
 static boolean pictdisposevariable (hdlexternalvariable hvariable, boolean fldisk) {
-	
+#pragma unused (fldisk)
+
 	return (pictdisposerecord ((hdlpictrecord) (**hvariable).variabledata));
 	} /*pictdisposevariable*/
 
@@ -434,7 +435,8 @@
 
 
 boolean pictverbpacktotext (hdlexternalvariable h, Handle htext) {
-	
+#pragma unused(h)
+
 	bigstring bs;
 	
 	getstringlist (pictstringlist, picttextstring, bs);
@@ -464,7 +466,8 @@
 
 
 boolean pictverbgetdisplaystring (hdlexternalvariable h, bigstring bs) {
-	
+#pragma unused(h)
+
 	/*
 	get string for table display.  variable is in memory
 	*/
@@ -1021,7 +1024,8 @@
 
 
 boolean pictverbfind (hdlexternalvariable hvariable, boolean *flzoom) {
-	
+#pragma unused(flzoom, hvariable)
+
 	return (false);
 	} /*pictverbfind*/
 
@@ -1067,7 +1071,8 @@
 
 
 static boolean pictprint (short pagenumber) {
-	
+#pragma unused (pagenumber)
+
 	register hdlpictrecord hp = pictdata;
 	register PicHandle macpicture = (**hp).macpicture;
 	register boolean fleval;

Modified: Frontier/trunk/Common/source/popup.c
===================================================================
--- Frontier/trunk/Common/source/popup.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/popup.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -296,109 +296,118 @@
 
 #if TARGET_API_MAC_CARBON == 1
 
-	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
-		UInt32 userData, SInt16 depth, Boolean isColorDev) {
-		
-		/*
-		7.0b48 PBS: draw the label for a popup menu.
-		*/
-		
-		bigstring bs;
-		
-		pushstyle (popupfont, popupfontsize, 0);
+static void
+MyThemeButtonDrawCallback (
+		const Rect					*bounds,
+		ThemeButtonKind				 kind,
+		const ThemeButtonDrawInfo	*info,
+		UInt32						 userData,
+		SInt16						 depth,
+		Boolean						 isColorDev)
+{
+#pragma unused (kind, info, depth, isColorDev)
 
-		texthandletostring ((Handle) userData, bs);
-		
-		movepento ((*bounds).left, (*bounds).top + 10);
-		
-		pendrawstring (bs);
-		
-		popstyle ();
-		} /*MyThemeButtonDrawCallback*/
+	/*
+	 7.0b48 PBS: draw the label for a popup menu.
+	 */
 
+	bigstring bs;
+
+	pushstyle (popupfont, popupfontsize, 0);
+
+	texthandletostring ((Handle) userData, bs);
+
+	movepento ((*bounds).left, (*bounds).top + 10);
+
+	pendrawstring (bs);
+
+	popstyle ();
+	} /*MyThemeButtonDrawCallback*/
+
 #endif
 
 
 boolean drawpopup (Rect rpopup, bigstring bs, boolean flbitmap) {
-	
-	#if TARGET_API_MAC_CARBON == 1
-	
-		Rect r;
-		Handle h;
-		ThemeButtonDrawUPP drawupp;
-		ThemeButtonDrawInfo drawinfo;
-		
-		drawupp = NewThemeButtonDrawUPP (MyThemeButtonDrawCallback);
-				
-		drawinfo.state = kThemeButtonOn;
-		
-		drawinfo.value = kThemeStateActive;
-		
-		drawinfo.adornment = 0;
-		
-		setrect (&r, rpopup.top, rpopup.left, rpopup.bottom + 1, rpopup.right + 1);
-		
-		eraserect (r);
-		
-		newtexthandle (bs, &h); 
-		
-		DrawThemeButton (&r, kThemePopupButton, &drawinfo, nil, nil, drawupp, (unsigned long) h);
-		
-		//DisposeThemeButtonDrawUPP (MyThemeButtonDrawCallback);
-		DisposeThemeButtonDrawUPP (drawupp);
-		
-		return (true);
+#if TARGET_API_MAC_CARBON == 1
+#	pragma unused (flbitmap)
 
-	#else
+	Rect r;
+	Handle h;
+	ThemeButtonDrawUPP drawupp;
+	ThemeButtonDrawInfo drawinfo;
+
 	
-		Rect r;
-		
-		initpopupfont ();
+	drawupp = NewThemeButtonDrawUPP (MyThemeButtonDrawCallback);
 
-		setrect (&r, rpopup.top, rpopup.left, rpopup.bottom + 1, rpopup.right + 1);
-		
-		if (flbitmap)
-			flbitmap = openbitmap (r, getport ());
-		
-		eraserect (r);
-		
-		r = rpopup;
-		
-		framerect (r);
-		
-		movepento (r.left + 1, r.bottom);
-		
-		pendrawline (r.right, r.bottom);
-		
-		pendrawline (r.right, r.top + 1);
-		
-		r.right -= popuparrowwidth;
-		
-		insetrect (&r, 4, 2);
-		
-		pushstyle (popupfont, popupfontsize, 0);
-		
-		movepento (r.left, r.bottom - globalfontinfo.descent - 1);
-		
-		ellipsize (bs, r.right - r.left);
-		
-		pendrawstring (bs);
-		
-		popstyle ();
-		
-		r = rpopup;
-		
-		insetrect (&r, 1, 1);
-		
-		r.left = r.right - popuparrowwidth;
-		
-		displaypopupicon (r, true);
-		
-		if (flbitmap)
-			closebitmap (getport ());
-		
-		return (true);
-	#endif
+	drawinfo.state = kThemeButtonOn;
+
+	drawinfo.value = kThemeStateActive;
+
+	drawinfo.adornment = 0;
+
+	setrect (&r, rpopup.top, rpopup.left, rpopup.bottom + 1, rpopup.right + 1);
+
+	eraserect (r);
+
+	newtexthandle (bs, &h); 
+
+	DrawThemeButton (&r, kThemePopupButton, &drawinfo, nil, nil, drawupp, (unsigned long) h);
+
+	//DisposeThemeButtonDrawUPP (MyThemeButtonDrawCallback);
+	DisposeThemeButtonDrawUPP (drawupp);
+
+	return (true);
+
+#else
+
+	Rect r;
+
+	initpopupfont ();
+
+	setrect (&r, rpopup.top, rpopup.left, rpopup.bottom + 1, rpopup.right + 1);
+
+	if (flbitmap)
+		flbitmap = openbitmap (r, getport ());
+
+	eraserect (r);
+
+	r = rpopup;
+
+	framerect (r);
+
+	movepento (r.left + 1, r.bottom);
+
+	pendrawline (r.right, r.bottom);
+
+	pendrawline (r.right, r.top + 1);
+
+	r.right -= popuparrowwidth;
+
+	insetrect (&r, 4, 2);
+
+	pushstyle (popupfont, popupfontsize, 0);
+
+	movepento (r.left, r.bottom - globalfontinfo.descent - 1);
+
+	ellipsize (bs, r.right - r.left);
+
+	pendrawstring (bs);
+
+	popstyle ();
+
+	r = rpopup;
+
+	insetrect (&r, 1, 1);
+
+	r.left = r.right - popuparrowwidth;
+
+	displaypopupicon (r, true);
+
+	if (flbitmap)
+		closebitmap (getport ());
+
+	return (true);
+#endif
 	} /*drawpopup*/
 
 

Modified: Frontier/trunk/Common/source/shellmouse.c
===================================================================
--- Frontier/trunk/Common/source/shellmouse.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/shellmouse.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -433,11 +433,14 @@
 				break;
 			*/
 			
-			if (TrackGoAway (w, mousept)) 
+			if (TrackGoAway (w, mousept))
+			{
+				// 2006-04-03 - kw --- brace for ambiguity warning
 				if (keyboardstatus.floptionkey)
 					shellcloseall (w, true);
 				else
 					shellclose (w, true);
+			}
 					
 			break;
 		

Modified: Frontier/trunk/Common/source/shellprint.c
===================================================================
--- Frontier/trunk/Common/source/shellprint.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/shellprint.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -305,8 +305,8 @@
 	 */
 	
 	Rect
-	rpage,
-	rpaper;
+		rpage,
+		rpaper;
 	
 	//typrintinfo *dbgprintinfo = &shellprintinfo;
 	
@@ -773,12 +773,10 @@
 	shellpopglobals ();
 	
 exit:
-		
-		
-		currentprintport = NULL;
-	
+	currentprintport = NULL;
+
 	return (fl);
-	
+
 } /*shellprint*/
 
 		

Modified: Frontier/trunk/Common/source/shellverbs.c
===================================================================
--- Frontier/trunk/Common/source/shellverbs.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/shellverbs.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -1370,7 +1370,8 @@
 
 
 static boolean editmenufunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
-	
+#pragma unused (bserror)
+
 	/*
 	10/3/91 dmb: split off editMenu verbs from shell verbs
 	

Modified: Frontier/trunk/Common/source/stringverbs.c
===================================================================
--- Frontier/trunk/Common/source/stringverbs.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/stringverbs.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -2127,19 +2127,19 @@
 			unlockhandle (x);
 
 			if (vtranslate.data.flvalue) { /*return a hex string*/
-				bigstring bs;
+				bigstring lbs;
 				unsigned char enc[] = "0123456789abcdef";
 				long ix;
 				Handle h;
 
 				for(ix = 0; ix < 16; ix++) {
-					setstringcharacter (bs, 2*ix, enc[(int)((checksum[ix])/16)]);
-					setstringcharacter (bs, 2*ix+1, enc[(int)((checksum[ix])%16)]);
+					setstringcharacter (lbs, 2*ix, enc[(int)((checksum[ix])/16)]);
+					setstringcharacter (lbs, 2*ix+1, enc[(int)((checksum[ix])%16)]);
 					}/*for*/
 
-				setstringlength (bs, 32);
+				setstringlength (lbs, 32);
 
-				if (!newtexthandle (bs, &h))
+				if (!newtexthandle (lbs, &h))
 					return (false);
 
 				return (setheapvalue (h, stringvaluetype, v));

Modified: Frontier/trunk/Common/source/tablefind.c
===================================================================
--- Frontier/trunk/Common/source/tablefind.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/tablefind.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -212,7 +212,8 @@
 
 
 static boolean tablefindvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	7/4/91 dmb: langexternalzoom now takes table/name pair instead 
 	of full path.

Modified: Frontier/trunk/Common/source/wpengine.c
===================================================================
--- Frontier/trunk/Common/source/wpengine.c	2006-04-05 23:51:45 UTC (rev 1208)
+++ Frontier/trunk/Common/source/wpengine.c	2006-04-05 23:59:59 UTC (rev 1209)
@@ -282,6 +282,9 @@
 
 
 static void setdefaultstyles (boolean flprinting) {
+#ifdef MACVERSION
+#	pragma unused (flprinting)
+#endif
 
 	short font, size, style;
 	bigstring bsfont;
@@ -1992,7 +1995,8 @@
 
 static 
 pascal void wptrackclick (hdlwprecord wp, Point pt) {
-	
+#pragma unused(wp)
+
 	/*
 	12/16/91 dmb: update scrollbars every time.  (don't need to check dirtyness, 
 	because no drawing occurs if unchanged.)
@@ -2980,25 +2984,26 @@
 
 
 boolean wpnewrecord (Rect r, hdlwprecord *hwprecord) {
-	
+#pragma unused (r)
+
 	/*
 		3.0.4b8 dmb: set the scratchport
 	*/
 	
 	bigstring bs;
-	tyconfigrecord config;
+	tyconfigrecord lconfig;
 	register hdlwprecord hwp;
 	Rect rclip;
 	
 	setemptystring (bs);
 	
-	shellgetconfig (idwpconfig, &config);
+	shellgetconfig (idwpconfig, &lconfig);
 	
 	pushscratchport ();
 	
-	pushstyle (config.defaultfont, config.defaultsize, config.defaultstyle);
+	pushstyle (lconfig.defaultfont, lconfig.defaultsize, lconfig.defaultstyle);
 	
-	rclip = config.defaultwindowrect;
+	rclip = lconfig.defaultwindowrect;
 
 	offsetrect (&rclip, -rclip.left, -rclip.top);
 
@@ -3011,7 +3016,7 @@
 	if (hwp == nil)
 		return (false);
 	
-	(**hwp).windowrect = config.defaultwindowrect;
+	(**hwp).windowrect = lconfig.defaultwindowrect;
 	
 	(**hwp).fldirty = true;
 	
@@ -3261,11 +3266,13 @@
 	long newstartsel, newendsel;
 
 	if (flextend)
+	{
 		if (flwordwise)
 			caretverb |= EXTEND_CARET_FLAG;
 		else
 			pgGetSelection (wpbuffer, &oldstartsel, &oldendsel);
-	
+	}
+
 	pgSetCaretPosition (wpbuffer, caretverb, true);
 	
 	if (flextend && !flwordwise) {
@@ -3545,11 +3552,11 @@
 		
 		case chbackspace: {
 
-			long newstartsel;
+			long lnewstartsel;
 
 			undocode = undo_backspace;
 
-			wptraversehiddentext (left, &newstartsel);
+			wptraversehiddentext (left, &lnewstartsel);
 
 			break;
 			}
@@ -3739,10 +3746,11 @@
 
 
 static boolean wprulerclick (Point pt) {
-	
+#pragma unused (pt)
+
 	boolean flrecalc = false;
 	
-	#if flrulers
+#if flrulers
 	
 	#endif
 	
@@ -3925,7 +3933,8 @@
 
 
 boolean wpdelete (boolean flinserting) {
-	
+#pragma unused (flinserting)
+
 	/*
 	12/31/91 dmb: added flinserting parameter -- needed to deterinate whether 
 	the undo of the deletion needs to redisplay or not
@@ -4387,7 +4396,8 @@
 
 
 boolean wpsearch (boolean flfromtop, boolean flcase, boolean flwords, boolean flwrap) {
-	
+#pragma unused (flcase, flwords)
+
 	/*
 	9/12/91 dmb: supported flwrap parameter
 	


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

SF.net SVN: frontierkernel: [1208] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1208
Author:   karstenw
Date:     2006-04-05 16:51:45 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1208&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/OpenTransportNetEvents.c
    Frontier/trunk/Common/source/claybrowservalidate.c
    Frontier/trunk/Common/source/claylinelayout.c
    Frontier/trunk/Common/source/filepath.c
    Frontier/trunk/Common/source/kb.c
    Frontier/trunk/Common/source/langcard.c
    Frontier/trunk/Common/source/langipcmenus.c
    Frontier/trunk/Common/source/langvalue.c
    Frontier/trunk/Common/source/memory.c
    Frontier/trunk/Common/source/menueditor.c
    Frontier/trunk/Common/source/menupack.c
    Frontier/trunk/Common/source/opdisplay.c
    Frontier/trunk/Common/source/opexpand.c
    Frontier/trunk/Common/source/opxml.c
    Frontier/trunk/Common/source/process.c
    Frontier/trunk/Common/source/tableexternal.c
    Frontier/trunk/Common/source/tablepack.c
    Frontier/trunk/Common/source/threads.c
    Frontier/trunk/Common/source/zoom.c
Modified: Frontier/trunk/Common/source/OpenTransportNetEvents.c
===================================================================
--- Frontier/trunk/Common/source/OpenTransportNetEvents.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/OpenTransportNetEvents.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -2458,13 +2458,14 @@
 	return (fl);
 	}/*fwsbackgroundtask*/
 
-static boolean fwsNetEventLaunch (int * dummy) {
 
+static boolean fwsNetEventLaunch (struct hostData *data) {
+#pragma unused (data)
+
 	/*
 	Initialize the NetEvents system	
 	*/
-	
-	
+
 	if (!frontierWinSockLoaded) {
 		
 		//Code change by Timothy Paustian Monday, June 26, 2000 3:55:47 PM
@@ -3231,7 +3232,7 @@
 	}/*fwslaunchacceptingthread*/
 
 
-boolean fwsNetEventListenStream (unsigned long port, long depth, bigstring callback, unsigned long refcon, unsigned long * stream, unsigned long ipaddr, long hdatabase) {
+boolean fwsNetEventListenStream (unsigned long port, long depth, bigstring pCallback, unsigned long refcon, unsigned long * stream, unsigned long ipaddr, long hdatabase) {
 
 	/* Set up a listner on a port */
 
@@ -3245,8 +3246,8 @@
 	TOption opt;
 	long i;
 	
-	nullterminate (callback);
-	TCPprintf(wsprintf(TCPmsg, "Entering fwsNetEventListenStream at line %d. Port = %ld, Depth = %ld, Refcon = %ld, Callback = %s.", __LINE__, port, depth, refcon, stringbaseaddress(callback)));
+	nullterminate (pCallback);
+	TCPprintf(wsprintf(TCPmsg, "Entering fwsNetEventListenStream at line %d. Port = %ld, Depth = %ld, Refcon = %ld, Callback = %s.", __LINE__, port, depth, refcon, stringbaseaddress(pCallback)));
 	TCPWRITEMSG ();
 
 	/* Initialize Open Transport and static data structures */
@@ -3256,7 +3257,7 @@
 	
 	/* Compile and pack a code tree for the address of the daemon script */
 
-	if (!fwsgetcallbackcodetree (callback, &hcallbacktree))
+	if (!fwsgetcallbackcodetree (pCallback, &hcallbacktree))
 		return (false);
 	
 	/* Allocate and clear memory for the listener */
@@ -3271,7 +3272,7 @@
 	OTMemzero (listenref, sizeof (tylistenrecord));
 	
 	/* Initialize further status fields */
-	copystring (callback, listenref->callback);
+	copystring (pCallback, listenref->callback);
 
 	listenref->maxdepth = depth;
 

Modified: Frontier/trunk/Common/source/claybrowservalidate.c
===================================================================
--- Frontier/trunk/Common/source/claybrowservalidate.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/claybrowservalidate.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -109,7 +109,8 @@
 
 
 boolean browservalidatedrag (hdlheadrecord hsource, hdlheadrecord hdest, tydirection dir) {
-	
+#pragma unused (hsource)
+
 	/*
 	5.0a5 dmb: same level, resort check is bogus; headlink lefts can be the same for a 
 	summit and its child, and two summits have different headlinklefts. but we don't 
@@ -150,8 +151,8 @@
 	} /*browservalidatedrag*/
 
 
-static boolean browsercompareforcollision (hdlheadrecord hnode, long dragmodified, bigstring bs1, bigstring bs2, ptrdraginfo draginfo) {
-
+static boolean browsercompareforcollision (hdlheadrecord hnode, long pdragmodified, bigstring bs1, bigstring bs2, ptrdraginfo draginfo) {
+// 2006-04-03 - kw --- renamed dragmodified
 	/*
 	5.0.2b18 dmb: set tmpbit of subs too, so we can detect illegal moves
 	*/
@@ -172,7 +173,7 @@
 			
 			browsergetrefcon (hnode, &info);
 			
-			switch (sgn (dragmodified - info.timemodified)) {
+			switch (sgn (pdragmodified - info.timemodified)) {
 				
 				case +1:
 					(*draginfo).collisiontype |= collidewitholder; break;
@@ -211,6 +212,7 @@
 		
 
 static boolean browsercollisiondialog (hdlheadrecord hdest, ptrdraginfo draginfo) {
+#pragma unused (hdest)
 
 	/*
 	2005-09-26 creedon: changed default order of buttons, default is Duplicate which is the safe option, checks user.prefs.flReplaceDialogExpertMode and if true Replace is the default option
@@ -492,7 +494,8 @@
 	
 	
 static boolean validatecopyvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	tydraginfo draginfo;
 	
 	draginfo.hcompare = hnode;

Modified: Frontier/trunk/Common/source/claylinelayout.c
===================================================================
--- Frontier/trunk/Common/source/claylinelayout.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/claylinelayout.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -160,6 +160,7 @@
 
 
 void claysmashoutlinefields (hdlwindowinfo appwindow, hdltableformats hf) {
+#pragma unused (appwindow)
 
 	/*
 	bind the outline's font and size to the font/size from the
@@ -489,7 +490,8 @@
 
 
 boolean claygetlineheight (hdlheadrecord hnode, short *lh) {
-	
+#pragma unused (hnode)
+
 	*lh = getframeheight ();
 	
 	if (hasframe ())
@@ -582,7 +584,8 @@
 
 
 boolean claypredrawline (hdlheadrecord hnode, const Rect *linerect, boolean flselected, boolean flinverted) {
-	
+#pragma unused(flinverted)
+
 	hdltableformats hf = tableformatsdata;
 	Rect r;
 	
@@ -750,18 +753,18 @@
 	
 	/*special tweaked-up code for drawing the selected line*/ {
 	
-		Rect rframe = *rtext;
+		Rect lrframe = *rtext;	// 2006-04-03 - kw --- renamed rframe
 		
-		rframe.right = rframe.left + stringpixels (bshead);
+		lrframe.right = lrframe.left + stringpixels (bshead);
 		
-		if (rframe.right > (*rtext).right) 
-			rframe.right = (*rtext).right;
+		if (lrframe.right > (*rtext).right) 
+			lrframe.right = (*rtext).right;
 		
-		rframe.bottom = rframe.top + globalfontinfo.ascent + globalfontinfo.descent;
+		lrframe.bottom = lrframe.top + globalfontinfo.ascent + globalfontinfo.descent;
 			
 		if (flinverted) {
 			
-			Rect r = rframe;
+			Rect r = lrframe;
 			
 			insetrect (&r, -1, -1);
 			
@@ -782,9 +785,9 @@
 			
 		/*frame the cursor*/ {
 		
-			insetrect (&rframe, -texthorizinset, -textvertinset);
+			insetrect (&lrframe, -texthorizinset, -textvertinset);
 	
-			grayframerect (rframe);
+			grayframerect (lrframe);
 			}
 		}
 
@@ -812,7 +815,8 @@
 	
 	
 boolean claypostdrawline (hdlheadrecord hnode, const Rect *linerect, boolean flselected, boolean flinverted) {
-	
+#pragma unused(flselected, flinverted)
+
 	/*
 	we draw everything but the icon and the filename, if we're in fatview mode.
 	
@@ -915,7 +919,8 @@
 	
 
 boolean claydrawnodeicon (hdlheadrecord hnode, const Rect *iconrect, boolean flselected, boolean flinverted) {
-	
+#pragma unused(flinverted)
+
 	short iconnum;
 	short transform = 0;
 	

Modified: Frontier/trunk/Common/source/filepath.c
===================================================================
--- Frontier/trunk/Common/source/filepath.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/filepath.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -407,12 +407,13 @@
 		
 		return (PBHGetVInfoSync ((HParmBlkPtr) &pb) == noErr);
 	#endif
-	} /*getfsfile*/
+	} /*getfsvolume*/
 
+
 void initfsdefault (void) {
 	#ifdef MACVERSION
 	/* 2005-07-18 creedon, karstenw */
 	getapplicationfilespec (nil, &fsdefault);
 	#endif
 	} /* initfsdefault */
-	
\ No newline at end of file
+

Modified: Frontier/trunk/Common/source/kb.c
===================================================================
--- Frontier/trunk/Common/source/kb.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/kb.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -99,6 +99,7 @@
 	*/
 
 	#ifdef MACVERSION
+#		pragma unused (flasync)
 		KeyMap keys;
 		
 		GetKeys (keys);

Modified: Frontier/trunk/Common/source/langcard.c
===================================================================
--- Frontier/trunk/Common/source/langcard.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/langcard.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -72,7 +72,7 @@
 typedef void (*tycardeventcallback)(EventRecord *);
 typedef long hdlcard;
 
-extern boolean runCard (Handle hpackedcard, boolean flscriptedcard, short top, short left, void * callback);
+extern boolean runCard (Handle hpackedcard, boolean flscriptedcard, short top, short pleft, void * pcallback);
 extern boolean runModalCard (Handle, boolean, short, short, tycardeventcallback);
 extern boolean runModelessCard (Handle, boolean, short, short, tycardeventcallback);
 extern boolean cardIsModal (Handle hpackedcard);
@@ -356,7 +356,8 @@
 
 
 boolean langruncard (hdltreenode hparam1, boolean flmodal, tyvaluerecord *vreturned) {
-	
+#pragma unused(flmodal)
+
 	/*
 	4.0b7 dmb: use new embedded birdruncard
 	*/

Modified: Frontier/trunk/Common/source/langipcmenus.c
===================================================================
--- Frontier/trunk/Common/source/langipcmenus.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/langipcmenus.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -212,15 +212,15 @@
 	get the menurecord for the application with the indicated id.
 	*/
 	
-	hdlhashtable menubartable;
+	hdlhashtable lmenubartable;
 	bigstring bs;
 	
-	if (!getmenubartable (&menubartable))
+	if (!getmenubartable (&lmenubartable))
 		return (false);
 	
 	ostypetostring (id, bs);
 	
-	return (menugetmenubar (menubartable, bs, false, hrecord));
+	return (menugetmenubar (lmenubartable, bs, false, hrecord));
 	} /*getappmenurecord*/
 
 
@@ -692,7 +692,8 @@
 
 
 static boolean notifyappvisit (hdlhashnode hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	if hnode is a menubar that may belong to an application, send the 
 	updatemenustoken message to that application.
@@ -731,12 +732,12 @@
 	to let them know their menus are available
 	*/
 	
-	hdlhashtable menubartable;
+	hdlhashtable lmenubartable;
 	
-	if (!getmenubartable (&menubartable))
+	if (!getmenubartable (&lmenubartable))
 		return (false);
 	
-	hashtablevisit (menubartable, &notifyappvisit, nil);
+	hashtablevisit (lmenubartable, &notifyappvisit, nil);
 	
 	return (true);
 	} /*langipcmenustartup*/
@@ -754,16 +755,16 @@
 	new set of menus from being built
 	*/
 	
-	hdlhashtable menubartable;
+	hdlhashtable lmenubartable;
 	
 	disposeallmenulists ();
 	
-	if (!getmenubartable (&menubartable))
+	if (!getmenubartable (&lmenubartable))
 		return (false);
 	
 	flshuttingmenusdown = true;
 	
-	hashtablevisit (menubartable, &notifyappvisit, nil);
+	hashtablevisit (lmenubartable, &notifyappvisit, nil);
 	
 	flshuttingmenusdown = false;
 	
@@ -773,12 +774,12 @@
 
 static boolean getmenubarid (hdlhashtable htable, const bigstring bs, tyapplicationid *id) {
 	
-	hdlhashtable menubartable;
+	hdlhashtable lmenubartable;
 	
-	if (!getmenubartable (&menubartable))
+	if (!getmenubartable (&lmenubartable))
 		return (false);
 	
-	if (htable != menubartable)
+	if (htable != lmenubartable)
 		return (false);
 	
 	return (stringtoostype ((ptrstring) bs, id)); /*false if name is longer than 4 characters*/
@@ -786,7 +787,8 @@
 
 
 boolean langipcsymbolchanged (hdlhashtable htable, const bigstring bs, boolean flvalue) {
-	
+#pragma unused(flvalue)
+
 	tyapplicationid id;
 	
 	if (getmenubarid (htable, bs, &id)) {

Modified: Frontier/trunk/Common/source/langvalue.c
===================================================================
--- Frontier/trunk/Common/source/langvalue.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/langvalue.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -2430,18 +2430,18 @@
 		
 		case stringvaluetype: {
 			bigstring bs;
-			unsigned long time;
+			unsigned long ltime;
 			
 			pullstringvalue (v, bs);
 			
-			if (!stringtotime (bs, &time)) {
+			if (!stringtotime (bs, &ltime)) {
 				
 				langerror (datecoerceerror);
 				
 				return (false);
 				}
 			
-			x = time;
+			x = ltime;
 			
 			break;
 			}
@@ -2893,37 +2893,33 @@
 			break;
 		
 		case binaryvaluetype:
-		
-			#if noextended
-				{
-				long double x;
-				extended80 x80;
-				
-				/*first do type & length checking, resulting in x80 value in v*/
-				
+#if noextended
+		{
+			long double lx;
+			extended80 x80;
+
+			/*first do type & length checking, resulting in x80 value in v*/
+
 				if (!coercebinaryval (v, doublevaluetype, sizeof (extended80), novaluetype))
-					return (false);
-				
-				/*now convert to actual double value*/
-				
-	
-				#ifdef WIN95VERSION
-					memmove (&x80, *((*v).data.doublevalue), sizeof (x80));
+				return (false);
 
-					convertFromMacExtended (&x, &x80);
-				#else
-					x80 = (**(extended80 **) (*v).data.doublevalue);
+			/*now convert to actual double value*/
 
-					safex80told (&x80, &x);
-				#endif
-				
-				return (setdoublevalue (x, v));
-				}
-			
-			#else
-			
-				return (coercebinaryval (v, doublevaluetype, sizeof (double), novaluetype));
-			
+#ifdef WIN95VERSION
+			memmove (&x80, *((*v).data.doublevalue), sizeof (x80));
+
+			convertFromMacExtended (&lx, &x80);
+#else
+			x80 = (**(extended80 **) (*v).data.doublevalue);
+
+			safex80told (&x80, &lx);
+#endif
+			return (setdoublevalue (lx, v));
+		}
+#else
+
+			return (coercebinaryval (v, doublevaluetype, sizeof (double), novaluetype));
+
 			#endif
 		
 		case listvaluetype:
@@ -5503,7 +5499,7 @@
 	} /*dereferencevalue*/
 
 
-static boolean getvalidstringindex (tyvaluerecord *vstring, bigstring bsname, tyvaluerecord *vindex, long *index) {
+static boolean getvalidstringindex (tyvaluerecord *vstring, bigstring bsname, tyvaluerecord *vindex, long *idx) {
 	
 	/*
 	2.1b3 dmb: if string is a binary, account for binary subtype
@@ -5532,7 +5528,7 @@
 	if ((*vstring).valuetype == binaryvaluetype) /*skip binary subtype*/
 		ix += sizeof (OSType);
 	
-	*index = ix;
+	*idx = ix;
 	
 	return (true);
 	} /*getvalidstringindex*/

Modified: Frontier/trunk/Common/source/memory.c
===================================================================
--- Frontier/trunk/Common/source/memory.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/memory.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -849,6 +849,7 @@
 
 
 boolean prepareforgrowing (Handle h) {
+#pragma unused (h)
 	
 	/*
 	like newgrowinghandle, but for an already-existing handle. the 

Modified: Frontier/trunk/Common/source/menueditor.c
===================================================================
--- Frontier/trunk/Common/source/menueditor.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/menueditor.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -126,7 +126,8 @@
 
 	
 static void megetcursornode (hdlmenurecord hm, hdlheadrecord *hcursor) {
-	
+#pragma unused (hm)
+
 	assert (menudata != nil);
 	
 	*hcursor = (**(**menudata).menuoutline).hbarcursor;
@@ -315,7 +316,8 @@
 	
 	
 static boolean meclearhandlevisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	tymenuiteminfo item;
 	
 	if (megetmenuiteminfo (hnode, &item)) {
@@ -342,6 +344,7 @@
 
 
 static boolean mesomethingdirtyvisit (hdlheadrecord hnode, ptrvoid refcon) {
+#pragma unused (refcon)
 
 	register hdlheadrecord h = hnode;
 	register hdloutlinerecord ho;
@@ -1153,7 +1156,8 @@
 
 
 static boolean mebuildcmdkeypopupvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	register hdlheadrecord h = hnode;
 	register unsigned char ch;
 	
@@ -1560,7 +1564,8 @@
 
 
 static boolean metextchangedroutine (hdlheadrecord hnode, bigstring bsorig) {
-	
+#pragma unused (bsorig)
+
 	/*
 	a callback routine, linked into the outlinerecord -- it gets called when
 	the user has changed the text of one of the headlines.
@@ -1742,7 +1747,7 @@
 	register hdlmenurecord hm;
 	hdloutlinerecord houtline = nil;
 	register hdloutlinerecord ho = nil;
-	tyconfigrecord config;
+	tyconfigrecord lconfig;
 	
 	if (!newclearhandle (longsizeof (tymenurecord), (Handle *) hmenurecord))
 		return (false);
@@ -1768,20 +1773,20 @@
 	
 	bundle { /*set the default font for the menubar outline*/
 		
-		shellgetconfig (idmenueditorconfig, &config);
+		shellgetconfig (idmenueditorconfig, &lconfig);
 		
-		(**ho).fontnum = config.defaultfont;
+		(**ho).fontnum = lconfig.defaultfont;
 		
-		(**ho).fontsize = config.defaultsize;
+		(**ho).fontsize = lconfig.defaultsize;
 		}
 	
 	bundle { /*set the default font for menubar scripts*/
 		
-		langexternalgetconfig (scriptvaluetype, idscriptconfig, &config);
+		langexternalgetconfig (scriptvaluetype, idscriptconfig, &lconfig);
 		
-		(**hm).defaultscriptfontnum = config.defaultfont;
+		(**hm).defaultscriptfontnum = lconfig.defaultfont;
 		
-		(**hm).defaultscriptfontsize = config.defaultsize;
+		(**hm).defaultscriptfontsize = lconfig.defaultsize;
 		}
 	
 	return (true);

Modified: Frontier/trunk/Common/source/menupack.c
===================================================================
--- Frontier/trunk/Common/source/menupack.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/menupack.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -208,7 +208,8 @@
 
 
 static boolean mesavescriptvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	register hdlheadrecord h = hnode;
 	//ptrpackinfo packinfo = (ptrpackinfo) refcon;
 	register hdloutlinerecord ho;
@@ -251,7 +252,8 @@
 	
 
 static boolean mesaveasscriptvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	for save as, we need to write a packed version of every script to 
 	the new file.  db.c takes care of redirecting reads & writes as 
@@ -569,7 +571,7 @@
 	4/22/91 dmb: menu outline now points to menu variable
 	*/
 	
-	register tysavedmenuinfo *pi = info;
+	register tysavedmenuinfo *lpi = info;
 	register hdlmenurecord hm;
 	register hdloutlinerecord ho;
 	short fontnum;
@@ -587,19 +589,19 @@
 	
 	(**ho).outlinerefcon = (long) hm; /*pointing is mutual*/
 	
-	(**hm).adroutline = conditionallongswap((*pi).adroutline); /*keep address around for save*/
+	(**hm).adroutline = conditionallongswap((*lpi).adroutline); /*keep address around for save*/
 	
-	diskrecttorect (&(*pi).scriptwindowrect, &(**hm).scriptwindowrect);
+	diskrecttorect (&(*lpi).scriptwindowrect, &(**hm).scriptwindowrect);
 	
-	(**hm).flautosmash = ((*pi).flags & flautosmash_mask) != 0;
+	(**hm).flautosmash = ((*lpi).flags & flautosmash_mask) != 0;
 	
-	diskrecttorect (&(*pi).menuwindowrect, &(**hm).menuwindowrect);
+	diskrecttorect (&(*lpi).menuwindowrect, &(**hm).menuwindowrect);
 	
-	diskgetfontnum ((*pi).defaultscriptfontname, &fontnum);
+	diskgetfontnum ((*lpi).defaultscriptfontname, &fontnum);
 	
 	(**hm).defaultscriptfontnum = fontnum;
 	
-	(**hm).defaultscriptfontsize = conditionalshortswap((*pi).defaultscriptfontsize);
+	(**hm).defaultscriptfontsize = conditionalshortswap((*lpi).defaultscriptfontsize);
 	
 	(**hm).menuactiveitem = menuoutlineitem;
 	

Modified: Frontier/trunk/Common/source/opdisplay.c
===================================================================
--- Frontier/trunk/Common/source/opdisplay.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/opdisplay.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -596,7 +596,8 @@
 	
 
 static boolean opinvalnodevisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	1/6/97 dmb: don't inval if getting line returns false
 	*/
@@ -673,7 +674,8 @@
 
 
 static boolean opdirtymeasurementsvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	(**hnode).hpixels = (**hnode).vpixels = opdirtymeasurevalue;
 	
 	return (true);
@@ -775,7 +777,8 @@
 
 
 boolean opdefaultpredrawline (hdlheadrecord hnode, const Rect *rline, boolean flselected, boolean flinverted) {
-	
+#pragma unused(hnode, flselected, flinverted)
+
 	pushbackcolor (&(**outlinedata).backcolor);
 	
 	eraserect (*rline); 
@@ -855,14 +858,21 @@
 
 	return (true);
 	} /*opdefaultdrawtext*/
-	
 
-boolean opdefaultpostdrawline (hdlheadrecord hnode, const Rect * linerect, boolean flselected, boolean flinverted) {
 
+boolean
+opdefaultpostdrawline (
+		hdlheadrecord	 hnode,
+		const Rect		*linerect,
+		boolean			 flselected,
+		boolean			 flinverted)
+{
+#pragma unused(hnode, linerect, flselected, flinverted)
+
 	return (true);
 	} /*opdefaultpostdrawline*/
-	
 
+
 void opgetlineselected (hdlheadrecord hnode, boolean *flinverted, boolean *flselected) {
 
 	/*

Modified: Frontier/trunk/Common/source/opexpand.c
===================================================================
--- Frontier/trunk/Common/source/opexpand.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/opexpand.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -52,7 +52,8 @@
 
 
 static boolean opcollapsevisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	register hdlheadrecord h = hnode;
 	
 	if ((**h).flexpanded) {
@@ -156,7 +157,8 @@
 
 
 static boolean opexpandvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	short lh = opgetlineheight (hnode);
 	
 	if ((**hnode).flexpanded) {

Modified: Frontier/trunk/Common/source/opxml.c
===================================================================
--- Frontier/trunk/Common/source/opxml.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/opxml.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -739,7 +739,8 @@
 
 
 static boolean opxmlpushattributes (hdlheadrecord hnode, Handle htext, short indentlevel) {
-	
+#pragma unused(indentlevel)
+
 	/*
 	7.0b21 PBS: push the attributes onto the current <outline> item.
 	*/
@@ -1369,8 +1370,6 @@
 	} /*opxmlgetoneshortvalue*/
 
 
-
-
 static boolean opxmlsetwindowpositionandsize (hdlhashtable ht, hdlwindowinfo hinfo) {
 	
 	/*
@@ -1898,7 +1897,8 @@
 extern boolean opsetheadtext (hdlheadrecord hnode, Handle hstring);
 
 static boolean opxmltooutlinevisit (hdlhashtable ht, short ixlevel, bigstring bsname, boolean flfirstline) {
-	
+#pragma unused (bsname)
+
 	/*
 	7.0b21 PBS -- recursive routine for converting an XML outlineDocument structure to an outline structure.
 	*/

Modified: Frontier/trunk/Common/source/process.c
===================================================================
--- Frontier/trunk/Common/source/process.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/process.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -2037,7 +2037,8 @@
 static hdlthreadglobals hlatest1shot;
 
 static pascal boolean findlatest1shotvisit (hdlthreadglobals hthread, long refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	if this thread contains a 1-shot process, kill it and stop the visit
 	*/
@@ -2129,7 +2130,8 @@
 */
 
 static boolean findthreadvisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
-	
+#pragma unused (bs, hnode, refcon)
+
 	return (val.data.longvalue == (long) (**hthreadglobals).idthread);
 	} /*findvaluevisit*/
 
@@ -3150,7 +3152,8 @@
 
 
 static pascal void *agentthreadmain (void *ignore) {
-	
+#pragma unused (ignore)
+
 	/*
 	4.0.1b1 dmb: pass name of thread to initprocessthread; call exitprocessthread
 	

Modified: Frontier/trunk/Common/source/tableexternal.c
===================================================================
--- Frontier/trunk/Common/source/tableexternal.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/tableexternal.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -401,15 +401,15 @@
 		
 		if ((**ht).fllocaltable || ht == runtimestacktable) { /*use default script font/size for locals tables*/
 			
-			tyconfigrecord config;
+			tyconfigrecord lconfig;
 			
-			shellgetconfig (idscriptconfig, &config);
+			shellgetconfig (idscriptconfig, &lconfig);
 			
-			(**hf).fontnum = config.defaultfont;
+			(**hf).fontnum = lconfig.defaultfont;
 			
-			(**hf).fontsize = config.defaultsize;
+			(**hf).fontsize = lconfig.defaultsize;
 			
-			(**hf).fontstyle = config.defaultstyle;
+			(**hf).fontstyle = lconfig.defaultstyle;
 			}
 		}
 	
@@ -1297,7 +1297,8 @@
 
 
 boolean tablesymbolchanged (hdlhashtable htable, const bigstring bsname, hdlhashnode hn, boolean flvalue) {
-	
+#pragma unused (hn)
+
 	/*
 	used as a callback routine.  the value of the indicated variable has changed.
 	if the cell is being displayed, update the display of it.  if the name changed,

Modified: Frontier/trunk/Common/source/tablepack.c
===================================================================
--- Frontier/trunk/Common/source/tablepack.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/tablepack.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -377,7 +377,8 @@
 
 
 static boolean tablepacktotextvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
-	
+#pragma unused (hnode)
+
 	/*
 	4.0.2b1 dmb: handle fldiskvals. see comment in hashsortedinversesearch
 	*/

Modified: Frontier/trunk/Common/source/threads.c
===================================================================
--- Frontier/trunk/Common/source/threads.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/threads.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -88,7 +88,8 @@
 #ifdef MACVERSION
 
 static pascal void copythreadcontext (ThreadID hthread, void * hglobals) {
-	
+#pragma unused (hthread)
+
 #if TARGET_API_MAC_OS8
 	long curA5 = SetUpAppA5 ();
 #endif
@@ -102,7 +103,8 @@
 
 
 static pascal void swapinthreadcontext (ThreadID hthread, void * hglobals) {
-	
+#pragma unused (hthread)
+
 #if TARGET_API_MAC_OS8
 	long curA5 = SetUpAppA5 ();
 #endif
@@ -116,7 +118,8 @@
 
 
 static pascal void disposethreadcontext (ThreadID hthread, void * hglobals) {
-	
+#pragma unused (hthread)
+
 #if TARGET_API_MAC_OS8
 	long curA5 = SetUpAppA5 ();
 #endif
@@ -255,12 +258,15 @@
 
 
 boolean attachtomainthread (long idthread) {
+#ifdef MACVERSION
+#	pragma unused (idthread)
+#endif
 
-	#ifdef WIN95VERSION
-		return (AttachThreadInput (idthread, idmainthread, true));
-	#else
-		return (true); /*it's a no-op*/
-	#endif
+#ifdef WIN95VERSION
+	return (AttachThreadInput (idthread, idmainthread, true));
+#else
+	return (true); /*it's a no-op*/
+#endif
 	}/*attachtomainthread*/
 
 
@@ -431,7 +437,8 @@
 
 
 boolean threadyield (boolean flresting) {
-	
+#pragma unused(flresting)
+
 	/*
 	5.0a19 dmb: added flresting parameter
 	*/

Modified: Frontier/trunk/Common/source/zoom.c
===================================================================
--- Frontier/trunk/Common/source/zoom.c	2006-04-05 23:27:47 UTC (rev 1207)
+++ Frontier/trunk/Common/source/zoom.c	2006-04-05 23:51:45 UTC (rev 1208)
@@ -224,6 +224,11 @@
 */	
 
 void zoomport (Rect rsource, WindowPtr w, boolean flzoomup) {
+#if TARGET_API_MAC_CARBON == 1
+#	pragma unused(rsource)
+#	pragma unused(w)
+#	pragma unused(flzoomup)
+#endif
 
 	/*
 	zooms the window from an invisible state to a visible 
@@ -532,7 +537,3 @@
 		zoomratio.v = 21;
 		}
 	} /*zoominit*/
-	
-	
-	
-	


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

SF.net SVN: frontierkernel: [1207] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1207
Author:   karstenw
Date:     2006-04-05 16:27:47 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1207&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/dbstats.c
    Frontier/trunk/Common/source/langhtml.c
    Frontier/trunk/Common/source/menuverbs.c
Modified: Frontier/trunk/Common/source/dbstats.c
===================================================================
--- Frontier/trunk/Common/source/dbstats.c	2006-04-05 23:21:19 UTC (rev 1206)
+++ Frontier/trunk/Common/source/dbstats.c	2006-04-05 23:27:47 UTC (rev 1207)
@@ -294,7 +294,8 @@
 
 
 boolean statsblockinuse (dbaddress adr, bigstring bsitem) {
-	
+#pragma unused (bsitem)
+
 	/*
 	called from the EFPs directly as we're doing our content-based 
 	database scan.
@@ -559,7 +560,8 @@
 
 
 static boolean statsmousedown (Point pt, tyclickflags flags) {
-	
+#pragma unused (pt, flags)
+
 	/*
 	smashrect ((**statswindowinfo).contentrect);
 	

Modified: Frontier/trunk/Common/source/langhtml.c
===================================================================
--- Frontier/trunk/Common/source/langhtml.c	2006-04-05 23:21:19 UTC (rev 1206)
+++ Frontier/trunk/Common/source/langhtml.c	2006-04-05 23:27:47 UTC (rev 1207)
@@ -821,11 +821,12 @@
 	} /*htmlgetstringpref*/
 
 
-static boolean htmlrefglossary (typrocessmacrosinfo *pmi, Handle hreference, bigstring errorstring, Handle *hresult) {
+static boolean htmlrefglossary (typrocessmacrosinfo *pmi, Handle hreference, bigstring perrorstring, Handle *hresult) {
+#pragma unused (pmi)
 
 	/*
 	expand the glossary item, consuming it. return the result in hresult, which 
-	our caller must dispose. on error, return the error text in errorstring.
+	our caller must dispose. on error, return the error text in perrorstring.
 	
 	5.0.2b14 dmb: we used to frontTextScriptCall to call html.data.processmacroscallback, 
 	which called html.refGlossary. now we call html.refGlossary directly. I looked at 
@@ -845,7 +846,7 @@
 	
 	langcallbacks.errormessagecallback = &htmlcallbackerror;
 	
-	langcallbacks.errormessagerefcon = errorstring;
+	langcallbacks.errormessagerefcon = perrorstring;
 	
 	fl = langrunscript ("\x10" "html.refglossary", &vparams, nil, &vresult) && strongcoercetostring (&vresult);
 	
@@ -1134,11 +1135,11 @@
 	} /*htmlbuildmacrocontext*/
 
 
-static boolean htmlrunmacro (typrocessmacrosinfo *pmi, Handle macro, bigstring errorstring, Handle *hresult) {
+static boolean htmlrunmacro (typrocessmacrosinfo *pmi, Handle macro, bigstring perrorstring, Handle *hresult) {
 	
 	/*
 	run the macro, consuming it. return the result in hresult, which our caller 
-	must dispose. on error, return the error text in errorstring.
+	must dispose. on error, return the error text in perrorstring.
 	
 		local (toolTableAdr, nilTable);
 		if defined (adrpagetable^.tools) {
@@ -1159,7 +1160,7 @@
 
 	5.1b21 dmb: plugged leak on error
 	
-	6.2b6 AR: If langruntraperror returns false but didn't set errorstring, our thread has probably been killed.
+	6.2b6 AR: If langruntraperror returns false but didn't set perrorstring, our thread has probably been killed.
 	*/
 	
 	tyvaluerecord val;
@@ -1168,11 +1169,11 @@
 	if (!htmlbuildmacrocontext (pmi))
 		return (false);
 		
-	setemptystring (errorstring); //6.2b6 AR
+	setemptystring (perrorstring); //6.2b6 AR
 	
 	chainhashtable ((*pmi).hmacrocontext);
 	
-	fl = langruntraperror (macro, &val, errorstring) && strongcoercetostring (&val) && exemptfromtmpstack (&val);
+	fl = langruntraperror (macro, &val, perrorstring) && strongcoercetostring (&val) && exemptfromtmpstack (&val);
 	
 	unchainhashtable ();
 	
@@ -1193,22 +1194,22 @@
 				
 				popfromhandle (h, 1, nil);
 				
-				return (htmlrefglossary (pmi, h, errorstring, hresult));
+				return (htmlrefglossary (pmi, h, perrorstring, hresult));
 				}
 			}
 		
 		*hresult = h;
 		}
 	else
-		if (stringlength (errorstring) > 0 && ingoodthread ()) { //6.2b6 AR
+		if (stringlength (perrorstring) > 0 && ingoodthread ()) { //6.2b6 AR
 			
 			Handle herror;
 
-			if (newtexthandle (errorstring, &herror)) {
+			if (newtexthandle (perrorstring, &herror)) {
 				
 				htmlcleanforexport (herror);
 				
-				texthandletostring (herror, errorstring);
+				texthandletostring (herror, perrorstring);
 
 				disposehandle (herror);
 				}
@@ -1244,8 +1245,9 @@
 	} /*htmlrunmacro*/
 
 
-static boolean htmlreportmacroerror (typrocessmacrosinfo *pmi, Handle macro, bigstring errorstring) {
-	
+static boolean htmlreportmacroerror (typrocessmacrosinfo *pmi, Handle macro, bigstring perrorstring) {
+#pragma unused (pmi)
+
 	/*
 	call back to the odb to report the error. consume the macro handle
 	*/
@@ -1257,7 +1259,7 @@
 	if (!coercetolist (&vparams, listvaluetype))
 		return (false);
 	
-	if (!setstringvalue (errorstring, &val))
+	if (!setstringvalue (perrorstring, &val))
 		return (false);
 		
 	if (!langpushlistval (vparams.data.listvalue, nil, &val))
@@ -1703,9 +1705,9 @@
 						
 						for (j = i + 1; j < ct; j++) {
 							
-							char ch = (*h) [j];
+							char lch = (*h) [j];
 							
-							if (ch == endmacrochar) {
+							if (lch == endmacrochar) {
 							
 								if (--ctendsneeded == 0) {
 							
@@ -1722,7 +1724,7 @@
 								}
 							else {
 							
-								if (ch == startmacrochar)
+								if (lch == startmacrochar)
 									++ctendsneeded;
 								}
 							}
@@ -1742,7 +1744,7 @@
 						}
 					else {
 								
-						bigstring errorstring;
+						bigstring lerrorstring;
 						Handle macro;
 						Handle hmacroresult;
 
@@ -1762,7 +1764,7 @@
 								} /*for*/
 							}
 
-						if (!htmlrunmacro (pmi, macro, errorstring, &hmacroresult)) {
+						if (!htmlrunmacro (pmi, macro, lerrorstring, &hmacroresult)) {
 							
 							bigstring bs;
 							boolean fllogerrors;
@@ -1777,10 +1779,10 @@
 								
 								moveleft (&(*h) [startmacro], *macro, lenmacro);
 								
-								htmlreportmacroerror (pmi, macro, errorstring);
+								htmlreportmacroerror (pmi, macro, lerrorstring);
 								}
 							
-							parsedialogstring (str_macroerror, errorstring, nil, nil, nil, bs);
+							parsedialogstring (str_macroerror, lerrorstring, nil, nil, nil, bs);
 							
 							if (!newtexthandle (bs, &hmacroresult))
 								return (false);
@@ -1832,9 +1834,9 @@
 				
 				for (j = i - 1; j >= 0; j--) { /*scan to the left, looking for the start of the mail address*/
 					
-					char ch = (*h) [j];
+					char lch = (*h) [j];
 					
-					if (!isAlphaChar (ch) && !isLegalURLPunctuationChar (ch)) {
+					if (!isAlphaChar (lch) && !isLegalURLPunctuationChar (lch)) {
 
 						startaddress = j + 1;
 						
@@ -1849,9 +1851,9 @@
 				
 				for (j = i + 1; j < ct; j++) { /*scan to the right, looking for the end of the mail address*/
 				
-					char ch = (*h) [j];
+					char lch = (*h) [j];
 					
-					if (!isAlphaChar (ch) && !isLegalURLPunctuationChar (ch)) {
+					if (!isAlphaChar (lch) && !isLegalURLPunctuationChar (lch)) {
 
 						endaddress = j;
 						
@@ -1927,12 +1929,12 @@
 				
 				for (j = i - 1; j >= 0; j--) { /*scan to the left, looking for the start of the URL*/
 					
-					char ch = (*h) [j];
+					char lch = (*h) [j];
 					
-					if (isLegalURLPunctuationChar (ch))
+					if (isLegalURLPunctuationChar (lch))
 						continue;
 				
-					if (!isAlphaChar (ch)) {
+					if (!isAlphaChar (lch)) {
 						
 						startaddress = j + 1;
 						
@@ -1944,12 +1946,12 @@
 				
 				for (j = i + 1; j < ct; j++) { /*scan to the right, looking for the end of the URL*/
 				
-					char ch = (*h) [j];
+					char lch = (*h) [j];
 					
-					if (isLegalURLPunctuationChar (ch))
+					if (isLegalURLPunctuationChar (lch))
 						continue;
 					
-					if (!isAlphaChar (ch)) {
+					if (!isAlphaChar (lch)) {
 						
 						endaddress = j;
 						
@@ -1959,9 +1961,9 @@
 					
 				for (j = endaddress - 1; j > i; j--) { /*move endaddress to the left, past any non-alpha chars, like a comma after the mail address -- common!*/
 					
-					char ch = (*h) [j];
+					char lch = (*h) [j];
 					
-					if (isAlphaChar (ch) || (ch == '/')) {
+					if (isAlphaChar (lch) || (lch == '/')) {
 						
 						endaddress = j;
 						
@@ -2013,21 +2015,21 @@
 
 				for (j = i + 1; j < ct; j++) {
 					
-					char ch = (*h) [j];
+					char lch = (*h) [j];
 					
 					if (flpagemillfile) {
 					
-						if (ch == '\r') { /*special hack for PageMill files*/
+						if (lch == '\r') { /*special hack for PageMill files*/
 							
-							(*h) [j] = ch = ' ';
+							(*h) [j] = lch = ' ';
 							}
 						}
 					else {
-						if (ch == '\r') /*unterminated quote*/
+						if (lch == '\r') /*unterminated quote*/
 							break;
 						}
 					
-					if (ch == '<') { /*7.0b39 PBS: rewind to this character if gloss lookup fails.*/
+					if (lch == '<') { /*7.0b39 PBS: rewind to this character if gloss lookup fails.*/
 
 						if (!flrewind) {
 
@@ -2038,11 +2040,11 @@
 						} /*if*/
 
 
-					if (ch == '"') {
+					if (lch == '"') {
 						
 						unsigned long startterm, endterm, lenterm;
 						Handle hterm;
-						bigstring errorstring;
+						bigstring lerrorstring;
 						Handle hresult;
 						long ixload;
 						
@@ -2068,7 +2070,7 @@
 						if (!loadfromhandletohandle (h, &ixload, lenterm, true, &hterm))
 							return (false);
 
-						if (!htmlrefglossary (pmi, hterm, errorstring, &hresult)) { /*error -- we don't substitute*/ 
+						if (!htmlrefglossary (pmi, hterm, lerrorstring, &hresult)) { /*error -- we don't substitute*/ 
 							
 							i += lenterm + 2 - 1; /**4.1b5: skip over the quoted string, less the last char*/
 
@@ -3488,7 +3490,7 @@
 	
 	typrocessmacrosinfo pageinfo;
 	Handle href, hresult;
-	bigstring errorstring;
+	bigstring lerrorstring;
 	handlestream s;
 	
 	// get all of the prefs and tables that we need
@@ -3496,7 +3498,7 @@
 	if (!htmlgetpagetable (&pageinfo.hpagetable) || !htmlgetprefstable (&pageinfo.huserprefs))
 		return (false);
 	
-	return (htmlrefglossary (&pageinfo, href, errorstring, &hresult));
+	return (htmlrefglossary (&pageinfo, href, lerrorstring, &hresult));
 	} /*refglossaryverb*/
 
 #endif
@@ -3588,14 +3590,14 @@
 	the only field we look at in pmi is the pagetable
 	*/
 	
-	bigstring errorstring;
+	bigstring lerrorstring;
 	tyvaluerecord val;
 	
 	textfirstword (*s, gethandlesize (s), chspace, fieldname);
 	
 	pullfromhandle (s, 0, stringlength (fieldname) + 1, nil);
 	
-	if (langruntraperror (s, &val, errorstring)) {
+	if (langruntraperror (s, &val, lerrorstring)) {
 		
 		if (!hashtableassign ((*pmi).hpagetable, fieldname, val))
 			return (false);
@@ -3603,7 +3605,7 @@
 		exemptfromtmpstack (&val);
 		}
 	else {
-		lang2paramerror (evaldirectiveerror, fieldname, errorstring);
+		lang2paramerror (evaldirectiveerror, fieldname, lerrorstring);
 		
 		return (false);
 		}
@@ -3769,7 +3771,8 @@
 
 
 static boolean runoutlinedirectivesverb (hdltreenode hp1, tyvaluerecord *v) {
-	
+#pragma unused(v)
+
 	/*
 	on runOutlineDirectives (adroutline, adrpagetable=@websites.["#data"]) { \xC74.2
 		\xC7the outline can contain #directives
@@ -4648,7 +4651,8 @@
 
 static boolean indexpage (bigstring bsaddress, bigstring bsurl, bigstring bstitle, handlestream *pagetext, 
 		hdlhashtable hindex, hdlhashtable hstopwords, bigstring bsparent, bigstring bspage) {
-	
+#pragma unused (bsurl)
+
 	/*
 	Prepare text to be indexed.
 		Replace whitespace characters and punctuation with spaces.
@@ -7719,6 +7723,7 @@
 
 
 static boolean findfirstnumericnodevisit (bigstring bsname, hdlhashnode nomad, tyvaluerecord val, ptrvoid refcon) {
+#pragma unused(val)
 
 	if (isallnumeric (bsname)) {
 
@@ -7858,7 +7863,8 @@
 */
 
 static boolean findlastnumericnodevisit (bigstring bsname, hdlhashnode nomad, tyvaluerecord val, ptrvoid refcon) {
-	
+#pragma unused(val)
+
 	if (isallnumeric (bsname)) {
 	
 		hdlhashnode *hnode = (hdlhashnode *) refcon;
@@ -8541,9 +8547,20 @@
 	add ("<td " + bgcolorstring + " height=\"" + rowheight + "\">" + string.replaceAll (string (dayTemplate), "***", link) + "</td>")};
 */
 
-static boolean addday (handlestream *s, long daynum, boolean fltoday,
-				hdlhashtable hmonthtable, Handle hurlprefix, Handle hbgcolorattrib,
-				Handle hcolwidth, Handle hrowheight, Handle hday, Handle hcssprefix, boolean flfirstcolumn) {
+static boolean
+addday (
+		handlestream *s,
+		long daynum,
+		boolean fltoday,
+		hdlhashtable hmonthtable,
+		Handle hurlprefix,
+		Handle hbgcolorattrib,
+		Handle hcolwidth,
+		Handle hrowheight,
+		Handle hday,
+		Handle hcssprefix,
+		boolean flfirstcolumn) {
+#pragma unused (hcolwidth)
 
 	Handle hlink= nil;
 	bigstring daystring;

Modified: Frontier/trunk/Common/source/menuverbs.c
===================================================================
--- Frontier/trunk/Common/source/menuverbs.c	2006-04-05 23:21:19 UTC (rev 1206)
+++ Frontier/trunk/Common/source/menuverbs.c	2006-04-05 23:27:47 UTC (rev 1207)
@@ -126,7 +126,8 @@
 
 
 boolean menuverbgettypestring (hdlexternalvariable hvariable, bigstring bs) {
-	
+#pragma unused (hvariable)
+
 	getstringlist (menustringlist, menutypestring, bs);
 	
 	return (true);


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

SF.net SVN: frontierkernel: [1206] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1206
Author:   karstenw
Date:     2006-04-05 16:21:19 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1206&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/bitmaps.c
    Frontier/trunk/Common/source/fileops.c
    Frontier/trunk/Common/source/langpython.c
    Frontier/trunk/Common/source/langverbs.c
    Frontier/trunk/Common/source/miniwindow.c
    Frontier/trunk/Common/source/mouse.c
    Frontier/trunk/Common/source/odbengine.c
    Frontier/trunk/Common/source/opedit.c
    Frontier/trunk/Common/source/opstructure.c
    Frontier/trunk/Common/source/opverbs.c
    Frontier/trunk/Common/source/tabledisplay.c
    Frontier/trunk/Common/source/wpverbs.c
Modified: Frontier/trunk/Common/source/bitmaps.c
===================================================================
--- Frontier/trunk/Common/source/bitmaps.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/bitmaps.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -163,7 +163,8 @@
 
 
 static void closeworld (WindowPtr w) {
-	
+#pragma unused(w)
+
 	/*
 	2/8/91 dmb: experiments show that we get better performance tossing 
 	the gworld every time that we do using updategworld on the same one.
@@ -200,7 +201,8 @@
 
 
 static boolean openmono (Rect r, WindowPtr w) {
-	
+#pragma unused(w)
+
 	register short nrowbytes;
 	register long nboxbytes;
 	register long sizehandle;
@@ -362,6 +364,7 @@
 	//Code change by Timothy Paustian Sunday, May 7, 2000 10:56:54 PM
 	//Changed to Opaque call for Carbon
 	#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
+	#pragma unused(trapnum)
 	//always return false for traps since this not allowed in carbon
 	//This really is not needed but what the heck
 	return false;

Modified: Frontier/trunk/Common/source/fileops.c
===================================================================
--- Frontier/trunk/Common/source/fileops.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/fileops.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -2242,13 +2242,13 @@
 
 
 boolean lockvolume (const tyfilespec *fs, boolean fllock) {
-#if TARGET_API_MAC_CARBON
+#ifdef MACVERSION
+#if TARGET_API_MAC_CARBON == 1
 #pragma unused (fs, fllock)
 	//Code change by Timothy Paustian Sunday, June 25, 2000 9:19:49 PM
 	//can't lock volumes in carbon.
 	return false;
-#endif
-#if (defined(MACVERSION) && TARGET_API_MAC_CARBON != 1)
+#else
 	short vnum;
 	QHdrPtr vqtop;
 	QElemPtr vqelem;
@@ -2282,6 +2282,7 @@
 		
 		}
 #endif
+#endif
 #ifdef WIN95VERSION
 	return (false);
 #endif

Modified: Frontier/trunk/Common/source/langpython.c
===================================================================
--- Frontier/trunk/Common/source/langpython.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/langpython.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -125,6 +125,7 @@
 #else
 
 boolean langrunpythonscript (hdltreenode hp1, tyvaluerecord *v) {
+#pragma unused(hp1, v)
 
 	langerror (unimplementedverberror);
 

Modified: Frontier/trunk/Common/source/langverbs.c
===================================================================
--- Frontier/trunk/Common/source/langverbs.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/langverbs.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -1855,13 +1855,16 @@
 		}
 	
 	return (true); // continue traversal
-	} /*releasesemaphorevisit*/
+} /*releasesemaphorevisit*/
 
 
-boolean langreleasesemaphores (hdlprocessrecord xxxhp) {
-	
+boolean
+langreleasesemaphores (hdlprocessrecord xxxhp)
+{
+#pragma unused(xxxhp)
+
 	pushhashtable (semaphoretable); // for visit's hashdelete
-	
+
 	hashtablevisit (semaphoretable, &releasesemaphorevisit, (ptrvoid) (**getcurrentthreadglobals()).idthread);
 	
 	pophashtable ();
@@ -1932,49 +1935,50 @@
 			default:
 				return (false);
 			}
-		}
-	
+	}
+
 	setbooleanvalue (false, v); /*by default, lang functions return false*/
-	
-	switch (token) {
-		
-		case killscriptfunc: {
+
+	switch (token)
+	{
+		case killscriptfunc:
+		{
 			tyvaluerecord val;
-			boolean fl;
-			
+			boolean lfl;
+
 			flnextparamislast = true;
-			
+
 			if (!getparamvalue (hparam1, 1, &val))
 				return (false);
-			
-			if (val.valuetype == longvaluetype) {
-				
+
+			if (val.valuetype == longvaluetype)
+			{
 				langgetmiscstring (unknownstring, bs);
-				
+
 				setoserrorparam (bs);
-				
-				fl = oserror (val.data.longvalue);
-				}
-			else {
-				
+
+				lfl = oserror (val.data.longvalue);
+			}
+			else
+			{
 				if (!coercetostring (&val))
 					return (false);
-				
+
 				pullstringvalue (&val, bs);
-				
-				fl = langerrormessage (bs);
-				}
-			
+
+				lfl = langerrormessage (bs);
+			}
+
 			/*
 			if (!getstringvalue (hparam1, 1, bs))
 				return (false);
 			*/
-			
-			(*v).data.flvalue = fl;
-			
+
+			(*v).data.flvalue = lfl;
+
 			return (false);
-			}
-		
+		}
+
 		case newfunc:
 			return (newvaluefunc (hparam1, v));
 		
@@ -3745,7 +3749,7 @@
 		
 			#if defined(MACVERSION) && __POWERPC__
 				long stream = nil;
-				bigstring bs;
+				bigstring lbs;
 				
 				if (langgetparamcount (hparam1) > 0) {
 				
@@ -3755,10 +3759,10 @@
 						return (false);
 					}
 				
-				if (!fwsNetEventGetStats (stream, bs))
+				if (!fwsNetEventGetStats (stream, lbs))
 					return (false);
 					
-				return (setstringvalue (bs, v));
+				return (setstringvalue (lbs, v));
 			#else
 				langerror (unimplementedverberror);
 

Modified: Frontier/trunk/Common/source/miniwindow.c
===================================================================
--- Frontier/trunk/Common/source/miniwindow.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/miniwindow.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -421,7 +421,8 @@
 
 
 static boolean minimessage (bigstring bs, boolean flbackgroundmsg) {
-	
+#pragma unused (flbackgroundmsg)
+
 	copystring (bs, (**minidata).bsmsg);
 	
 	return (minidrawmsg ());

Modified: Frontier/trunk/Common/source/mouse.c
===================================================================
--- Frontier/trunk/Common/source/mouse.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/mouse.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -369,6 +369,9 @@
 
 
 static short translatemouseeventtype (long eventwhat) {
+#ifdef MACVERSION
+#	pragma unused (eventwhat)
+#endif
 
 #ifdef WIN95VERSION
 	switch (eventwhat) {

Modified: Frontier/trunk/Common/source/odbengine.c
===================================================================
--- Frontier/trunk/Common/source/odbengine.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/odbengine.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -231,7 +231,8 @@
 
 
 static boolean odberrorroutine (bigstring bs, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	copystring (bs, bserror);
 	
 	return (false); /*consume the error*/

Modified: Frontier/trunk/Common/source/opedit.c
===================================================================
--- Frontier/trunk/Common/source/opedit.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/opedit.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -119,7 +119,8 @@
 
 
 boolean opdefaultgetwpedittext (hdlheadrecord hnode, boolean flunload) {
-	
+#pragma unused (flunload)
+
 	/*
 	2/7/97 dmb: we are called with the wp globals set up. 
 	our job it to extract the current text from the wp.
@@ -305,7 +306,8 @@
 
 
 static pascal void opedittrackclick (hdlwprecord wp, Point pt) {
-	
+#pragma unused(wp)
+
 	/*
 	5.0a3 dmb: check outlinerect, now windowinfo's contentrect (via shellcheckautoscroll)
 	*/

Modified: Frontier/trunk/Common/source/opstructure.c
===================================================================
--- Frontier/trunk/Common/source/opstructure.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/opstructure.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -1972,7 +1972,8 @@
 
 
 static boolean opclearmarkvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	register hdlheadrecord h = hnode;
 	
 	if ((**h).flmarked) {
@@ -2068,7 +2069,8 @@
 
 
 static boolean opsetbarcursorvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	(**outlinedata).hbarcursor = hnode; /*move barcursor here*/
 	
 	return (false); /*this is the only marked node*/
@@ -2116,7 +2118,8 @@
 	
 
 static boolean opcopymarkedvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	10/3/92 dmb: set levels so that all copies are summits
 	*/
@@ -2153,11 +2156,17 @@
 	} /*opcopymarkedvisit*/
 	
 
-static boolean optrytextcommand (boolean (*editroutine) (void), boolean flneedselection, boolean flchanging) {
+static boolean
+optrytextcommand (
+		boolean (*editroutine) (void),
+		boolean flneedselection,
+		boolean flchanging)
+{
+#pragma unused (flchanging)
 
 	register hdloutlinerecord ho = outlinedata;
 	long startsel, endsel;
-	
+
 	if (!(**ho).fltextmode)
 		return (false);
 	
@@ -2383,7 +2392,8 @@
 
 
 static boolean opdeletenodevisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	return (opdeletenode (hnode));
 	} /*opdeletenodevisit*/
 

Modified: Frontier/trunk/Common/source/opverbs.c
===================================================================
--- Frontier/trunk/Common/source/opverbs.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/opverbs.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -2025,7 +2025,8 @@
 
 
 static boolean opgetsourceverb (hdltreenode hparam1, boolean flosacode, tyvaluerecord *v) {
-	
+#pragma unused(flosacode)
+
 	register hdltreenode hp1 = hparam1;
 	hdlhashtable htable;
 	bigstring bsname;
@@ -2109,6 +2110,8 @@
 
 
 static boolean convertprofiletoticksvisit (hdlhashnode hnode, ptrvoid refcon) {
+#pragma unused (refcon)
+
 	tyvaluerecord * val = &(**hnode).val;
 	
 	(*val).data.longvalue = ( ( (*val).data.longvalue * 3 ) / 50 );
@@ -2483,6 +2486,7 @@
 
 
 boolean opsetexpansionstateverb (tyvaluerecord *vlist, tyvaluerecord *v) {
+#pragma unused(v)
 
 	/*
 	6.2a6 AR: Takes the output of op.getExpansionState and sets the outline state accordingly.
@@ -2862,7 +2866,8 @@
 
 
 static boolean opvisitallverb (hdltreenode hparam1, tyvaluerecord *v, bigstring bserror) {
-	
+#pragma unused (bserror)
+
 	/*
 	7.0b17 PBS: visit every headline, running the specified callback script.
 	*/
@@ -3858,11 +3863,11 @@
 			//if (!langexternalgetexternalparam (hparam1, 1, &id, (hdlexternalvariable *) &hv) || (id != idoutlineprocessor)) {
 			if (!floutline) {
 					
-				bigstring bserror;
+				bigstring lbserror;
 				
-				getstringlist (operrorlist, namenotoutlineerror, bserror);
+				getstringlist (operrorlist, namenotoutlineerror, lbserror);
 				
-				langerrormessage (bserror);
+				langerrormessage (lbserror);
 				
 				return (false);
 				}
@@ -3906,11 +3911,11 @@
 						
 			else {
 			
-				register hdloutlinerecord ho = outlinedata;
+				register hdloutlinerecord lho = outlinedata;
 					
-				(**ho).fldirty = false; /*the outline structure is not dirty*/
+				(**lho).fldirty = false; /*the outline structure is not dirty*/
 	
-				(**ho).flrecentlychanged = false; /*in case someone is maintaining a parallel structure*/
+				(**lho).flrecentlychanged = false; /*in case someone is maintaining a parallel structure*/
 				} /*else*/
 						
 			fl = true;
@@ -3939,15 +3944,15 @@
 		
 		case getselectedsuboutlinesfunc: { /*7.0b18 PBS: get selected headlines as an outline*/
 			
-			hdloutlinerecord ho;
+			hdloutlinerecord lho;
 			
 			flnextparamislast = true;
 			
 			/*Get outline parameter.*/
 	
-			if (getoutlinevalue (hparam1, 1, &ho)) /*First param is an outline to add to*/
+			if (getoutlinevalue (hparam1, 1, &lho)) /*First param is an outline to add to*/
 				
-				fl = opgetselectedsuboutlinesverb (ho);
+				fl = opgetselectedsuboutlinesverb (lho);
 			
 			setbooleanvalue (fl, vreturned);
 
@@ -3956,17 +3961,17 @@
 		
 		case sethtmlformattingfunc: { /*7.0b28: turn on and off HTML formatting.*/
 
-			boolean fl = false;
+			boolean lfl = false;
 			boolean flchanged = false;
 
 			flnextparamislast = true;
 
-			if (!getbooleanvalue (hparam1, 1, &fl))
+			if (!getbooleanvalue (hparam1, 1, &lfl))
 				break;
 			
 			if ((**outlinedata).outlinetype == outlineisoutline) { /*outlines only*/
 				
-				if ((**outlinedata).flhtml != fl) { /*Don't bother if it's already set as requested.*/
+				if ((**outlinedata).flhtml != lfl) { /*Don't bother if it's already set as requested.*/
 					
 					long startsel, endsel;
 
@@ -3979,7 +3984,7 @@
 						opunloadeditbuffer ();
 						}
 
-					(**outlinedata).flhtml = fl;
+					(**outlinedata).flhtml = lfl;
 
 					opdirtyview ();
 
@@ -3998,7 +4003,7 @@
 					} /*if*/
 				} /*if*/
 
-			fl = setbooleanvalue (flchanged, vreturned);
+			lfl = setbooleanvalue (flchanged, vreturned);
 
 			break;
 			}
@@ -4197,7 +4202,8 @@
 
 
 boolean opverbfind (hdlexternalvariable hvariable, boolean *flzoom) {
-	
+#pragma unused(flzoom)
+
 	register hdloutlinevariable hv = (hdloutlinevariable) hvariable;
 	register hdloutlinerecord ho;
 	register boolean fl;

Modified: Frontier/trunk/Common/source/tabledisplay.c
===================================================================
--- Frontier/trunk/Common/source/tabledisplay.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/tabledisplay.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -419,7 +419,8 @@
 static Rect titlerect;
 
 static void tableinverttitle (boolean flinrectnow) {
-	
+#pragma unused (flinrectnow)
+
 	invertrect (titlerect);
 	} /*tableinverttitle*/
 
@@ -458,9 +459,9 @@
 		if (trackicon (titlerect, &tableinverttitle)) {
 			
 			hdlhashtable ht;
-			bigstring bs;
+			bigstring lbs;
 			
-			tablegetcursorinfo (&ht, bs, nil, nil);
+			tablegetcursorinfo (&ht, lbs, nil, nil);
 			
 			tablesetsortorder (ht,  col);
 			}
@@ -844,7 +845,8 @@
 	
 
 static boolean tablegetmaxwidthvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	short col;
 	
 	if ((**hnode).flexpanded) {

Modified: Frontier/trunk/Common/source/wpverbs.c
===================================================================
--- Frontier/trunk/Common/source/wpverbs.c	2006-04-05 23:08:41 UTC (rev 1205)
+++ Frontier/trunk/Common/source/wpverbs.c	2006-04-05 23:21:19 UTC (rev 1206)
@@ -222,7 +222,8 @@
 
 
 boolean wpverbgettypestring (hdlexternalvariable hvariable, bigstring bs) {
-	
+#pragma unused (hvariable)
+
 	getstringlist (wpstringlist, wptypestring, bs);
 	
 	return (true);
@@ -243,7 +244,7 @@
 
 
 static boolean wpdisposevariable (hdlexternalvariable hvariable, boolean fldisk) {
-	
+#pragma unused (fldisk)
 	register hdlwpvariable hv = (hdlwpvariable) hvariable;
 	register long vdata = (**hv).variabledata;
 	
@@ -1809,7 +1810,8 @@
 
 
 boolean wpverbfind (hdlexternalvariable hvariable, boolean *flzoom) {
-	
+#pragma unused(flzoom)
+
 	register hdlwpvariable hv = (hdlwpvariable) hvariable;
 	register hdlwprecord hwp;
 	register boolean fl;


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

SF.net SVN: frontierkernel: [1205] Frontier/trunk/Common/source/oprefcon.c

[<kar...@us...>]

Revision: 1205
Author:   karstenw
Date:     2006-04-05 16:08:41 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1205&view=rev

Log Message:
-----------
nil dereference fix

Modified Paths:
--------------
    Frontier/trunk/Common/source/oprefcon.c
Modified: Frontier/trunk/Common/source/oprefcon.c
===================================================================
--- Frontier/trunk/Common/source/oprefcon.c	2006-04-05 23:07:18 UTC (rev 1204)
+++ Frontier/trunk/Common/source/oprefcon.c	2006-04-05 23:08:41 UTC (rev 1205)
@@ -94,9 +94,13 @@
 	with zeros).  many callers expect this.
 	*/
 	
-	Handle hrefcon = (**hnode).hrefcon;
+	Handle hrefcon;
 	long lenrefcon;
-	
+
+	// kw - 2006-01-19 - after crash - was "Handle hrefcon = (**hnode).hrefcon;"
+	if (hnode != nil)
+		hrefcon = (**hnode).hrefcon;
+
 	lenrefcon = gethandlesize (hrefcon); /*handles nil*/
 	
 	if (lenrefcon < lendata) /*not enough data, make sure it's all zero*/


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

SF.net SVN: frontierkernel: [1204] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1204
Author:   karstenw
Date:     2006-04-05 16:07:18 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1204&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/cancoonwindow.c
    Frontier/trunk/Common/source/langdll.c
    Frontier/trunk/Common/source/langregexp.c
    Frontier/trunk/Common/source/langtrace.c
    Frontier/trunk/Common/source/opbuttons.c
    Frontier/trunk/Common/source/opdraggingmove.c
    Frontier/trunk/Common/source/opicons.c
    Frontier/trunk/Common/source/opprint.c
    Frontier/trunk/Common/source/player.c
    Frontier/trunk/Common/source/scripts.c
    Frontier/trunk/Common/source/strings.c
Modified: Frontier/trunk/Common/source/cancoonwindow.c
===================================================================
--- Frontier/trunk/Common/source/cancoonwindow.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/cancoonwindow.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -175,7 +175,8 @@
 
 
 void ccwindowsetup (boolean flbigwindow, boolean floldversion) {
-	
+#pragma unused (flbigwindow)
+
 	/*
 	called when cc is booting, the window hasn't shown up on the screen yet,
 	we get a chance to change the size of the window.  we don't remember whether

Modified: Frontier/trunk/Common/source/langdll.c
===================================================================
--- Frontier/trunk/Common/source/langdll.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/langdll.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -348,6 +348,7 @@
 
 				
 odbBool xCALLBACK extOdbGetListCount (odbRef odb, odbValueRecord *value, long * cnt) {
+#pragma unused (odb)
 	odbBool res;
 
 	res = false;
@@ -366,7 +367,8 @@
 	} /*extOdbGetListCount*/
 
 
-odbBool xCALLBACK extOdbDeleteListValue (odbRef odb, odbValueRecord *value, long index, char * recordname) {
+odbBool xCALLBACK extOdbDeleteListValue (odbRef odb, odbValueRecord *value, long idx, char * recordname) {
+#pragma unused (odb)
 	odbBool res;
 
 	res = false;
@@ -374,7 +376,7 @@
 	grabthreadglobals ();
 
 	if (((value->valuetype == odb_recordvaluetype) || (value->valuetype == odb_listvaluetype)) && (value->data.listvalue != NULL)) {
-		res = opdeletelistitem ((hdllistrecord) value->data.listvalue, (short) index, recordname);
+		res = opdeletelistitem ((hdllistrecord) value->data.listvalue, (short) idx, recordname);
 		}
 
 	releasethreadglobals ();
@@ -383,7 +385,7 @@
 	} /*extOdbDeleteListValue*/
 
 
-odbBool xCALLBACK extOdbSetListValue (odbRef odb, odbValueRecord *value, long index, char * recordname, odbValueRecord *valueData) {
+odbBool xCALLBACK extOdbSetListValue (odbRef odb, odbValueRecord *value, long idx, char * recordname, odbValueRecord *valueData) {
 	odbBool res;
 	tyvaluerecord val;
 
@@ -395,7 +397,7 @@
 
 		convertodbtotyval (valueData, &val);
 
-		res = setnthlistval ((hdllistrecord) value->data.listvalue, index, recordname, &val);
+		res = setnthlistval ((hdllistrecord) value->data.listvalue, idx, recordname, &val);
 		}
 
 	releasethreadglobals ();
@@ -404,7 +406,8 @@
 	} /*extOdbSetListValue*/
 
 
-odbBool xCALLBACK extOdbGetListValue (odbRef odb, odbValueRecord *value, long index, char * recordname, odbValueRecord *valueReturn) {
+odbBool xCALLBACK extOdbGetListValue (odbRef odb, odbValueRecord *value, long idx, char * recordname, odbValueRecord *valueReturn) {
+#pragma unused (odb)
 	odbBool res;
 	tyvaluerecord valret;
 
@@ -413,7 +416,7 @@
 	grabthreadglobals ();
 
 	if (((value->valuetype == odb_recordvaluetype) || (value->valuetype == odb_listvaluetype)) && (value->data.listvalue != NULL)) {
-		res = getnthlistval ((hdllistrecord) value->data.listvalue, index, recordname, &valret);
+		res = getnthlistval ((hdllistrecord) value->data.listvalue, idx, recordname, &valret);
 
 		if (res)
 			res = converttyvaltoodb (&valret, valueReturn);
@@ -426,6 +429,7 @@
 
 
 odbBool xCALLBACK extOdbAddListValue (odbRef odb, odbValueRecord *value, char * recordname, odbValueRecord *valueData) {
+#pragma unused (odb)
 	odbBool res;
 	tyvaluerecord val;
 
@@ -722,6 +726,9 @@
 
 
 odbBool xCALLBACK extInvoke (bigstring bsscriptname, void * pDispParams, odbValueRecord * retval, boolean *flfoundhandler, unsigned int * errarg) {
+#if MACVERSION
+#	pragma unused (bsscriptname, pDispParams, flfoundhandler, errarg)
+#endif
 	boolean res;
 	tyvaluerecord val;
 

Modified: Frontier/trunk/Common/source/langregexp.c
===================================================================
--- Frontier/trunk/Common/source/langregexp.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/langregexp.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -1346,7 +1346,8 @@
 
 	
 static boolean replscanwriteliteral (int ix, int len, bigstring bserror, void *refcon) {
-	
+#pragma unused (bserror)
+
 	tyreplscanexpandinfo *info = (tyreplscanexpandinfo *) refcon;
 	
 	return (writehandlestreamhandlepart (&(info->s), info->hsubject, ix, len));
@@ -1354,7 +1355,8 @@
 
 
 static boolean replscanwritenumbered (int ix, int len, int ref, bigstring bserror, void *refcon) {
-	
+#pragma unused (len)
+
 	tyreplscanexpandinfo *info = (tyreplscanexpandinfo *) refcon;
 	tyvaluerecord val;
 	
@@ -1379,7 +1381,8 @@
 
 
 static boolean replscanwritenamed (int ix, int len, const char *cptr, int clen, bigstring bserror, void *refcon) {
-	
+#pragma unused (ix, len, bserror)
+
 	tyreplscanexpandinfo *info = (tyreplscanexpandinfo *) refcon;
 	hdlhashnode hnode;
 	hdlhashtable ht;
@@ -1414,6 +1417,7 @@
 
 
 static boolean regexpcheckliteral (int ix, int len, bigstring bserror, void *refcon) {
+#pragma unused (ix, len, bserror, refcon)
 
 	/*nothing to check*/
 	
@@ -1422,7 +1426,8 @@
 
 
 static boolean regexpchecknumbered (int ix, int len, int ref, bigstring bserror, void *refcon) {
-	
+#pragma unused (len)
+
 	Handle hcp = (Handle) refcon;
 						
 	if (ref > getcapturecount (hcp)) {
@@ -1435,7 +1440,8 @@
 
 
 static boolean regexpchecknamed (int ix, int len, const char *cptr, int clen, bigstring bserror, void *refcon) {
-	
+#pragma unused (len)
+
 	Handle hcp = (Handle) refcon;
 	int ref;
 	
@@ -1454,7 +1460,8 @@
 	
 
 static boolean regexptextsearchwriteliteral (int ix, int len, bigstring bserror, void *refcon) {
-	
+#pragma unused (bserror)
+
 	tyregexpsearchinfo *info = (tyregexpsearchinfo *) refcon;
 	
 	return (writehandlestream (&(info->s), stringbaseaddress (searchparams.bsreplace) + ix, len));
@@ -1462,7 +1469,8 @@
 
 
 static boolean regexptextsearchwritenumbered (int ix, int len, int ref, bigstring bserror, void *refcon) {
-	
+#pragma unused (len, ix, bserror)
+
 	tyregexpsearchinfo *info = (tyregexpsearchinfo *) refcon;
 
 	return (writehandlestream (&(info->s), info->p + getgroupoffset (info->hovector, ref), getgrouplength (info->hovector, ref)));
@@ -1470,7 +1478,8 @@
 
 
 static boolean regexptextsearchwritenamed (int ix, int len, const char *cptr, int clen, bigstring bserror, void *refcon) {
-	
+#pragma unused (ix, len, bserror)
+
 	tyregexpsearchinfo *info = (tyregexpsearchinfo *) refcon;
 	int ref;
 	
@@ -2953,6 +2962,7 @@
 
 
 static boolean regexpjoinverb (hdltreenode hp1, tyvaluerecord *v, bigstring bserror) {
+#pragma unused (bserror)
 
 	/*
 	join (s, strList)

Modified: Frontier/trunk/Common/source/langtrace.c
===================================================================
--- Frontier/trunk/Common/source/langtrace.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/langtrace.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -111,12 +111,13 @@
 
 
 	void langstarttrace (void) { }
-		
+
 	void langendtrace (void) { }
 
-	void langtrace (bigstring bs) { }
+	void langtrace (bigstring bs) {
+#pragma unused (bs)
+}
 
-
 #endif
 
 /*

Modified: Frontier/trunk/Common/source/opbuttons.c
===================================================================
--- Frontier/trunk/Common/source/opbuttons.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/opbuttons.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -81,6 +81,7 @@
 
 
 boolean opbuttonstatus (short buttonnum, tybuttonstatus *status) {
+#pragma unused (buttonnum)
 
 	/*
 	7.1b18 PBS: buttons are always displayed and enabled.

Modified: Frontier/trunk/Common/source/opdraggingmove.c
===================================================================
--- Frontier/trunk/Common/source/opdraggingmove.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/opdraggingmove.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -158,7 +158,8 @@
 	
 
 static boolean isundermark (hdlheadrecord htarget, tydirection dir) {
-	
+#pragma unused (dir)
+
 	while (true) {
 		
 		if (opgetmark (htarget))

Modified: Frontier/trunk/Common/source/opicons.c
===================================================================
--- Frontier/trunk/Common/source/opicons.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/opicons.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -124,7 +124,8 @@
 
 
 boolean opdefaultdrawicon (hdlheadrecord hnode, const Rect *iconrect, boolean flselected, boolean flinverted) {
-	
+#pragma unused(flselected, flinverted)
+
 	/*
 	the default icon drawing routine, for the script editor and menu
 	editor, not for clay basket.

Modified: Frontier/trunk/Common/source/opprint.c
===================================================================
--- Frontier/trunk/Common/source/opprint.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/opprint.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -67,9 +67,9 @@
 	short ctpages = 1;
 	short sum = 0;
 	short lh; 
-	typrintinfo *pi = &shellprintinfo;
+	typrintinfo *lpi = &shellprintinfo;
 	
-	vertpixels = (pi->paperrect.bottom - pi->paperrect.top); //6.0b4, was: * pi->scaleMult / pi->scaleDiv;
+	vertpixels = (lpi->paperrect.bottom - lpi->paperrect.top); //6.0b4, was: * lpi->scaleMult / lpi->scaleDiv;
 	
 	while (true) {
 		

Modified: Frontier/trunk/Common/source/player.c
===================================================================
--- Frontier/trunk/Common/source/player.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/player.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -242,7 +242,8 @@
 
 
 static boolean playerresetrects (hdlwindowinfo hinfo) {
-	
+#pragma unused (hinfo)
+
 	return (true);
 	} /*playerresetrects*/
 
@@ -481,6 +482,7 @@
 
 
 pascal Boolean playermoviecontrollereventfilter (MovieController mc, short action, void *params, long refcon) {
+#pragma unused (mc, refcon, params)
 
 	/*
 	7.0b4 PBS: Handle movie controller events.

Modified: Frontier/trunk/Common/source/scripts.c
===================================================================
--- Frontier/trunk/Common/source/scripts.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/scripts.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -525,7 +525,8 @@
 
 
 static boolean installscriptvisit (hdlhashnode hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	hdltreenode hcode;
 	
 	scriptcompiler (hnode, &hcode);
@@ -583,7 +584,8 @@
 
 
 static boolean newprocessvisit (hdlhashnode hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	hdltreenode hcode;
 	hdlprocessrecord hprocess;
 	boolean fl;
@@ -702,7 +704,8 @@
 
 
 static boolean runprocessvisit (hdlhashnode hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	hdltreenode hcode;
 	hdlprocessrecord hprocess;
 	tyvaluerecord val;
@@ -771,7 +774,8 @@
 
 
 static boolean scriptinvalbuttonsvisit (WindowPtr w, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	7.0b42 PBS: If Mac OS X, re-draw the script buttons right away, because
 	otherwise the window doesn't get updated until it's activated.
@@ -1446,7 +1450,8 @@
 #ifdef flcomponent
 
 static pascal OSErr handlerecordedtext (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) {
-	
+#pragma unused (reply, refcon)
+
 	/*
 	2.1b3 dmb: ignore extra syntax/lines needed for text-based recording
 	
@@ -1686,7 +1691,8 @@
 
 
 static pascal OSErr handlestoprecording (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) {
-	
+#pragma unused (event, reply, refcon)
+
 	/*
 	2.1b5 dmb: special event handler for QuicKeys recording panel
 	*/
@@ -2081,13 +2087,13 @@
 	
 	register short x = buttonnum;
 	register hdldebuggerrecord hd = debuggerdata;
-	register boolean flscriptrunning = (**hd).flscriptrunning;
+	register boolean lflscriptrunning = (**hd).flscriptrunning;
 	register boolean flscriptsuspended = (**hd).flscriptsuspended;
 	register boolean flrunningthisscript;
 	
-	flrunningthisscript = flscriptrunning && scriptinruntimestack ();
+	flrunningthisscript = lflscriptrunning && scriptinruntimestack ();
 	
-	if (flscriptrunning) {
+	if (lflscriptrunning) {
 		
 		if ((x != installbutton) && (x != killbutton)) /*rule 3*/
 			if (!flrunningthisscript)
@@ -2112,16 +2118,16 @@
 		
 		case recordbutton:
 		#ifdef flcomponent
-			return (!flscriptrunning && scriptrecordable ());
+			return (!lflscriptrunning && scriptrecordable ());
 		#else
 			return (false);
 		#endif
 		
 		case runbutton:
-			return (!flscriptrunning);
+			return (!lflscriptrunning);
 		
 		case debugbutton:
-			return (!flscriptrunning && ((**outlinedata).outlinesignature == typeLAND));
+			return (!lflscriptrunning && ((**outlinedata).outlinesignature == typeLAND));
 		
 		case stopbutton:
 			return (!flscriptsuspended);
@@ -2133,13 +2139,13 @@
 		case stepbutton:
 		case inbutton:
 		case outbutton:
-			return (flscriptrunning && flscriptsuspended && !(**hd).fllangerror);
+			return (lflscriptrunning && flscriptsuspended && !(**hd).fllangerror);
 		
 		case localsbutton:
-			return (flscriptrunning && flscriptsuspended); /*(**hd).flstepping && (!(**hd).flfollowing))*/
+			return (lflscriptrunning && flscriptsuspended); /*(**hd).flstepping && (!(**hd).flfollowing))*/
 		
 		case killbutton:
-			return (flscriptrunning);
+			return (lflscriptrunning);
 		
 		case installbutton:
 			return (!flrunningthisscript && scriptinstallable () && !scripthascleancode ());
@@ -2176,12 +2182,12 @@
 	
 	register hdldebuggerrecord hd = debuggerdata;
 	register hdlprocessrecord hp = (**hd).scriptprocess;
-	register boolean flscriptrunning = (**hd).flscriptrunning;
+	register boolean lflscriptrunning = (**hd).flscriptrunning;
 	register boolean flrunningthisscript;
 	register boolean fldebuggingthisscript;
 	register short x = buttonnum;
 	
-	flrunningthisscript = flscriptrunning && scriptinruntimestack (); /*1/2/91*/
+	flrunningthisscript = lflscriptrunning && scriptinruntimestack (); /*1/2/91*/
 	
 	fldebuggingthisscript = flrunningthisscript && (**hp).fldebugging;
 	
@@ -2205,7 +2211,7 @@
 		
 		case runbutton:
 		case debugbutton:
-			return (!flscriptrunning);
+			return (!lflscriptrunning);
 		
 		case installbutton:
 			return (!fldebuggingthisscript && scriptinstallable ());
@@ -2224,7 +2230,7 @@
 			return (fldebuggingthisscript);
 		
 		case killbutton:
-			return (flscriptrunning);
+			return (lflscriptrunning);
 		} /*switch*/
 	
 	return (true);
@@ -2419,7 +2425,7 @@
 	register hdltreenode hn = hnode;
 	register tytreetype op;
 	register boolean flshowline = false;
-	register boolean flcontinue = true;
+	register boolean lflcontinue = true;
 	short topscriptsource;
 	tysourcerecord source;
 	boolean flbreakpoint = false;
@@ -2456,7 +2462,7 @@
 		
 		flshowline = true;
 		
-		flcontinue = false;
+		lflcontinue = false;
 		}
 	else {
 		
@@ -2501,27 +2507,27 @@
 				break;
 			}
 		
-		flcontinue = !flshowline; /*continue if we aren't going to show this line*/
+		lflcontinue = !flshowline; /*continue if we aren't going to show this line*/
 		
 		if ((**hd).flfollowing)
 			flshowline = true; /*show every line when following*/
 		}
 	
-	if (flcontinue) { /*so far, nothing is suspending the processor*/
+	if (lflcontinue) { /*so far, nothing is suspending the processor*/
 		
-		hdlheadrecord hnode;
+		hdlheadrecord hnoderec;
 		
 		oppushoutline (source.houtline); /*set globals for breakpoint check*/
 		
-		if (opgetnthnode (lnum, &hnode) && (**hnode).flbreakpoint) /*breakpoint*/
+		if (opgetnthnode (lnum, &hnoderec) && (**hnoderec).flbreakpoint) /*breakpoint*/
 			
-			if (!opnestedincomment (hnode)) {
+			if (!opnestedincomment (hnoderec)) {
 				
 				flbreakpoint = true;
 				
 				flshowline = true;
 				
-				flcontinue = false;
+				lflcontinue = false;
 				}
 		
 		oppopoutline ();
@@ -2531,7 +2537,7 @@
 		
 		if (source.pwindow == nil) { /*closed, or never opened*/
 			
-			if (flcontinue || fllangerror) { /*show line if window is open; don't bring to front*/
+			if (lflcontinue || fllangerror) { /*show line if window is open; don't bring to front*/
 				
 				hdlwindowinfo hinfo;
 				
@@ -2563,7 +2569,7 @@
 			(**hd).scriptsourcestack [topscriptsource - 1].pwindow = source.pwindow;
 			}
 		
-		if (!flcontinue && !fllangerror)
+		if (!lflcontinue && !fllangerror)
 			windowbringtofront (source.pwindow);
 		
 		shellpushglobals (source.pwindow);
@@ -2579,7 +2585,7 @@
 	
 	exit:
 	
-	if (flcontinue) /*don't drop into event loop, continue running script*/
+	if (lflcontinue) /*don't drop into event loop, continue running script*/
 		return (scriptbackgroundtask (false));
 	
 	(**hd).flscriptsuspended = true;
@@ -2608,7 +2614,8 @@
 
 
 boolean scriptpushsourcecode (hdlhashtable htable, hdlhashnode hnode, bigstring bsname) {
-	
+#pragma unused (bsname)
+
 	/*
 	code execution is about to move into a new script.  hnode should be the 
 	node in htable containing the script (external variable).
@@ -2798,7 +2805,8 @@
 
 
 boolean scriptpoptable (hdlhashtable htable) {
-	
+#pragma unused (htable)
+
 	/*
 	1/9/91 dmb: see comment in scriptgetlevelname...
 	
@@ -2942,10 +2950,10 @@
 	5.0.2 dmb: don't clear the recently changed bit; restore it.
 	*/
 	
-	boolean flbreak = !(**hnode).flbreakpoint;
+	boolean lflbreak = !(**hnode).flbreakpoint;
 	boolean flrecentlychanged = (**outlinedata).flrecentlychanged;
 	
-	(**hnode).flbreakpoint = flbreak;
+	(**hnode).flbreakpoint = lflbreak;
 	
 	opinvalnode (hnode); /*inval the dirty line*/
 	
@@ -2955,7 +2963,7 @@
 	
 	opupdatenow ();
 	
-	return (flbreak);
+	return (lflbreak);
 	} /*optogglebreakpoint*/
 
 
@@ -3089,7 +3097,8 @@
 
 
 static boolean scriptcommentvisit (hdlheadrecord hnode, void *refcon) {
-	
+#pragma unused (refcon)
+
 	register hdlheadrecord h = hnode;
 	bigstring bs;
 	
@@ -3634,7 +3643,7 @@
 	
 	serverarray [(*cbd).ctmenus++] = subtype;
 	
-	if (subtype == (*cbd).signature)
+	if (subtype == (OSType)(*cbd).signature)
 		(*cbd).checkeditem = (*cbd).ctmenus;
 	
 	return (true);
@@ -3642,7 +3651,8 @@
 
 
 static boolean scriptserverpopupselect (hdlmenu hmenu, short itemselected) {
-	
+#pragma unused (hmenu)
+
 	/*
 	2.1b11 dmb: dirty the outline
 	*/

Modified: Frontier/trunk/Common/source/strings.c
===================================================================
--- Frontier/trunk/Common/source/strings.c	2006-04-05 22:58:09 UTC (rev 1203)
+++ Frontier/trunk/Common/source/strings.c	2006-04-05 23:07:18 UTC (rev 1204)
@@ -1322,16 +1322,16 @@
 	} /*pushheapstring*/
 
 
-void timedatestring (long time, bigstring bs) {
+void timedatestring (long ptime, bigstring bs) {
 	bigstring bstime;
 
-	timetodatestring (time, bs, false);	
+	timetodatestring (ptime, bs, false);	
 
 	getstringlist (interfacelistnumber, timedateseperatorstring, bstime);
 
 	pushstring (bstime, bs);
 
-	timetotimestring (time, bstime, true);
+	timetotimestring (ptime, bstime, true);
 		
 	pushstring (bstime, bs);
 
@@ -1351,13 +1351,13 @@
 		}
 	*/
 	
-	IUDateString (time, shortDate, bs);
+	IUDateString (ptime, shortDate, bs);
 	
 	getstringlist (interfacelistnumber, timedateseperatorstring, bstime);
 	
 	pushstring (bstime, bs);
 	
-	IUTimeString (time, true, bstime);
+	IUTimeString (ptime, true, bstime);
 	
 	pushstring (bstime, bs);
 #endif
@@ -1879,8 +1879,9 @@
 	/*
 	2.1b4 dmb: always copy into type, even when returning false for bad length
 	*/
-	
-	register short len = stringlength (bs);
+
+	// kw 2005-11-28 changed to unsigned for better match with stringlength()
+	register unsigned short len = stringlength (bs);
 	boolean fl = true;
 	
 	*type = '    ';


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

SF.net SVN: frontierkernel: [1203] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1203
Author:   karstenw
Date:     2006-04-05 15:58:09 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1203&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/claybrowserstruc.c
    Frontier/trunk/Common/source/fileloop.c
    Frontier/trunk/Common/source/langtree.c
    Frontier/trunk/Common/source/launch.c
    Frontier/trunk/Common/source/ophoist.c
    Frontier/trunk/Common/source/oppack.c
    Frontier/trunk/Common/source/shellfile.c
    Frontier/trunk/Common/source/shellscroll.c
    Frontier/trunk/Common/source/shellsysverbs.c
    Frontier/trunk/Common/source/shellupdate.c
    Frontier/trunk/Common/source/tableops.c
    Frontier/trunk/Common/source/tablescrap.c
Modified: Frontier/trunk/Common/source/claybrowserstruc.c
===================================================================
--- Frontier/trunk/Common/source/claybrowserstruc.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/claybrowserstruc.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -431,7 +431,8 @@
 
 
 static boolean deletetmpbitvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	if ((**hnode).tmpbit) {
 		
 		(**hnode).tmpbit = false;
@@ -922,9 +923,10 @@
 
 
 boolean browsertextualizerefcon (hdlheadrecord hnode, Handle htext) {
-	
+#pragma unused (htext)
+
 	tyvaluerecord val;
-	
+
 	if (!browsergetnodevalue (hnode, &val))
 		return (false);
 	
@@ -960,7 +962,8 @@
 	
 	
 static boolean lineinsertvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	set the node's refcon info to reflect its current position in
 	the outline hierarchy.
@@ -1035,7 +1038,8 @@
 
 
 static boolean notownrefconvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	(**hnode).flnodeonscrap = true;
 	
 	return (true);
@@ -1043,7 +1047,8 @@
 
 
 static boolean closeownedwindowsvisit (hdlhashnode hn, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	tyvaluerecord val = (**hn).val;
 	hdlexternalvariable hv;
 	hdlwindowinfo hinfo;

Modified: Frontier/trunk/Common/source/fileloop.c
===================================================================
--- Frontier/trunk/Common/source/fileloop.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/fileloop.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -54,7 +54,8 @@
 
 
 static boolean fileloopreleaseitem (Handle h) {
-	
+#pragma unused(h)
+
 	/*
 	callback routine that disposes of one of our items.  since there are no
 	handles linked into our handle, there's nothing to release.
@@ -68,7 +69,8 @@
 	
 
 boolean diskinitloop (tyfileloopcallback diskfilter, Handle *hdiskloop) {
-	
+#pragma unused(diskfilter)
+
 	/*
 	same as fileinitloop, but for volumes on line
 	
@@ -178,7 +180,8 @@
 	
 
 boolean fileinitloop (const tyfilespec *fs, tyfileloopcallback filefilter, Handle *hfileloop) {
-	
+#pragma unused(filefilter)
+
 	/*
 	a conglomeration of filemanager incantations which sets up a UserLand
 	fileloop construct.  we create a new handle (allows fileloops to be

Modified: Frontier/trunk/Common/source/langtree.c
===================================================================
--- Frontier/trunk/Common/source/langtree.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/langtree.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -318,7 +318,8 @@
 
 
 static boolean counttreenodevisit (hdltreenode hnode, ptrvoid refcon) {
-	
+#pragma unused (hnode)
+
 	short *ctnodes = (short *) refcon;
 	
 	++*ctnodes;
@@ -1025,7 +1026,7 @@
 	*/
 	
 	register hdltreenode hn = htree;
-	ptrpacktreeinfo pi = (ptrpacktreeinfo) refcon;
+	ptrpacktreeinfo lpi = (ptrpacktreeinfo) refcon;
 	register ptrdisktreenode pn;
 	tyvaluerecord val = (**hn).nodeval;
 	Handle hpackedval = nil;
@@ -1039,7 +1040,7 @@
 		if (!langpackvalue ((**hn).nodeval, &hpackedval, HNoNode))
 			return (false);
 		
-		if (!pushhandle (hpackedval, (*pi).htreenodevalues)) {
+		if (!pushhandle (hpackedval, (*lpi).htreenodevalues)) {
 			
 			disposehandle (hpackedval);
 			
@@ -1047,7 +1048,7 @@
 			}
 		}
 	
-	pn = &(**(*pi).hdisktree).nodes [(*pi).ctvisited++];
+	pn = &(**(*lpi).hdisktree).nodes [(*lpi).ctvisited++];
 	
 	(*pn).nodetype = (**hn).nodetype;
 	
@@ -1123,15 +1124,19 @@
 	memtodisklong ((**info.hdisktree).flags);
 	
 	return (mergehandles ((Handle) info.hdisktree, info.htreenodevalues, hpacked));
-	} /*langpacktree*/
+} /*langpacktree*/
 
 
-static boolean langunpacktreenode (tydisktreenode *rec, hdltreenode *hnode, ptrpacktreeinfo pi) {
-	
+static boolean
+langunpacktreenode (
+		tydisktreenode	*rec,
+		hdltreenode		*hnode,
+		ptrpacktreeinfo	 ppi)
+{
 	/*
 	unpack a single tree node.
 	*/
-	
+
 	register ptrdisktreenode pn = rec;
 	register hdltreenode hn;
 	Handle hpackedval = nil;
@@ -1150,7 +1155,7 @@
 		if (!newhandle ((*pn).nodevalsize, &hpackedval))
 			goto error;
 		
-		if (!pullfromhandle ((*pi).htreenodevalues, 0, (*pn).nodevalsize, *hpackedval)) /*does _not_ move memory*/
+		if (!pullfromhandle ((*ppi).htreenodevalues, 0, (*pn).nodevalsize, *hpackedval)) /*does _not_ move memory*/
 			goto error;
 		
 		if (!langunpackvalue (hpackedval, &val))
@@ -1166,26 +1171,28 @@
 	(**hn).lnum = (*pn).lnum;
 	
 	(**hn).charnum = (*pn).charnum;
-	
+
 	return (true);
-	
-	error: {
-		
-		#ifndef treenodeallocator
-			disposehandle ((Handle) *hnode);
-		#else
-			freetreenode (*hnode);
-		#endif
-		
+
+error:
+	{
+#ifndef treenodeallocator
+		disposehandle ((Handle) *hnode);
+#else
+		freetreenode (*hnode);
+#endif
 		disposehandle (hpackedval);
 		
 		return (false);
-		}
-	} /*langunpacktreenode*/
+	}
+} /*langunpacktreenode*/
 
 
-static boolean langunpacktreevisit (hdltreenode *htree, ptrpacktreeinfo pi) {
-	
+static boolean
+langunpacktreevisit (
+		hdltreenode		*htree,
+		ptrpacktreeinfo	 ppi)
+{
 	/*
 	unpack a code tree recursively
 	*/
@@ -1195,18 +1202,18 @@
 	tydisktreenode rec;
 	hdltreenode hnode;
 	
-	while (true) {
+	while (true)
+	{
+		rec = (**(*ppi).hdisktree).nodes [(*ppi).ctvisited++];
 		
-		rec = (**(*pi).hdisktree).nodes [(*pi).ctvisited++];
-		
 		disktomemlong (rec.nodevalsize);
 		disktomemshort (rec.lnum);
 		disktomemshort (rec.charnum);
 		/* remaining fields are byte values */
 
-		assert ((*pi).ctvisited <= (**(*pi).hdisktree).ctnodes);
+		assert ((*ppi).ctvisited <= (**(*ppi).hdisktree).ctnodes);
 		
-		if (!langunpacktreenode (&rec, &hnode, pi))
+		if (!langunpacktreenode (&rec, &hnode, ppi))
 			goto error;
 		
 		if (hn == nil) /*first node created*/
@@ -1216,37 +1223,37 @@
 		
 		hn = hnode;
 		
-		if (rec.paraminfo & hasparam1_mask) {
-			
-			if (!langunpacktreevisit (&hnode, pi))
+		if (rec.paraminfo & hasparam1_mask)
+		{
+			if (!langunpacktreevisit (&hnode, ppi))
 				goto error;
-			
+
 			(**hn).param1 = hnode;
-			}
-		
-		if (rec.paraminfo & hasparam2_mask) {
-			
-			if (!langunpacktreevisit (&hnode, pi))
+		}
+
+		if (rec.paraminfo & hasparam2_mask)
+		{
+			if (!langunpacktreevisit (&hnode, ppi))
 				goto error;
-			
+
 			(**hn).param2 = hnode;
-			}
-		
-		if (rec.paraminfo & hasparam3_mask) {
-			
-			if (!langunpacktreevisit (&hnode, pi))
+		}
+
+		if (rec.paraminfo & hasparam3_mask)
+		{
+			if (!langunpacktreevisit (&hnode, ppi))
 				goto error;
-			
+
 			(**hn).param3 = hnode;
-			}
-		
-		if (rec.paraminfo & hasparam4_mask) {
-			
-			if (!langunpacktreevisit (&hnode, pi))
+		}
+
+		if (rec.paraminfo & hasparam4_mask)
+		{
+			if (!langunpacktreevisit (&hnode, ppi))
 				goto error;
-			
+
 			(**hn).param4 = hnode;
-			}
+		}
 		
 		if ((rec.paraminfo & haslink_mask) == 0)
 			break;

Modified: Frontier/trunk/Common/source/launch.c
===================================================================
--- Frontier/trunk/Common/source/launch.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/launch.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -1454,9 +1454,12 @@
 
 #ifdef MACVERSION
 static boolean system6activate (bigstring bsprogram) {
-	
-	#ifdef flsystem6
-	
+#	if TARGET_API_MAC_CARBON == 1
+#		pragma unused (bsprogram)
+#	endif
+
+#	ifdef flsystem6
+
 	bigstring bs;
 	
 	if (bsprogram == nil)

Modified: Frontier/trunk/Common/source/ophoist.c
===================================================================
--- Frontier/trunk/Common/source/ophoist.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/ophoist.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -76,7 +76,8 @@
 	
 
 static boolean oppushhoistvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	assume we are only being called for the 1st level subheads of the guy
 	being hoisted.  we reset his left pointer to indicate that he's a summit,

Modified: Frontier/trunk/Common/source/oppack.c
===================================================================
--- Frontier/trunk/Common/source/oppack.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/oppack.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -1177,7 +1177,8 @@
 
 
 boolean optextscraptooutline (hdloutlinerecord houtline, Handle htext, hdlheadrecord *hnode) {
-	
+#pragma unused (houtline)
+
 	/*
 	there seems to be an opportunity to factor code here.
 	

Modified: Frontier/trunk/Common/source/shellfile.c
===================================================================
--- Frontier/trunk/Common/source/shellfile.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/shellfile.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -281,22 +281,22 @@
 	5.0d3 dmb: look in clickers table for types we can actually open
 	*/
 	
-	tyconfigrecord config;
-	tyfilespec fspec;
-	tysftypelist filetypes;
-	ptrsftypelist ptypes = nil;
-	hdlhashtable htable;
+	tyconfigrecord	lconfig;
+	tyfilespec		fspec;
+	tysftypelist	filetypes;
+	ptrsftypelist	ptypes = nil;
+	hdlhashtable	htable;
 	bigstring bs;
 	boolean fl;
 	hdlwindowinfo hdummy;
 	
 	if (!keyboardstatus.floptionkey) { /*2.1b4*/
 		
-		shellgetconfig (iddefaultconfig, &config);
+		shellgetconfig (iddefaultconfig, &lconfig);
 		
 		filetypes.cttypes = 1;
 		
-		filetypes.types [0] = config.filetype;
+		filetypes.types [0] = lconfig.filetype;
 		
 	//	filetypes.types [1] = '2CLK'; // application glue files
 		
@@ -330,7 +330,10 @@
 
 
 static void prepuserforwait (WindowPtr w) {
-	
+#if TARGET_API_MAC_CARBON
+#	pragma unused(w)
+#endif
+
 	/*
 	4.1.1b1 dmb: call langpartialeventloop when appropriate
 
@@ -362,7 +365,8 @@
 
 
 static boolean killundovisit (WindowPtr w, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	if (shellpushglobals (w)) {
 		
 		killundo ();
@@ -745,22 +749,22 @@
 	5.0d8 dmb: pass file type to sfdialog for Win
 	*/
 	
-	tyconfigrecord config;
+	tyconfigrecord lconfig;
 	tyfilespec fspec;
 	tysftypelist filetypes;
 	WindowPtr w;
 	
-	shellgetconfig (iddefaultconfig, &config);
+	shellgetconfig (iddefaultconfig, &lconfig);
 	
 	clearbytes (&fspec, sizeof (fspec));
 	
 	getuntitledfilename (fsname (&fspec));
 	
-	if (config.flcreateonnew) {
+	if (lconfig.flcreateonnew) {
 		
 		filetypes.cttypes = 1;
 
-		filetypes.types [0] = config.filetype;
+		filetypes.types [0] = lconfig.filetype;
 		
 		if (!sfdialog (sfputfileverb, nil, &filetypes, &fspec, 'LAND')) /* 2005-10-06 creedon - added 'LAND' */ /*user canceled*/
 			return (false);

Modified: Frontier/trunk/Common/source/shellscroll.c
===================================================================
--- Frontier/trunk/Common/source/shellscroll.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/shellscroll.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -356,7 +356,7 @@
 
 	SInt32 theValue = 0, theRange, theDistance, thePin;
 	Rect rectControl, indicatorbounds;
-	WindowPtr pWindow;
+	WindowPtr lpWindow;
 	long thumbheight = 16;
 	long thumbwidth = 16;
 	RgnHandle indicatorregion = NewRgn ();
@@ -376,7 +376,7 @@
 	
 	gTotalWidthAdjust = ((kScrollArrowWidth * 2) + thumbwidth);
 
-	pWindow = shellwindow; // (*hControl)->contrlOwner;
+	lpWindow = shellwindow; // (*hControl)->contrlOwner;
 	
 	zerorect (&rectControl);
 	

Modified: Frontier/trunk/Common/source/shellsysverbs.c
===================================================================
--- Frontier/trunk/Common/source/shellsysverbs.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/shellsysverbs.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -870,7 +870,8 @@
 extern boolean hashstatsverb (tyvaluerecord *v);
 
 static boolean frontierfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
-	
+#pragma unused (bserror)
+
 	/*
 	6/5/92 dmb: added isruntime func
 	

Modified: Frontier/trunk/Common/source/shellupdate.c
===================================================================
--- Frontier/trunk/Common/source/shellupdate.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/shellupdate.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -333,14 +333,16 @@
 
 
 static boolean updatenowvisit (WindowPtr wupdate, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	shellupdatenow (wupdate);
 	
 	return (true);
 	} /*updatenowvisit*/
 
 
-void shellupdateallnow (void) { /*updates all windows immediately*/
+/*updates all windows immediately*/
+void shellupdateallnow (void) {
 	
 	shellvisittypedwindows (-1, &updatenowvisit, nil); /*visit all windows*/
 	} /*shellupdateallnow*/

Modified: Frontier/trunk/Common/source/tableops.c
===================================================================
--- Frontier/trunk/Common/source/tableops.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/tableops.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -236,7 +236,8 @@
 
 
 boolean newtablevariable (boolean flinmemory, long variabledata, hdltablevariable *h, boolean flxml) {
-	
+#pragma unused (flxml)
+
 	/*
 	tytablevariable item;
 	
@@ -546,7 +547,8 @@
 
 
 static boolean nosubsdirtyvisit (hdlhashnode hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	return true if hnode and its substructure is all clean
 	*/
@@ -842,7 +844,8 @@
 
 
 boolean tablemovetoname (hdlhashtable htable, bigstring bsname) {
-	
+#pragma unused (htable)
+
 	/*
 	2/4/91 dmb: must visi if already on cell
 

Modified: Frontier/trunk/Common/source/tablescrap.c
===================================================================
--- Frontier/trunk/Common/source/tablescrap.c	2006-04-05 22:52:08 UTC (rev 1202)
+++ Frontier/trunk/Common/source/tablescrap.c	2006-04-05 22:58:09 UTC (rev 1203)
@@ -543,7 +543,8 @@
 
 
 static boolean tableclosewindows (hdlhashnode hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	the indicated external value is being deleted.  close any windows 
 	that contain descendants of the table


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

SF.net SVN: frontierkernel: [1202] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1202
Author:   karstenw
Date:     2006-04-05 15:52:08 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1202&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/dialogs.c
    Frontier/trunk/Common/source/icon.c
    Frontier/trunk/Common/source/langhash.c
    Frontier/trunk/Common/source/shellwindow.c
    Frontier/trunk/Common/source/tableformats.c
Modified: Frontier/trunk/Common/source/dialogs.c
===================================================================
--- Frontier/trunk/Common/source/dialogs.c	2006-04-05 22:31:38 UTC (rev 1201)
+++ Frontier/trunk/Common/source/dialogs.c	2006-04-05 22:52:08 UTC (rev 1202)
@@ -896,7 +896,8 @@
 
 
 static void passwordprocesskey (DialogPtr pdialog, char chkb, EventRecord *ev, short *item) {
-	
+#pragma unused (item)
+
 	TEHandle hte;
 	char *buffer;
 	short start, end;
@@ -1083,10 +1084,10 @@
 			//at some points to use ModalDialog Correctly.
 			#if TARGET_API_MAC_CARBON == 1
 				{
-				WindowRef pWindow = GetDialogWindow(pdialog);
+				WindowRef lpWindow = GetDialogWindow(pdialog);
 				CGrafPtr thePort = GetDialogPort(pdialog);
 				
-				SelectWindow(pWindow);
+				SelectWindow(lpWindow);
 				QDFlushPortBuffer(thePort, nil);	
 				}
 			#else

Modified: Frontier/trunk/Common/source/icon.c
===================================================================
--- Frontier/trunk/Common/source/icon.c	2006-04-05 22:31:38 UTC (rev 1201)
+++ Frontier/trunk/Common/source/icon.c	2006-04-05 22:52:08 UTC (rev 1202)
@@ -668,9 +668,17 @@
 
 #if TARGET_API_MAC_CARBON == 1
 
-	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
-		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
-		
+static void
+MyThemeButtonDrawCallback (
+		const Rect					*bounds,
+		ThemeButtonKind				 kind,
+		const ThemeButtonDrawInfo	*info,
+		UInt32						 refcon,
+		SInt16						 depth,
+		Boolean						 isColorDev)
+{
+#pragma unused (kind, info, refcon, depth, isColorDev)
+
 		/*
 		7.0b48 PBS: draw the arrow for a pushbutton. It will be centered.
 		*/
@@ -684,9 +692,10 @@
 		
 		rarrow.left++; /*it appears to need it*/
 				
-		DrawThemePopupArrow (&rarrow, kThemeArrowRight, kThemeArrow9pt, kThemeStateActive, NULL, (UInt32) NULL);
-		} /*MyThemeButtonDrawCallback*/
+		DrawThemePopupArrow (&rarrow, kThemeArrowRight, kThemeArrow9pt, kThemeStateActive, NULL, 0);
 
+	} /*MyThemeButtonDrawCallback*/
+
 #endif
 
 void drawlabeledwindoidicon (Rect r, bigstring bslabel, boolean flhastext, boolean flpressed) {

Modified: Frontier/trunk/Common/source/langhash.c
===================================================================
--- Frontier/trunk/Common/source/langhash.c	2006-04-05 22:31:38 UTC (rev 1201)
+++ Frontier/trunk/Common/source/langhash.c	2006-04-05 22:52:08 UTC (rev 1202)
@@ -2533,7 +2533,7 @@
 	6.2a15 AR: added flmustsave parameter
 	*/
 	
-	typackinforecord *pi = (typackinforecord *) refcon;
+	typackinforecord *lpi = (typackinforecord *) refcon;
 	tydisksymbolrecord rec;
 	bigstring bsvalue;
 	long size;
@@ -2559,7 +2559,7 @@
 	
 	clearbytes (&rec, sizeof (rec));
 	
-	if (!hashpackstring (&pi->s2, bsname, &rec.ixkey))
+	if (!hashpackstring (&lpi->s2, bsname, &rec.ixkey))
 		goto error;
 	
 	memtodisklong (rec.ixkey);
@@ -2576,7 +2576,7 @@
 		case oldstringvaluetype:
 			copyheapstring ((hdlstring) val.data.stringvalue, bsvalue);
 			
-			if (!hashpackstring (&pi->s2, bsvalue, &rec.data.longvalue))
+			if (!hashpackstring (&lpi->s2, bsvalue, &rec.data.longvalue))
 				goto error;
 			
 			break;
@@ -2591,7 +2591,7 @@
 			if (!fl) // on error, bsvalue should at least be item's name; don't break the save
 				;
 			
-			if (!hashpackstring (&pi->s2, bsvalue, &rec.data.longvalue))
+			if (!hashpackstring (&lpi->s2, bsvalue, &rec.data.longvalue))
 				goto error;
 			
 			break;
@@ -2614,7 +2614,7 @@
 				
 			enablelangerror ();
 			
-			if (!hashpackbinary (&pi->s2, (Handle) x, &rec.data.longvalue))
+			if (!hashpackbinary (&lpi->s2, (Handle) x, &rec.data.longvalue))
 				goto error;
 			
 			disposehandle ((Handle) halias); /*3.0.2*/
@@ -2628,7 +2628,7 @@
 			
 			recttodiskrect (*val.data.rectvalue, &rdisk);
 			
-			if (!hashpackdata (&pi->s2, &rdisk, sizeof (rdisk), &rec.data.longvalue))
+			if (!hashpackdata (&lpi->s2, &rdisk, sizeof (rdisk), &rec.data.longvalue))
 				goto error;
 			
 			break;
@@ -2639,7 +2639,7 @@
 			
 			rgbtodiskrgb (*val.data.rgbvalue, &rgbdisk);
 			
-			if (!hashpackdata (&pi->s2, &rgbdisk, sizeof (rgbdisk), &rec.data.longvalue))
+			if (!hashpackdata (&lpi->s2, &rgbdisk, sizeof (rgbdisk), &rec.data.longvalue))
 				goto error;
 			
 			break;
@@ -2657,7 +2657,7 @@
 					dtox80 (&x, &x80);
 				#endif	
 				
-				if (!hashpackdata (&pi->s2, &x80, sizeof (x80), &rec.data.longvalue))
+				if (!hashpackdata (&lpi->s2, &x80, sizeof (x80), &rec.data.longvalue))
 					goto error;
 				
 				break;
@@ -2681,7 +2681,7 @@
 		case listvaluetype:
 		case recordvaluetype:
 	#endif
-			if (!hashpackscalar (&pi->s2, hnode, &rec.data.longvalue))
+			if (!hashpackscalar (&lpi->s2, hnode, &rec.data.longvalue))
 				goto error;
 				
 			break;
@@ -2692,7 +2692,7 @@
 			if (!oppacklist (val.data.listvalue, &hpacked))
 				goto error;
 			
-			if (!hashpackbinary (&pi->s2, hpacked, &rec.data.longvalue))
+			if (!hashpackbinary (&lpi->s2, hpacked, &rec.data.longvalue))
 				goto error;
 			
 			rec.version = 2;
@@ -2708,7 +2708,7 @@
 			if (!langpackfileval (&val, &hpacked))
 				goto error;
 			
-			if (!hashpackbinary (&pi->s2, hpacked, &rec.data.longvalue))
+			if (!hashpackbinary (&lpi->s2, hpacked, &rec.data.longvalue))
 				goto error;
 			
 			rec.version = 2;
@@ -2722,7 +2722,7 @@
 			if (!langpacktree (val.data.codevalue, &hpacked))
 				goto error;
 			
-			if (!hashpackbinary (&pi->s2, hpacked, &rec.data.longvalue))
+			if (!hashpackbinary (&lpi->s2, hpacked, &rec.data.longvalue))
 				goto error;
 			
 			disposehandle (hpacked); /*3.0.2*/
@@ -2732,10 +2732,10 @@
 		case externalvaluetype: {
 			boolean flnewdbaddress = false;
 			
-			if (!hashpackexternal (&pi->s2, (hdlexternalvariable) val.data.externalvalue, &rec.data.longvalue, &flnewdbaddress))
+			if (!hashpackexternal (&lpi->s2, (hdlexternalvariable) val.data.externalvalue, &rec.data.longvalue, &flnewdbaddress))
 				goto error;
 			
-			pi->flmustsave = pi->flmustsave || flnewdbaddress;
+			lpi->flmustsave = lpi->flmustsave || flnewdbaddress;
 				
 			break;
 			}
@@ -2792,7 +2792,7 @@
 	if (size == sizeof (short))
 		memtodiskshort (rec.data.intvalue);
 	
-	if (!writehandlestream (&pi->s1, &rec, sizeof (rec))) 
+	if (!writehandlestream (&lpi->s1, &rec, sizeof (rec))) 
 		goto error;
 	
 	languntraperrors (savecallback, saverefcon, false);
@@ -2801,9 +2801,9 @@
 	
 	error:
 	
-	disposehandlestream (&pi->s1); 
+	disposehandlestream (&lpi->s1); 
 	
-	disposehandlestream (&pi->s2); 
+	disposehandlestream (&lpi->s2); 
 	
 	languntraperrors (savecallback, saverefcon, true);
 	
@@ -3519,12 +3519,12 @@
 	} /*hashgetnthnode*/
 	
 	
-boolean hashgetsortedindex (hdlhashtable htable, hdlhashnode hnode, long *index) {
+boolean hashgetsortedindex (hdlhashtable htable, hdlhashnode hnode, long *idx) {
 	
 	/*
 	traverse the sorted list for the indicated table, looking for the indicated node.
 	
-	if we find it, set *index to its index, and return true.
+	if we find it, set *idx to its index, and return true.
 	
 	the index is 0-based.
 	*/
@@ -3536,7 +3536,7 @@
 		
 		if (nomad == hnode) { /*found it*/
 			
-			*index = ct;
+			*idx = ct;
 			
 			return (true);
 			}

Modified: Frontier/trunk/Common/source/shellwindow.c
===================================================================
--- Frontier/trunk/Common/source/shellwindow.c	2006-04-05 22:31:38 UTC (rev 1201)
+++ Frontier/trunk/Common/source/shellwindow.c	2006-04-05 22:52:08 UTC (rev 1202)
@@ -121,15 +121,15 @@
 
 
 void shelldrawgrowicon (hdlwindowinfo hinfo) {
-	
-	#ifdef MACVERSION
 
-		#if TARGET_API_MAC_CARBON == 1
-		
-			return;
+#	ifdef MACVERSION
+#		if TARGET_API_MAC_CARBON == 1
+#			pragma unused (hinfo)
+
+	return;
+
+#	else
 			
-		#else
-			
 			Rect r;
 			
 			if (shellgetgrowiconrect (hinfo, &r)) {
@@ -1218,7 +1218,8 @@
 
 
 static boolean counttypedvisit (WindowPtr w,  ptrvoid refcon) {
-	
+#pragma unused(w)
+
 	(*(short *)refcon)++;
 	
 	return (true);
@@ -1451,7 +1452,8 @@
 
 
 static boolean graywindowvisit (WindowPtr w, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	graywindow (w);
 	
 	return (true);
@@ -2346,7 +2348,8 @@
 
 
 boolean shellzoomwindow (hdlwindowinfo hinfo, boolean flzoomin) {
-	
+#pragma unused (flzoomin)
+
 	/*
 	9/16/91 dmb: use the new getcontentsizeroutine to apply intelligent 
 	window sizing when zooming window.
@@ -2988,7 +2991,7 @@
 		if ((**h).flneversaved)
 			deletefile (&fspec);
 		
-		flushvolumechanges (&fspec, (short) NULL);
+		flushvolumechanges (&fspec, (hdlfilenum)0);
 		}
 	
 	(**h).fnum = 0; /*indicate no file open*/

Modified: Frontier/trunk/Common/source/tableformats.c
===================================================================
--- Frontier/trunk/Common/source/tableformats.c	2006-04-05 22:31:38 UTC (rev 1201)
+++ Frontier/trunk/Common/source/tableformats.c	2006-04-05 22:52:08 UTC (rev 1202)
@@ -774,29 +774,30 @@
 
 
 boolean tablenewformatsrecord (hdlhashtable ht, Rect tablerect, hdltableformats *hformats) {
-	
+#pragma unused(tablerect)
+
 	/*
 	allocate a new tableformats and set default and/or initial values of fields of
 	the record.
 	*/
 	 
 	register hdltableformats hf = nil;
-	tyconfigrecord config;
+	tyconfigrecord lconfig;
 	
 	if (!newtableformats (hformats))
 		return (false);
 	
 	hf = *hformats; /*copy into register*/
 	
-	langexternalgetconfig (tablevaluetype, idtableconfig, &config);
+	langexternalgetconfig (tablevaluetype, idtableconfig, &lconfig);
 	
-	(**hf).windowrect = config.defaultwindowrect;
+	(**hf).windowrect = lconfig.defaultwindowrect;
 	
-	(**hf).fontnum = config.defaultfont;
+	(**hf).fontnum = lconfig.defaultfont;
 	
-	(**hf).fontsize = config.defaultsize;
+	(**hf).fontsize = lconfig.defaultsize;
 	
-	(**hf).fontstyle = config.defaultstyle;
+	(**hf).fontstyle = lconfig.defaultstyle;
 	
 	tableformatsdata = hf; /*set global for displayinfo routine*/
 	
@@ -828,7 +829,8 @@
 
 
 static boolean notexpandedvisit (hdlheadrecord hnode, ptrvoid refcon)  {
-	
+#pragma unused (refcon)
+
 	return (!opsubheadsexpanded (hnode));
 	} /*notexpandedvisit*/
 
@@ -1067,10 +1069,10 @@
 	
 	//load table outline
 	if (info.savedoutline) {
+
+		tyconfigrecord lconfig;
 		
-		tyconfigrecord config;
-		
-		langexternalgetconfig (tablevaluetype, idtableconfig, &config); // force loading of prefs
+		langexternalgetconfig (tablevaluetype, idtableconfig, &lconfig); // force loading of prefs
 	
 		fl = opunpack (hpacked, &ixhandle, &ho);
 		


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

SF.net SVN: frontierkernel: [1201] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1201
Author:   karstenw
Date:     2006-04-05 15:31:38 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1201&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/cancoonpopup.c
    Frontier/trunk/Common/source/dockmenu.c
    Frontier/trunk/Common/source/fileverbs.c
    Frontier/trunk/Common/source/langevaluate.c
    Frontier/trunk/Common/source/langipc.c
    Frontier/trunk/Common/source/mac.c
    Frontier/trunk/Common/source/menu.c
    Frontier/trunk/Common/source/shellcallbacks.c
    Frontier/trunk/Common/source/smallicon.c
    Frontier/trunk/Common/source/sounds.c
    Frontier/trunk/Common/source/tablepopup.c
Modified: Frontier/trunk/Common/source/cancoonpopup.c
===================================================================
--- Frontier/trunk/Common/source/cancoonpopup.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/cancoonpopup.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -56,7 +56,8 @@
 
 
 static boolean ccagentpopupvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
-	
+#pragma unused (hnode)
+
 	hdltreenode hcode;
 	ptragentpopupinfo info = (ptragentpopupinfo) refcon;
 	
@@ -169,7 +170,8 @@
 
 
 boolean ccagentpopuphit (Rect rpopup, Point pt) {
-	
+#pragma unused (pt)
+
 	return (popupmenuhit (rpopup, true, &ccfillagentpopup, &ccagentpopupselect));
 	} /*ccagentpopuphit*/
 

Modified: Frontier/trunk/Common/source/dockmenu.c
===================================================================
--- Frontier/trunk/Common/source/dockmenu.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/dockmenu.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -403,10 +403,7 @@
 #if TARGET_API_MAC_CARBON == 1
 
 pascal OSStatus dockcommandhandler (EventHandlerCallRef nextHandler, EventRef theEvent, void* userData) {
-	
-	#pragma unused(nextHandler) /*happy compiler*/
-	#pragma unused(theEvent)
-	#pragma unused(userData)
+#pragma unused(nextHandler, theEvent, userData)	/*happy compiler*/
 
 	HICommand commandstruct;
 	UInt32 commandid;

Modified: Frontier/trunk/Common/source/fileverbs.c
===================================================================
--- Frontier/trunk/Common/source/fileverbs.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/fileverbs.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -745,19 +745,19 @@
 		
 		short ctconsumed = 3;
 		short ctpositional = 3;
-		tyvaluerecord val;
+		tyvaluerecord lval;
 
 		if (!gettypelistvalue (hparam1, 3, &filetypes, &typelist))
 			return (false);
 			
 		flnextparamislast = true;
 		
-		setostypevalue (oscreator, &val);
+		setostypevalue (oscreator, &lval);
 
-		if (!getoptionalparamvalue (hparam1, &ctconsumed, &ctpositional, "\x07""creator", &val))
+		if (!getoptionalparamvalue (hparam1, &ctconsumed, &ctpositional, "\x07""creator", &lval))
 			return (false);
 	
-		oscreator = val.data.ostypevalue;
+		oscreator = lval.data.ostypevalue;
 
 		}
 	

Modified: Frontier/trunk/Common/source/langevaluate.c
===================================================================
--- Frontier/trunk/Common/source/langevaluate.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/langevaluate.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -1120,7 +1120,8 @@
 #endif
 
 static boolean langtryerror (bigstring bsmsg, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	6/25/92 dmb: when an error occurs during a try block, we stash it in 
 	the tryerror handle.  it is later placed in the stack frame of the 

Modified: Frontier/trunk/Common/source/langipc.c
===================================================================
--- Frontier/trunk/Common/source/langipc.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/langipc.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -138,7 +138,8 @@
 
 
 boolean langipcerrorroutine (bigstring bs, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	if an error occurs while processing a runscript verb, we want to 
 	return the text that would normally go into the langerror window as 
@@ -2033,7 +2034,8 @@
 
 
 boolean langipcgetaddressvalue (hdltreenode hparam1, tyvaluerecord *vreturned) {
-	
+#pragma unused (hparam1)
+
 	return (setbooleanvalue (false, vreturned));
 	} /*langipcgetaddressvalue*/
 
@@ -2705,7 +2707,8 @@
 */
 
 static boolean langipcgetparamvisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
-	
+#pragma unused (hnode)
+
 	hdlverbrecord hv = (hdlverbrecord) refcon;
 	OSType key;
 	
@@ -2867,15 +2870,15 @@
 		tyvaluerecord valparam;
 		tyvaluerecord valkey;
 		hdlhashtable htable;
-		boolean fl;
+		boolean lfl;
 		
 		flparamerrorenabled = false; /*no error dialog on getparamvalue call*/
 		
-		fl = getparamvalue (hp1, pnum++, &valkey);
+		lfl = getparamvalue (hp1, pnum++, &valkey);
 		
 		flparamerrorenabled = true; /*restore*/
 		
-		if (!fl) { /*didn't get another key*/
+		if (!lfl) { /*didn't get another key*/
 			
 			if (fllangerror) /*was a bad parameter; didn't run out*/
 				goto error;
@@ -2904,14 +2907,14 @@
 				
 				flinhibitnilcoercion = true;
 				
-				fl = getparamvalue (hp1, pnum++, &valparam);
+				lfl = getparamvalue (hp1, pnum++, &valparam);
 				
 				flinhibitnilcoercion = false;
 				
 				if (fllangerror) /*wasn't just nil coercion failure*/
 					goto error;
 				
-				if (!fl) /*must be nil coercion error*/
+				if (!lfl) /*must be nil coercion error*/
 					continue;
 				
 				if (!langipcpushparam (&valparam, valkey.data.ostypevalue, hv))
@@ -3327,7 +3330,8 @@
 
 
 boolean langipccomplexmessage (hdltreenode hparam1, tyvaluerecord *vreturned) {
-	
+#pragma unused(vreturned)
+
 	hdlhashtable htable;
 	tyipcaddress ipcaddress;
 	hdlverbrecord hverb;
@@ -3343,7 +3347,8 @@
 
 
 boolean langipctablemessage (hdltreenode hparam1, tyvaluerecord *vreturned) {
-	
+#pragma unused(vreturned)
+
 	/*
 	5.1.5 dmb: use tablesortedinversesearch for guest databases
 	*/
@@ -3381,7 +3386,8 @@
 
 
 static boolean langipcfasterror (bigstring bs, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	long n;
 	OSErr err;
 	
@@ -3985,7 +3991,8 @@
 #if !flruntime
 
 static pascal OSErr handleshowmenunode (const AppleEvent *event, AppleEvent *reply, long refcon) {
-	
+#pragma unused (reply, refcon)
+
 	/*
 	4.1b14 dmb: added outline parameter; can't count on outline data not changing
 	*/
@@ -4064,7 +4071,8 @@
 
 
 static pascal OSErr handleyield (const AppleEvent *event, AppleEvent *reply, long refcon) {
-	
+#pragma unused (event, reply, refcon)
+
 	processyield ();
 	
 	return (noErr);
@@ -4210,7 +4218,8 @@
 
 
 static pascal OSErr langipcfastgetobject (AppleEvent *event, AppleEvent *reply, long refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	7/3/92 DW: this one will be hot!
 	*/
@@ -4285,7 +4294,13 @@
 	} /*langipcfastgetobject*/
 
 
-static pascal OSErr langipcfastsetobject (AppleEvent *event, AppleEvent *reply, long refcon) {
+static pascal OSErr
+langipcfastsetobject (
+		AppleEvent	*event,
+		AppleEvent	*reply,
+		long		 refcon)
+{
+#pragma unused(refcon)
 	
 	/*
 	7/3/92 DW: this one will be hot!
@@ -4362,8 +4377,14 @@
 	} /*langipcfastsetobject*/
 
 
-static pascal OSErr langipchandlefastscript (AppleEvent *event, AppleEvent *reply, long refcon) {
-	
+static pascal OSErr
+langipchandlefastscript (
+		AppleEvent	*event,
+		AppleEvent	*reply,
+		long		 refcon)
+{
+#pragma unused(refcon)
+
 	/*
 	3.0.2b1 dmb: reverted to original, 2.0.1 implementation that doesn't rely
 	on the component manager being present.
@@ -4658,7 +4679,8 @@
 #else
 
 static boolean langipceventhook (EventRecord *ev, WindowPtr w) {
-	
+#pragma unused(w)
+
 	/*
 	7/3/91 dmb: under system 7, we fork off a new thread for every 
 	incoming IAC event we handle.  under system 6, handling IAC events 

Modified: Frontier/trunk/Common/source/mac.c
===================================================================
--- Frontier/trunk/Common/source/mac.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/mac.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -278,25 +278,30 @@
 
     if ((status != noErr) && (status != 2))           
     {
-        formatStr =  CFCopyLocalizedString (errorFormatString, NULL);	
-	if (formatStr != NULL)
-        {
-            printErrorMsg = CFStringCreateWithFormat(        
-                       NULL, NULL, 
-                       formatStr, status);
-            if (printErrorMsg != NULL)
-            {
-                if (CFStringGetPascalString (printErrorMsg,    
-                              stringBuf, sizeof(stringBuf), 
-                              GetApplicationTextEncoding())) {
-                              
-                    StandardAlert(kAlertStopAlert, stringBuf, NULL, NULL, &alertItemHit);
-                }
-                CFRelease (printErrorMsg);                     
-            }
-           CFRelease (formatStr);                             
-        }
-    }
+		formatStr =  CFCopyLocalizedString (errorFormatString, NULL);	
+		if (formatStr != NULL)
+		{
+			printErrorMsg = CFStringCreateWithFormat(
+													 NULL,
+													 NULL,
+													 formatStr,
+													 status);
+			if (printErrorMsg != NULL)
+			{
+				if (CFStringGetPascalString (
+											 printErrorMsg,
+											 stringBuf,
+											 sizeof(stringBuf),
+											 GetApplicationTextEncoding()))
+				{
+					StandardAlert(kAlertStopAlert, stringBuf, NULL, NULL, &alertItemHit);
+				}
+				CFRelease (printErrorMsg);                     
+			}
+			CFRelease (formatStr);                             
+		}
+	}
 }
 	
-#endif
\ No newline at end of file
+#endif
+

Modified: Frontier/trunk/Common/source/menu.c
===================================================================
--- Frontier/trunk/Common/source/menu.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/menu.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -550,13 +550,14 @@
 
 
 boolean inserthierarchicmenu (hdlmenu hmenu, short idmenu) {
-	
-	#ifdef MACVERSION
-		InsertMenu (hmenu, insertsubmenu);
+#ifdef MACVERSION
+#	pragma unused (idmenu)
 
-		return (true);
-	#endif
+	InsertMenu (hmenu, insertsubmenu);
 
+	return (true);
+#endif
+
 	#ifdef WIN95VERSION
 		HMENU menubar = GetMenu (shellframewindow);
 		MENUITEMINFO info;
@@ -714,7 +715,9 @@
 
 
 void setmenutitleenable (hdlmenu hmenu, short idmenu, boolean fl) {
-	
+#if MACVERSION
+#	pragma unused (idmenu)
+#endif
 	/*
 	enable or disable a menu or a menu item.  if fl is true we enable the item,
 	if false we disable it.
@@ -725,28 +728,29 @@
 	*/
 	//Code change by Timothy Paustian Friday, June 9, 2000 9:44:07 PM
 	//Changed to Modern calls for Enabling and Disabling menu items
-	#ifdef MACVERSION
-		if (fl)
-			#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
-			EnableMenuItem (hmenu, 0);
-			#else
-			EnableItem (hmenu, 0);
-			#endif
-		else
-			#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
-			DisableMenuItem (hmenu, 0);
-			#else
-			DisableItem (hmenu, 0);
-			#endif
-	#endif
+#ifdef MACVERSION
+	if (fl) {
+#	if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
+		EnableMenuItem (hmenu, 0);
+#	else
+		EnableItem (hmenu, 0);
+#	endif
+	} else {
+#	if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
+		DisableMenuItem (hmenu, 0);
+#	else
+		DisableItem (hmenu, 0);
+#	endif
+	}
+#endif
 
-	#ifdef WIN95VERSION
-		HMENU menubar = GetMenu (shellframewindow);
+#ifdef WIN95VERSION
+	HMENU menubar = GetMenu (shellframewindow);
 
-		assert (idmenu >= 0);
-		
+	assert (idmenu >= 0);
+
 		EnableMenuItem (menubar, idmenu, MF_BYCOMMAND | (fl? MF_ENABLED : MF_DISABLED));
-	#endif
+#endif
 	} /*setmenutitleenable*/
 	
 	
@@ -797,15 +801,20 @@
 	/*
 	*/
 	
-	#ifdef MACVERSION
-		#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
-		return IsMenuItemEnabled(hmenu, 0);
-		#else
-		//old code
-		return (((**hmenu).enableFlags & (0x01)) != 0);
-		#endif
-	#endif
+#ifdef MACVERSION
+#	pragma unused (idmenu)
+#	if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
 
+	return IsMenuItemEnabled(hmenu, 0);
+
+#	else
+
+	//old code
+	return (((**hmenu).enableFlags & (0x01)) != 0);
+
+#	endif
+#endif
+
 	#ifdef WIN95VERSION
 		MENUITEMINFO info;
 		HMENU menubar = GetMenu (shellframewindow);
@@ -1479,6 +1488,7 @@
 	*/
 	
 #ifdef MACVERSION
+#	pragma unused (idmenu)
 	bigstring bsspace;
 	
 	if (isseparatorstring (bs)) /*take disabled seperator as is*/
@@ -1529,6 +1539,7 @@
 boolean pushresourcemenuitems (hdlmenu hmenu, short idmenu, OSType restype) {
 
 #ifdef MACVERSION
+#	pragma unused (idmenu)
 	//Code change by Timothy Paustian Wednesday, June 28, 2000 4:27:19 PM
 	//You can't do this in carbon.
 	//#if !TARGET_API_MAC_CARBON	

Modified: Frontier/trunk/Common/source/shellcallbacks.c
===================================================================
--- Frontier/trunk/Common/source/shellcallbacks.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/shellcallbacks.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -251,7 +251,8 @@
 
 
 static boolean shelldefaultmsgroutine (bigstring bs, boolean flbackgroundmsg) {
-	
+#pragma unused (flbackgroundmsg)
+
 	shellsetwindowmessage (shellwindowinfo, bs);
 	
 	drawwindowmessage (shellwindow);
@@ -481,27 +482,27 @@
 	} /*shellloadbuttonlists*/
 	
 		
-boolean shellgetconfig (short resnum, tyconfigrecord *config) {
+boolean shellgetconfig (short resnum, tyconfigrecord *pconfig) {
 	
 	short ix = 0;
 	
 	if (!shellfindcallbacks (resnum, &ix))
 		return (false);
 		
-	*config = globalsarray [ix].config;
+	*pconfig = globalsarray [ix].config;
 	
 	return (true);
 	} /*shellgetconfig*/
 	
 	
-boolean shellsetconfig (short resnum, tyconfigrecord config) {
+boolean shellsetconfig (short resnum, tyconfigrecord pconfig) {
 	
 	short ix = 0;
 	
 	if (!shellfindcallbacks (resnum, &ix))
 		return (false);
 		
-	globalsarray [ix].config = config;
+	globalsarray [ix].config = pconfig;
 	
 	return (true);
 	} /*shellsetconfig*/

Modified: Frontier/trunk/Common/source/smallicon.c
===================================================================
--- Frontier/trunk/Common/source/smallicon.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/smallicon.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -40,7 +40,6 @@
 
 
 
-
 static hdlsmalliconbits hmiscbits;
 //static hdlsmalliconbits hleaderbits;
 
@@ -171,8 +170,8 @@
 		
 		r.bottom = r.bottom + 4;
 	
-		DrawThemePopupArrow (&r, kThemeArrowDown, kThemeArrow9pt, themestate, NULL, (UInt32) NULL);
-		
+		DrawThemePopupArrow (&r, kThemeArrowDown, kThemeArrow9pt, themestate, NULL, 0);
+
 		return (true);
 	
 	#else
@@ -372,5 +371,5 @@
 	
 	return (true);
 	} /*initsmallicons*/
-	
-	
+
+

Modified: Frontier/trunk/Common/source/sounds.c
===================================================================
--- Frontier/trunk/Common/source/sounds.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/sounds.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -91,7 +91,7 @@
 
 	SndChannelPtr channel;
 	SndCommand cmd;
-	long time;
+	long ltime;
 	float note;
 	OSErr err;
 	
@@ -107,16 +107,16 @@
 	cmd.param2 = 0;
 	err = SndDoCommand (channel, &cmd, false);
 	
-	time = duration * (2000/60);
+	ltime = duration * (2000/60);
 	
-	time = min (infinity, time);
+	ltime = min (infinity, ltime);
 	
 	note = (frequency / 129.0) / 69;
 	
 	note = 69 + 12.0 * (note - 1);
 	
 	cmd.cmd = freqDurationCmd;
-	cmd.param1 = time;
+	cmd.param1 = ltime;
 	cmd.param2 = note;
 	err = SndDoCommand (channel, &cmd, false);
 	
@@ -142,10 +142,10 @@
 #ifdef WIN95VERSION
 	//NOTE:  Beep does not take amplitude.  
 	//       Also the parameters are ignored on Windows 95/98
-	long time;
+	long ltime;
 
-	time = (duration * 1000L) / 60L;
-	return (Beep (frequency, time));
+	ltime = (duration * 1000L) / 60L;
+	return (Beep (frequency, ltime));
 //	return (false); // *** WIN95 not implemented
 #endif
 	} /*dosound*/

Modified: Frontier/trunk/Common/source/tablepopup.c
===================================================================
--- Frontier/trunk/Common/source/tablepopup.c	2006-04-05 22:19:55 UTC (rev 1200)
+++ Frontier/trunk/Common/source/tablepopup.c	2006-04-05 22:31:38 UTC (rev 1201)
@@ -425,7 +425,8 @@
 
 
 static boolean tablekindpopupselect (hdlmenu hmenu, short itemselected) {
-	
+#pragma unused (hmenu)
+
 	tyvaluetype valuetype;
 	
 	if (!tablemapmenutovaluetype (itemselected, &valuetype)) 
@@ -436,7 +437,8 @@
 
 	
 boolean tablekindpopuphit (Point pt) {
-	
+#pragma unused (pt)
+
 	/*
 	5/6/93 dmb: added support for new types
 	*/
@@ -506,7 +508,8 @@
 
 
 static boolean tablesortpopupselect (hdlmenu hmenu, short itemselected) {
-	
+#pragma unused (hmenu)
+
 	hdlhashtable ht;
 	bigstring bs;
 	
@@ -539,6 +542,7 @@
 
 	
 boolean tablesortpopuphit (Point pt) {
+#pragma unused (pt)
 
 	register hdltableformats hf = tableformatsdata;
 	Rect r;
@@ -902,7 +906,8 @@
 
 
 static boolean tabletitlepopupselect (hdlmenu hmenu, short itemselected) {
-	
+#pragma unused (hmenu)
+
 	/*
 	note: the last item, "root", is really just a dummy which has no matching element 
 	in the array.  the first item in the array will actually go to the parent table, 


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

SF.net SVN: frontierkernel: [1200] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1200
Author:   karstenw
Date:     2006-04-05 15:19:55 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1200&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/claycallbacks.c
    Frontier/trunk/Common/source/dbverbs.c
    Frontier/trunk/Common/source/menubar.c
    Frontier/trunk/Common/source/shellbuttons.c
Modified: Frontier/trunk/Common/source/claycallbacks.c
===================================================================
--- Frontier/trunk/Common/source/claycallbacks.c	2006-04-05 22:17:27 UTC (rev 1199)
+++ Frontier/trunk/Common/source/claycallbacks.c	2006-04-05 22:19:55 UTC (rev 1200)
@@ -594,7 +594,8 @@
 
 
 static boolean clayfolderloopvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
-	
+#pragma unused(hnode, val)
+
 	/*
 	5.0a3 dmb: set flmayaffectdisplay for the parent table
 
@@ -618,7 +619,8 @@
 
 
 boolean clayfolderloop (const tybrowserspec *pfs, boolean flreverse, tyclayfileloopcallback filecallback, long refcon) {
-	
+#pragma unused(flreverse)
+
 	/*
 	5.0.2b21 dmb: set hdatafield according to pfs; no more databasedata refs
 	*/

Modified: Frontier/trunk/Common/source/dbverbs.c
===================================================================
--- Frontier/trunk/Common/source/dbverbs.c	2006-04-05 22:17:27 UTC (rev 1199)
+++ Frontier/trunk/Common/source/dbverbs.c	2006-04-05 22:19:55 UTC (rev 1200)
@@ -524,6 +524,7 @@
 
 
 boolean dbcloseallfiles (long refcon) {
+#pragma unused (refcon)
 
 	return (true);
 	} /*dbcloseallfiles*/
@@ -930,7 +931,8 @@
 
 
 static boolean dbfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
-	
+#pragma unused (bserror)
+
 	/*
 	4.1b4 dmb: new verb set based on odbEngine
 	

Modified: Frontier/trunk/Common/source/menubar.c
===================================================================
--- Frontier/trunk/Common/source/menubar.c	2006-04-05 22:17:27 UTC (rev 1199)
+++ Frontier/trunk/Common/source/menubar.c	2006-04-05 22:19:55 UTC (rev 1200)
@@ -504,7 +504,7 @@
 	//		continue;
 
 		if (item.idmenu != -1)
-		
+		{
 			if (flactivate) {
 				
 				if (item.flhierarchic)
@@ -513,7 +513,8 @@
 			else
 				meremovemenu (&item);
 		}
-	
+	}
+
 	(**hs).flactive = flactivate;
 	
 	medirtymenubar ();
@@ -1951,7 +1952,8 @@
 
 
 static unsigned char menullchar (hdlheadrecord hn) {
-	
+#pragma unused (hn)
+
 	return (chnul);
 	} /*menullchar*/
 

Modified: Frontier/trunk/Common/source/shellbuttons.c
===================================================================
--- Frontier/trunk/Common/source/shellbuttons.c	2006-04-05 22:17:27 UTC (rev 1199)
+++ Frontier/trunk/Common/source/shellbuttons.c	2006-04-05 22:19:55 UTC (rev 1200)
@@ -372,8 +372,16 @@
 		} tybuttoninfo, *ptrbuttoninfo, **hdlbuttoninfo;
 
 
-	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
-		UInt32 userData, SInt16 depth, Boolean isColorDev) {
+static void
+MyThemeButtonDrawCallback (
+		const Rect					*bounds,
+		ThemeButtonKind				 kind,
+		const ThemeButtonDrawInfo	*info,
+		UInt32						 userData,
+		SInt16						 depth,
+		Boolean						 isColorDev)
+{
+#pragma unused (kind, info, depth, isColorDev)
 		
 		/*
 		7.0b48 PBS: draw the label for a popup menu.
@@ -416,9 +424,9 @@
 		tybuttoninfo buttoninfo;
 		boolean flenabled = buttonenabled (ix);
 		Handle h;
-		
+
 		copystring (bs, buttoninfo.bslabel);
-		
+
 		buttoninfo.flenabled = flenabled;
 		
 		drawupp = NewThemeButtonDrawUPP (MyThemeButtonDrawCallback);
@@ -723,6 +731,7 @@
 
 
 void shellbuttonadjustcursor (Point pt) {
+#pragma unused (pt)
 
 	setcursortype (cursorisarrow); /*no special button cursor, 4/23/90*/
 	} /*shellbuttonadjustcursor*/


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

SF.net SVN: frontierkernel: [1199] Frontier/trunk/Common/source

[<kar...@us...>]

Revision: 1199
Author:   karstenw
Date:     2006-04-05 15:17:27 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1199&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/source/cancoon.c
    Frontier/trunk/Common/source/db.c
    Frontier/trunk/Common/source/langerrorwindow.c
    Frontier/trunk/Common/source/langmodeless.c
    Frontier/trunk/Common/source/opinit.c
    Frontier/trunk/Common/source/opops.c
    Frontier/trunk/Common/source/osacomponent.c
    Frontier/trunk/Common/source/services.c
    Frontier/trunk/Common/source/shellwindowmenu.c
Modified: Frontier/trunk/Common/source/cancoon.c
===================================================================
--- Frontier/trunk/Common/source/cancoon.c	2006-04-05 22:03:52 UTC (rev 1198)
+++ Frontier/trunk/Common/source/cancoon.c	2006-04-05 22:17:27 UTC (rev 1199)
@@ -234,7 +234,7 @@
 	5.1.5b10 dmb: use ccfindrootwindow to avoid guest databases
 	*/
 	
-	tyconfigrecord config;	
+	tyconfigrecord lconfig;	// 2006-04-03 - kw --- renamed
 	hdlwindowinfo hinfo;
 	
 //	if (shellpushfrontrootglobals ())
@@ -253,9 +253,9 @@
 		return (true);
 		}
 	
-	if (shellgetconfig (ccwindowconfigs [ixwindowinfo], &config)) {
+	if (shellgetconfig (ccwindowconfigs [ixwindowinfo], &lconfig)) {
 	
-		*rwindow = config.defaultwindowrect;
+		*rwindow = lconfig.defaultwindowrect;
 		
 		return (true);
 		}
@@ -270,20 +270,20 @@
 	
 	register hdlcancoonrecord hc = hcancoon;		
 	tycancoonwindowinfo windowinfo;
-	tyconfigrecord config;	
+	tyconfigrecord lconfig;	// 2006-04-03 - kw --- renamed
 	Rect r;
 	
 	clearbytes (&windowinfo, sizeof (windowinfo));
 	
-	if (shellgetconfig (ccwindowconfigs [ixwindowinfo], &config)) {
+	if (shellgetconfig (ccwindowconfigs [ixwindowinfo], &lconfig)) {
 		
-		recttodiskrect (&config.defaultwindowrect, &windowinfo.windowrect);
+		recttodiskrect (&lconfig.defaultwindowrect, &windowinfo.windowrect);
 		
-		diskgetfontname (config.defaultfont, windowinfo.fontname);
+		diskgetfontname (lconfig.defaultfont, windowinfo.fontname);
 		
-		windowinfo.fontnum = config.defaultfont;
+		windowinfo.fontnum = lconfig.defaultfont;
 	
-		windowinfo.fontsize = config.defaultsize;
+		windowinfo.fontsize = lconfig.defaultsize;
 		}
 	else {
 		setrect (&r, -1, -1, -1, -1);
@@ -753,7 +753,8 @@
 #endif
 
 boolean ccloadfile (hdlfilenum fnum, short rnum) {
-	
+#pragma unused(rnum)
+
 	/*
 	9/15/92 dmb: removed support for version1 format; it never shipped
   
@@ -853,7 +854,8 @@
 
 
 boolean ccloadspecialfile (ptrfilespec fspec, OSType filetype) {
-	
+#pragma unused (filetype)
+
 	/*
 	7/28/92 dmb: use new finder2frontscript to set the Frontier.findertofront 
 	global, instead of having Frontier.finder2click always set it to true. also, 
@@ -914,7 +916,8 @@
 
 
 boolean ccsavespecialfile (ptrfilespec fs, hdlfilenum fnum, short rnum, boolean flsaveas, boolean flrunnable) {
-	
+#pragma unused(flsaveas, rnum)
+
 	/*
 	6.17.97 dmb: this is called by opverbs, wpverbs, etc. to save a disk file.
 	we leave it to the system.misc.saveWindow script to package the data, 
@@ -1104,7 +1107,8 @@
 
 
 boolean ccsavefile (ptrfilespec fs, hdlfilenum fnum, short rnum, boolean flsaveas, boolean flrunnable) {
-	
+#pragma unused(fs, rnum, flrunnable)
+
 	/*
 	5.0b18 dmb: last-minute fix. we crash when saving while publishing a table.
 	the problem is that we toss stuff out during a save, and it would be nearly 
@@ -1521,7 +1525,10 @@
 
 
 boolean ccfnumchanged (hdlfilenum newfnum) {
-	
+#ifdef version5orgreater
+#	pragma unused (newfnum)
+#endif
+
 	/*
 	part of the implementation of Save As
 

Modified: Frontier/trunk/Common/source/db.c
===================================================================
--- Frontier/trunk/Common/source/db.c	2006-04-05 22:03:52 UTC (rev 1198)
+++ Frontier/trunk/Common/source/db.c	2006-04-05 22:17:27 UTC (rev 1199)
@@ -2346,7 +2346,8 @@
 #else
 	
 boolean dbpushreleasestack (dbaddress adr, long valtype) {
-	
+#pragma unused(valtype)
+
 	/*
 	the chunk of db space pointed to by adr is being logically released, but
 	the caller is saying that he doesn't want to make the effects permanent

Modified: Frontier/trunk/Common/source/langerrorwindow.c
===================================================================
--- Frontier/trunk/Common/source/langerrorwindow.c	2006-04-05 22:03:52 UTC (rev 1198)
+++ Frontier/trunk/Common/source/langerrorwindow.c	2006-04-05 22:17:27 UTC (rev 1199)
@@ -375,7 +375,8 @@
 
 
 static boolean langerrorset (bigstring bserror, bigstring bslocation) {
-	
+#pragma unused (bslocation)
+
 	/*
 	2.1b2 dmb: if the langerror window isn't already there, don't try to 
 	create it now -- the heap or stack may be dangerously low.  instead, 
@@ -499,7 +500,8 @@
 #ifdef flnewfeatures	// flstacktrace
 
 static boolean langerrorpopupselect (hdlmenu hmenu, short itemselected) {
-	
+#pragma unused (hmenu)
+
 	register hdlerrorstack hs = (**langerrordata).herrorstack;
 	short ix;
 	tyerrorrecord *pe;
@@ -582,7 +584,8 @@
 
 
 static boolean langerrormousedown (Point pt, tyclickflags flags) {
-	
+#pragma unused (flags)
+
 	/*
 	7/16/90 DW: wired off the consumption of the error callback, if you want
 	it back on, just switch on the code that's commented out, and the script
@@ -680,7 +683,8 @@
 
 
 boolean langerrordialog (bigstring bsmsg, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	unsigned short savedlines, savedchars; 
 	
 	if (isemptystring (bsmsg)) /*don't post empty messages -- scipterrror ("") relies on this*/

Modified: Frontier/trunk/Common/source/langmodeless.c
===================================================================
--- Frontier/trunk/Common/source/langmodeless.c	2006-04-05 22:03:52 UTC (rev 1198)
+++ Frontier/trunk/Common/source/langmodeless.c	2006-04-05 22:17:27 UTC (rev 1199)
@@ -130,7 +130,8 @@
 
 
 static boolean langdialogmousedown (Point pt, tyclickflags flags){
-	
+#pragma unused (pt, flags)
+
 	register hdldialogrecord hd = langdialogdata;
 	short item;
 	
@@ -262,7 +263,8 @@
 
 
 static boolean langdialogadjustcursor (Point pt){
-		
+#pragma unused (pt)
+
 	setcursortype (cursorisarrow);
 	
 	return (true);
@@ -539,7 +541,7 @@
 	register hdldialogrecord hd;
 	Rect rzoom, rwindow;
 	hdlwindowinfo hparent;
-	tyconfigrecord config;
+	tyconfigrecord lconfig;
 	DialogTHndl hdlog;
 	bigstring bstitle;
 	
@@ -572,11 +574,11 @@
 		rwindow = (**hdlog).boundsRect;
 		}
 	
-	shellgetconfig (idlangdialogconfig, &config);
+	shellgetconfig (idlangdialogconfig, &lconfig);
 	
-	config.templateresnum = dialogid;
+	lconfig.templateresnum = dialogid;
 	
-	shellsetconfig (idlangdialogconfig, config);
+	shellsetconfig (idlangdialogconfig, lconfig);
 	
 	if (!newchildwindow (idlangdialogconfig, hparent, &rwindow, &rzoom, bstitle, &langdialogwindow)) {
 		

Modified: Frontier/trunk/Common/source/opinit.c
===================================================================
--- Frontier/trunk/Common/source/opinit.c	2006-04-05 22:03:52 UTC (rev 1198)
+++ Frontier/trunk/Common/source/opinit.c	2006-04-05 22:17:27 UTC (rev 1199)
@@ -104,7 +104,8 @@
 
 
 boolean opdefaultreleaserefconroutine (hdlheadrecord hnode, boolean fldisk) {
-	
+#pragma unused (hnode, fldisk)
+
 	/*
 	default callback for releasing the refcon, does nothing.  note that the 
 	callback is responsible for releasing the data linked into the refcon
@@ -116,7 +117,8 @@
 	
 	
 static boolean opdefaultpushstyle (hdlheadrecord hnode) {
-	
+#pragma unused (hnode)
+
 	oppushstyle (outlinedata);
 	
 	return (true);
@@ -153,7 +155,8 @@
 
 
 static boolean opdefaulticon2click (hdlheadrecord hnode) {
-	
+#pragma unused (hnode)
+
 	return (false); /*don't consume the double-click*/
 	} /*opdefaulticon2click*/
 

Modified: Frontier/trunk/Common/source/opops.c
===================================================================
--- Frontier/trunk/Common/source/opops.c	2006-04-05 22:03:52 UTC (rev 1198)
+++ Frontier/trunk/Common/source/opops.c	2006-04-05 22:17:27 UTC (rev 1199)
@@ -1231,7 +1231,8 @@
 
 
 static boolean opreleaserefconvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	Handle hrefcon = (Handle) (**hnode).hrefcon;
 	
 	if (hrefcon != nil) { /*node has a refcon handle attached*/
@@ -1339,7 +1340,7 @@
 	
 	#if !fljustpacking
 	
-		tyconfigrecord config;
+		tyconfigrecord lconfig;
 	#endif
 	
 	register hdloutlinerecord ho;
@@ -1409,15 +1410,15 @@
 	
 	#if !fljustpacking
 	
-		shellgetconfig (idoutlineconfig, &config);
+		shellgetconfig (idoutlineconfig, &lconfig);
 	
-		(**ho).windowrect = config.defaultwindowrect; 
+		(**ho).windowrect = lconfig.defaultwindowrect; 
 		
-		(**ho).fontnum = config.defaultfont;
+		(**ho).fontnum = lconfig.defaultfont;
 		
-		(**ho).fontsize = config.defaultsize;
+		(**ho).fontsize = lconfig.defaultsize;
 		
-		(**ho).fontstyle = config.defaultstyle;
+		(**ho).fontstyle = lconfig.defaultstyle;
 	
 	#endif
 	
@@ -1572,7 +1573,8 @@
 	
 
 static boolean opcountvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (hnode)
+
 	(*(long*)refcon)++; /*the simplest visit routine*/
 	
 	return (true);
@@ -1633,7 +1635,8 @@
 
 
 static boolean opresetlevelsvisit (hdlheadrecord hnode, ptrvoid refcon) {
-	
+#pragma unused (refcon)
+
 	register hdlheadrecord h = hnode;
 	
 	(**h).headlevel = (**(**h).headlinkleft).headlevel + 1;

Modified: Frontier/trunk/Common/source/osacomponent.c
===================================================================
--- Frontier/trunk/Common/source/osacomponent.c	2006-04-05 22:03:52 UTC (rev 1198)
+++ Frontier/trunk/Common/source/osacomponent.c	2006-04-05 22:17:27 UTC (rev 1199)
@@ -910,7 +910,7 @@
 
 
 pascal OSErr osadefaultactiveproc (long refcon) {
-	
+#pragma unused (refcon)
 	/*
 	see if user pressed cmd-period.
 	
@@ -934,18 +934,35 @@
 	} /*osadefaultactiveproc*/
 
 
-static pascal OSErr osadefaultcreate (AEEventClass class, AEEventID id,
-                    const AEAddressDesc *target, short returnID,
-                    long transactionID, AppleEvent *result, long refcon) {
-	
+static pascal OSErr
+osadefaultcreate (
+		AEEventClass		 class,
+		AEEventID			 id,
+		const AEAddressDesc	*target,
+		short				 returnID,
+		long				 transactionID,
+		AppleEvent			*result,
+		long				 refcon)
+{
+#pragma unused (refcon)
+
 	return (AECreateAppleEvent(class, id, target, returnID, transactionID, result));
 	} /*osadefaultcreate*/
 
 
-static pascal OSErr osadefaultsend (const AppleEvent *event, AppleEvent *reply,
-		AESendMode sendmode, AESendPriority priority, long timeout,
-        AEIdleUPP idleproc, AEFilterUPP filterproc, long refcon) {
-	
+static pascal OSErr
+osadefaultsend (
+		const AppleEvent	*event,
+		AppleEvent			*reply,
+		AESendMode			 sendmode,
+		AESendPriority		 priority,
+		long				 timeout,
+		AEIdleUPP			 idleproc,
+		AEFilterUPP			 filterproc,
+		long				 refcon)
+{
+#pragma unused (refcon)
+
 	return (AESend (event, reply, sendmode, priority, timeout, idleproc, filterproc));
 	} /*osadefaultsend*/
 
@@ -1174,8 +1191,12 @@
 
 
 static boolean osaerrormessage (bigstring bs, ptrvoid refcon) {
-	
-	AEDesc list, rec, desc;
+#pragma unused (refcon)
+
+	AEDesc
+		list,
+		rec,
+		desc;
 	long n;
 	OSErr err;
 	
@@ -1243,14 +1264,15 @@
 	} /*osaerrormessage*/
 
 
-static pascal OSErr coerceTEXTtoSTXT (
-		DescType fromtype,
-		Ptr pdata,
-		long size,
-		DescType totype,
-		long refcon,
-		AEDesc *result) {
-	
+static pascal OSErr
+coerceTEXTtoSTXT (
+		DescType	 fromtype,
+		Ptr			 pdata,
+		long		 size,
+		DescType	 totype,
+		long		 refcon,
+		AEDesc		*result) {
+#pragma unused(fromtype, refcon)
 	/*
 	2.1b2 dmb: don't use clearbytes so we don't have to set up a5
 	*/
@@ -1260,7 +1282,7 @@
 	AEDesc list;
 	register ScrpSTElement *pstyle;
 	
-	#ifdef fldegug
+	#ifdef fldebug	// 2006-04-04 - kw --- this was fldegug
 	
 	if (totype != typeStyledText)
 		DebugStr ("\punexpected coercion");
@@ -1308,12 +1330,14 @@
 	} /*coerceTEXTtoSTXT*/
 
 
-static pascal OSErr coerceTypetoObj (
-		AEDesc *desc,
-		DescType totype,
-		long refcon,
-		AEDesc *result) {
-	
+static pascal OSErr
+coerceTypetoObj (
+		AEDesc		*desc,
+		DescType	 totype,
+		long		 refcon,
+		AEDesc		*result) {
+#pragma unused(totype, refcon)
+
 	/*
 	2.1b1 dmb: if Frontier passes a string4 identifier where an object specifier 
 	is required, this coercion handler will take care of it
@@ -1599,6 +1623,7 @@
 
 
 void osaremovepatch (hdlcomponentglobals hglobals, GNEUPP origproc) {
+#pragma unused (origproc)
 
 	register hdlcomponentglobals hcg = hglobals;
 	
@@ -1617,12 +1642,14 @@
 #else
 
 GNEUPP osainstallpatch (hdlcomponentglobals hglobals) {
-	
+#pragma unused (hglobals)
+
 	return (nil);
 	} /*osainstallpatch*/
 
 
 void osaremovepatch (hdlcomponentglobals hglobals, GNEUPP origproc) {
+#pragma unused (hglobals, origproc)
 
 	} /*osaremovepatch*/
 
@@ -1665,7 +1692,8 @@
 
 
 THz osasethomezone (hdlcomponentglobals hglobals) {
-	
+#pragma unused (hglobals)
+
 	/*
 	2.1b13 dmb: added this to balance the setclientzone call, and to 
 	allow us to keep the homezone global private.
@@ -1806,9 +1834,17 @@
 	} /*osacreateevent*/
 
 
-static pascal OSErr osasendevent (const AppleEvent *event, AppleEvent *reply,
-		AESendMode mode, AESendPriority priority, long timeout,
-        AEIdleUPP idleproc, AEFilterUPP filterproc ) {
+static pascal OSErr
+osasendevent (
+		const AppleEvent	*event,
+		AppleEvent			*reply,
+		AESendMode			 mode,
+		AESendPriority		 priority,
+		long				 timeout,
+		AEIdleUPP			 idleproc,
+		AEFilterUPP			 filterproc )
+{
+#pragma unused (idleproc, filterproc)
 	
 	/*
 	2/16/93 dmb: in case the event is to be direct dispatched correctly, we need 
@@ -2300,7 +2336,8 @@
 
 
 static boolean setstorageval (hdlcomponentglobals hglobals, tyvaluerecord *val, OSAID id) {
-	
+#pragma unused (hglobals)
+
 	/*
 	add val to the id table using the indicated id. on error, dispose of the value
 	*/
@@ -2331,7 +2368,8 @@
 
 
 static boolean getstorageval (hdlcomponentglobals hglobals, OSAID id, tyvaluerecord *val, hdlhashnode * hnode) {
-	
+#pragma unused (hglobals)
+
 	bigstring bs;
 	
 	numbertostring (id, bs);
@@ -2348,7 +2386,8 @@
 
 
 static boolean deletestorageval (hdlcomponentglobals hglobals, OSAID id) {
-	
+#pragma unused (hglobals)
+
 	bigstring bs;
 	
 	numbertostring (id, bs);
@@ -2463,11 +2502,14 @@
 	} /*osanewvalue*/
 
 
-static pascal OSAError osaLoad (
-			hdlcomponentglobals	hglobals,
-			const AEDesc*		scriptData,
-			long				modeFlags,
-			OSAID*				resultingCompiledScriptID) {
+static pascal OSAError
+osaLoad (
+		hdlcomponentglobals	 hglobals,
+		const AEDesc		*scriptData,
+		long				 modeFlags,
+		OSAID				*resultingCompiledScriptID)
+{
+#pragma unused (modeFlags)
 	
 	/*
 	2.1b1 dmb: don't insist that the loaded value is a context (i.e. a table)
@@ -2828,10 +2870,13 @@
 	} /*osaSetResumeDispatchProc*/
 
 
-static pascal OSAError osaGetResumeDispatchProc (
-				hdlcomponentglobals	hglobals,
-				AEEventHandlerUPP*	resumeDispatchProc,
-				long*				refCon) {
+static pascal OSAError
+osaGetResumeDispatchProc (
+		hdlcomponentglobals	 hglobals,
+		AEEventHandlerUPP	*resumeDispatchProc,
+		long				*refCon)
+{
+#pragma unused (hglobals)
 	/*
 	we're never invoking the resumedispatch proc, so be honest and 
 	return these constants
@@ -3085,11 +3130,14 @@
 	} /*osaGetSource*/
 
 
-static pascal OSAError osaCoerceFromDesc (
-			hdlcomponentglobals	hglobals,
-			const AEDesc*		scriptData,
-			long				modeFlags,
-			OSAID*				resultingScriptID) {
+static pascal OSAError
+osaCoerceFromDesc (
+		hdlcomponentglobals	 hglobals,
+		const AEDesc		*scriptData,
+		long				 modeFlags,
+		OSAID				*resultingScriptID)
+{
+#pragma unused (modeFlags)
 	
 	/*
 	3.0a dmb: fixed leak when val is an externalvaluetype.
@@ -3141,12 +3189,15 @@
 	} /*osaCoerceFromDesc*/
 
 
-static pascal OSAError osaCoerceToDesc (
-			hdlcomponentglobals	hglobals,
-			OSAID				scriptID,
-			DescType			desiredType,
-			long				modeFlags,
-			AEDesc*				result) {
+static pascal OSAError
+osaCoerceToDesc (
+		hdlcomponentglobals	 hglobals,
+		OSAID				 scriptID,
+		DescType			 desiredType,
+		long				 modeFlags,
+		AEDesc				*result)
+{
+#pragma unused (modeFlags)
 	
 	tyvaluerecord val;
 	hdlhashnode hnode;
@@ -3190,12 +3241,15 @@
 	} /*getrecordingstring*/
 
 
-static pascal OSErr coerceInsltoTEXT (
-		const AEDesc *desc,
-		DescType totype,
-		long refcon,
-		AEDesc *result) {
-	
+static pascal OSErr
+coerceInsltoTEXT (
+		const AEDesc	*desc,
+		DescType		 totype,
+		long			 refcon,
+		AEDesc			*result)
+{
+#pragma unused(totype, refcon)
+
 	/*
 	2.1b2 dmb: this is installed as a typeInsertionLoc -> typeObjectSpecifier 
 	coercer, but it's actually generating source text for the recorder.  it's 
@@ -3222,7 +3276,7 @@
 		long curA5 = SetUpAppA5 ();
 	#endif
 	
-	#ifdef fldegug
+	#ifdef fldebug // 2006-04-04 - kw --- this was fldegug
 	
 	if ((*desc).descriptorType != typeInsertionLoc)
 		DebugStr ("\punexpected coercion");
@@ -3325,7 +3379,12 @@
 #endif
 
 
-static pascal OSErr sendrecordingevent (hdlcomponentglobals	hglobals, AEEventID id) {
+static pascal OSErr
+sendrecordingevent (
+		hdlcomponentglobals		 hglobals,
+		AEEventID				 id)
+{
+#pragma unused (hglobals)
 	
 	/*
 	2.1b5 dmb: don't use sendproc for these events; they're not part of 
@@ -3553,11 +3612,17 @@
 	pushstring (bsval, bsevent);
 	
 	return (noErr);
-	} /*pusheventparameter*/
+} /*pusheventparameter*/
 
 
-static pascal OSErr handlerecordableevent (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) {
-	
+static pascal OSErr
+handlerecordableevent (
+		const AppleEvent	*event,
+		AppleEvent			*reply,
+		SInt32				 refcon)
+{
+#pragma unused (reply)
+
 	/*
 	map the event to a line of source code, and send the text in a Recorded Text event
 	
@@ -4010,10 +4075,13 @@
 	} /*osaStopRecording*/
 
 
-static pascal OSAError osaScriptingComponentName (
-			hdlcomponentglobals	hglobals,
-			AEDesc*				resultingScriptingComponentName) {
-	
+static pascal OSAError
+osaScriptingComponentName (
+		hdlcomponentglobals	 hglobals,
+		AEDesc				*resultingScriptingComponentName)
+{
+#pragma unused (hglobals)
+
 	bigstring bs;
 	
 	getstringlist (componentlistnumber, usertalkstring, bs);
@@ -4061,12 +4129,15 @@
 	} /*osaExecute*/
 
 
-static pascal OSAError osaDisplay (
-			hdlcomponentglobals	hglobals,
-			OSAID				scriptValueID,
-			DescType			desiredType,
-			long				modeFlags,
-			AEDesc*				resultingText) {
+static pascal OSAError
+osaDisplay (
+		hdlcomponentglobals	 hglobals,
+		OSAID				 scriptValueID,
+		DescType			 desiredType,
+		long				 modeFlags,
+		AEDesc				*resultingText)
+{
+#pragma unused (desiredType, modeFlags)
 	
 	/*
 	****should handle desiredType other than typechar
@@ -4223,11 +4294,14 @@
 	} /*osaDoScript*/
 
 
-static pascal OSAError osaMakeContext (
-			hdlcomponentglobals	hglobals,
-			const AEDesc*		contextName,
-			OSAID				parentContext,
-			OSAID*				resultingContextID) {
+static pascal OSAError
+osaMakeContext (
+		hdlcomponentglobals	 hglobals,
+		const AEDesc		*contextName,
+		OSAID				 parentContext,
+		OSAID				*resultingContextID)
+{
+#pragma unused (contextName, parentContext)
 	
 	tyvaluerecord vcontext;
 	
@@ -4479,16 +4553,17 @@
 
 static pascal OSAError osaDebug (
 			hdlcomponentglobals	hglobals,
-			OSType				selector,
-			const AEDesc*		selectorData,
-			DescType			desiredType,
-			AEDesc*				resultingDebugInfoOrDataToSet) {
-	
+		OSType				 selector,
+		const AEDesc		*selectorData,
+		DescType			 desiredType,
+		AEDesc				*resultingDebugInfoOrDataToSet) {
+#pragma unused (hglobals, desiredType)
+
 	OSAError err = noErr;
 	hdlhashnode hnode;
-	
+
 	switch (selector) {
-		
+
 		case kOSADebugRange: {
 			AEDesc rec;
 			
@@ -4572,7 +4647,8 @@
 
 
 static pascal ComponentResult cmpclose (Handle storage, ComponentInstance self) {
-	
+#pragma unused(self)
+
 	register hdlcomponentglobals hglobals = (hdlcomponentglobals) storage;
 	
 	if (hglobals != nil) { /*defensive driving -- can be necessary during shutdown*/
@@ -5498,7 +5574,8 @@
 
 
 static pascal OSErr osaclientactive (long refcon) {
-	
+#pragma unused (refcon)
+
 	/*
 	while executing an osa script, we want to check for cmd-period, 
 	and allow other threads to run. this does part of the job.
@@ -5540,10 +5617,19 @@
 	} /*osaclientidleproc*/
 
 
-static pascal OSErr osaclientsend (const AppleEvent *event, AppleEvent *reply,
-		AESendMode sendmode, AESendPriority priority, long timeout,
-        AEIdleUPP idleproc, AEFilterUPP filterproc, long refcon) {
-			
+static pascal OSErr
+osaclientsend (
+		const AppleEvent	*event,
+		AppleEvent			*reply,
+		AESendMode			 sendmode,
+		AESendPriority		 priority,
+		long				 timeout,
+		AEIdleUPP			 idleproc,
+		AEFilterUPP			 filterproc,
+		long				 refcon)
+{
+#pragma unused (refcon, idleproc)
+
 	/*
 	with AppleScript, at least, the activeproc doesn't get called enough 
 	for decent thread cooperation. ideally, we'd send this event using 
@@ -5926,7 +6012,7 @@
 	
 	register hdlcomponentglobals hclient;
 	short ctclients;
-	short idstring;
+	short lidstring;
 	bigstring bs;
 	bigstring bsprompt;
 	typrocessid psn, lastpsn;
@@ -5969,15 +6055,15 @@
 	if (ctclients > 0) {
 		
 		if (ctclients == 1)
-			idstring = specificclientstring;
+			lidstring = specificclientstring;
 		
 		else {
 			numbertostring (ctclients, bs);
 			
-			idstring = multipleclientsstring;
+			lidstring = multipleclientsstring;
 			}
 		
-		if (getrecordingstring (idstring, bsprompt)) {
+		if (getrecordingstring (lidstring, bsprompt)) {
 			
 			parsedialogstring (bsprompt, bs, nil, nil, nil, bsprompt);
 			

Modified: Frontier/trunk/Common/source/services.c
===================================================================
--- Frontier/trunk/Common/source/services.c	2006-04-05 22:03:52 UTC (rev 1198)
+++ Frontier/trunk/Common/source/services.c	2006-04-05 22:17:27 UTC (rev 1199)
@@ -86,7 +86,8 @@
 
 
 pascal OSStatus serviceshandlercopy (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) {
-	
+#pragma unused(userData, nextHandler)
+
 	/*
 	Copy the current selection to the Services-specific scrap.
 	
@@ -138,7 +139,8 @@
 
 
 pascal OSStatus serviceshandlerpaste (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) {
-	
+#pragma unused(userData, nextHandler)
+
 	ScrapRef servicesscrap, currentscrap;
 	long bytecount;
 	OSErr err;
@@ -193,16 +195,29 @@
 
 
 pascal OSStatus serviceshandlergettypes (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) {
-	
+#pragma unused(userData, nextHandler)
+
 	CFMutableArrayRef copytypes, pastetypes;
 	short ix, count;
 	
-	GetEventParameter (inEvent, kEventParamServiceCopyTypes, typeCFMutableArrayRef, NULL,
-		sizeof (CFMutableArrayRef), NULL, &copytypes);
+	GetEventParameter (
+			inEvent,
+			kEventParamServiceCopyTypes,
+			typeCFMutableArrayRef,
+			NULL,
+			sizeof (CFMutableArrayRef),
+			NULL,
+			&copytypes);
 
-	GetEventParameter (inEvent, kEventParamServicePasteTypes, typeCFMutableArrayRef, NULL,
-		sizeof (CFMutableArrayRef), NULL, &pastetypes);
-		
+	GetEventParameter (
+			inEvent,
+			kEventParamServicePasteTypes,
+			typeCFMutableArrayRef,
+			NULL,
+			sizeof (CFMutableArrayRef),
+			NULL,
+			&pastetypes);
+
 	count = sizeof (servicesdatatypes) / sizeof (OSType);
 
 	/*Place our data types in the copytypes and pastetypes arrays. This code is generalized

Modified: Frontier/trunk/Common/source/shellwindowmenu.c
===================================================================
--- Frontier/trunk/Common/source/shellwindowmenu.c	2006-04-05 22:03:52 UTC (rev 1198)
+++ Frontier/trunk/Common/source/shellwindowmenu.c	2006-04-05 22:17:27 UTC (rev 1199)
@@ -56,7 +56,8 @@
 
 
 static boolean pushwindowmenuvisit (WindowPtr w, ptrvoid ptr) {
-	
+#pragma unused (ptr)
+
 	/*
 	3/8/91 dmb: mark the current root item with an asterix, if not checked
 	


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

SF.net SVN: frontierkernel: [1198] Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source

[<kar...@us...>]

Revision: 1198
Author:   karstenw
Date:     2006-04-05 15:03:52 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1198&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacapps.c
    Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacasynch.c
    Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacdouble.c
    Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacnetwork.c
    Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacops.c
    Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacsysevents.c
Modified: Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacapps.c
===================================================================
--- Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacapps.c	2006-04-05 22:01:22 UTC (rev 1197)
+++ Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacapps.c	2006-04-05 22:03:52 UTC (rev 1198)
@@ -266,12 +266,12 @@
 	return true if Apple Events are available.
 	*/
 	
-	long gestaltAppleEventsPresent;
+	long lGestaltAppleEventsPresent;
 	
-	if (Gestalt (gestaltAppleEventsAttr, &gestaltAppleEventsPresent) != noErr)
+	if (Gestalt (gestaltAppleEventsAttr, &lGestaltAppleEventsPresent) != noErr)
 		return (false);
 	
-	return (gestaltAppleEventsPresent != 0);
+	return (lGestaltAppleEventsPresent != 0);
 	} /*IAChaveappleevents*/
 
 

Modified: Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacasynch.c
===================================================================
--- Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacasynch.c	2006-04-05 22:01:22 UTC (rev 1197)
+++ Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacasynch.c	2006-04-05 22:03:52 UTC (rev 1198)
@@ -29,7 +29,7 @@
 
 
 
-static Boolean IACaddreplyhandler (tyAsynchCallback callback, long id) {
+static Boolean IACaddreplyhandler (tyAsynchCallback pcallback, long id) {
 	
 	short i;
 	
@@ -39,7 +39,7 @@
 			
 			replyhandlers [i].id = id;
 			
-			replyhandlers [i].callback = callback;
+			replyhandlers [i].callback = pcallback;
 			
 			return (true);
 			}
@@ -50,7 +50,8 @@
 
 
 static pascal OSErr IAChandleanswer (AppleEvent *event, AppleEvent *reply, long refcon) {
-	
+#pragma unused(reply, refcon)
+
 	long replyid;
 	short i;
 	
@@ -88,7 +89,7 @@
 	} /*IACasynchinitcheck*/
 	
 
-Boolean IACsendasynch (AppleEvent *event, tyAsynchCallback callback) {
+Boolean IACsendasynch (AppleEvent *event, tyAsynchCallback pcallback) {
 
 	AppleEvent reply;
 	OSErr ec;
@@ -100,9 +101,9 @@
 	if (!IACgetlongattr (event, keyReturnIDAttr, typeLongInteger, &replyid))
 		return (false);
 	
-	if (callback != nil) { /*DW 7/30/93*/
+	if (pcallback != nil) { /*DW 7/30/93*/
 	
-		if (!IACaddreplyhandler (callback, replyid))
+		if (!IACaddreplyhandler (pcallback, replyid))
 			return (false);
 		}
 	

Modified: Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacdouble.c
===================================================================
--- Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacdouble.c	2006-04-05 22:01:22 UTC (rev 1197)
+++ Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacdouble.c	2006-04-05 22:03:52 UTC (rev 1198)
@@ -197,10 +197,13 @@
 	ec = AECoercePtr (typeFloat, (Ptr)&val, sizeof (val), typeExtended, &valDesc);
 	
 	if (ec == noErr)
+	{
+		// 2006-04-02 kw --- inserted braces for ambiguity warning
 		if ((*list).descriptorType == typeAERecord)
 			ec = AEPutKeyDesc (list, n, &valDesc);
 		else
 			ec = AEPutDesc (list, n, &valDesc);
+	}
 	
 	IACglobals.errorcode = ec;
 	

Modified: Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacnetwork.c
===================================================================
--- Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacnetwork.c	2006-04-05 22:01:22 UTC (rev 1197)
+++ Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacnetwork.c	2006-04-05 22:03:52 UTC (rev 1198)
@@ -212,6 +212,7 @@
 #else
 
 static pascal Boolean string2networkaddress (ConstStr255Param bsadr, TargetID *target) {
+#pragma unused(bsadr, target)
 
 	/*
 	2004-10-21 aradke: Can't do this on Carbon, give up and return bogus error

Modified: Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacops.c
===================================================================
--- Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacops.c	2006-04-05 22:01:22 UTC (rev 1197)
+++ Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacops.c	2006-04-05 22:03:52 UTC (rev 1198)
@@ -99,7 +99,8 @@
 
 
 pascal short IACwaitroutine (EventRecord *ev, long *sleep, RgnHandle *mousergn) {
-	
+#pragma unused(sleep, mousergn)
+
 	/*
 	called by the AppleEvent manager during AESend to give the user a chance to 
 	break out of a wait loop.

Modified: Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacsysevents.c
===================================================================
--- Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacsysevents.c	2006-04-05 22:01:22 UTC (rev 1197)
+++ Frontier/trunk/FrontierSDK/Toolkits/IACTools/Source/iacsysevents.c	2006-04-05 22:03:52 UTC (rev 1198)
@@ -144,6 +144,7 @@
 	
 	
 Boolean IACremovesystemhandler (AEEventClass eventclass, AEEventID id, ProcPtr handler) {
+#pragma unused(handler)
 
 	hdlsystemhandler h = hfirstsystemhandler;
 	hdlsystemhandler hprev = nil;


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

SF.net SVN: frontierkernel: [1197] Frontier/trunk/Common/IOAToolkit

[<kar...@us...>]

Revision: 1197
Author:   karstenw
Date:     2006-04-05 15:01:22 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1197&view=rev

Log Message:
-----------
parameter unused & name conflict fixes

Modified Paths:
--------------
    Frontier/trunk/Common/IOAToolkit/ioa.c
    Frontier/trunk/Common/IOAToolkit/ioabutton.c
    Frontier/trunk/Common/IOAToolkit/ioacheckbox.c
    Frontier/trunk/Common/IOAToolkit/ioacolorpopup.c
    Frontier/trunk/Common/IOAToolkit/ioaedittext.c
    Frontier/trunk/Common/IOAToolkit/ioaframe.c
    Frontier/trunk/Common/IOAToolkit/ioaicon.c
    Frontier/trunk/Common/IOAToolkit/ioapicture.c
    Frontier/trunk/Common/IOAToolkit/ioapopup.c
    Frontier/trunk/Common/IOAToolkit/ioaradio.c
    Frontier/trunk/Common/IOAToolkit/ioarect.c
    Frontier/trunk/Common/IOAToolkit/ioascrollbar.c
    Frontier/trunk/Common/IOAToolkit/ioastatic.c
Modified: Frontier/trunk/Common/IOAToolkit/ioa.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioa.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioa.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -478,7 +478,8 @@
 	
 	
 boolean IOAincolorwindow (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (true); /*need to fill this in*/
 	} /*IOAincolorwindow*/
 	
@@ -509,7 +510,8 @@
 	
 
 static boolean defaultDebugObjectCallback (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	IOAcopystring ("\pbad object type", errorstring);
 	
 	return (false);
@@ -517,37 +519,43 @@
 	
 	
 static boolean defaultRecalcObjectCallback (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(h, flmajorrecalc)
+
 	return (true);
 	} /*defaultRecalcObjectCallback*/
 	
 
 static boolean defaultClickObjectCallback (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(h, listhead, pt, flshiftkey, fl2click)
+
 	return (false); /*don't do a minor recalc*/
 	} /*defaultClickObjectCallback*/
 	
 
 static boolean defaultSetObjectCursorCallback (hdlobject h, Point pt) {
-	
+#pragma unused(h, pt)
+
 	return (false); /*we accept the default cursor*/
 	} /*defaultSetObjectCursorCallback*/
 	
 	
 static boolean defaultCatchReturnCallback (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (false); /*we don't want to intercept the Return key*/
 	} /*defaultCatchReturnCallback*/
 	
 	
 static boolean defaultUnpackDataCallback (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (true); /*do nothing*/
 	} /*defaultUnpackDataCallback*/
 	
 	
 static boolean defaultAppleEventCallback (hdlobject h, AppleEvent *event) {
-	
+#pragma unused(h, event)
+
 	return (true); /*do nothing*/
 	} /*defaultAppleEventCallback*/
 	
@@ -564,46 +572,47 @@
 	
 	
 static boolean defaultDisposeDataCallback (hdlobject h) {
+#pragma unused(h)
 
 	return (true);
 	} /*defaultDisposeDataCallback*/
 	
 	
-static void callsetuproutine (setupcallback callback, tyioaconfigrecord *config) {
+static void callsetuproutine (setupcallback pcallback, tyioaconfigrecord *pconfig) {
+// 2006-04-03 - kw --- renamed parameter config -> pconfig	
+	IOAclearbytes (pconfig, longsizeof (tyioaconfigrecord));
 	
-	IOAclearbytes (config, longsizeof (tyioaconfigrecord));
+	(*pconfig).setValueFromScriptCallback = IOAsetobjectvalue;
 	
-	(*config).setValueFromScriptCallback = IOAsetobjectvalue;
+	(*pconfig).getObjectInvalRectCallback = defaultGetObjectInvalRectCallback;
 	
-	(*config).getObjectInvalRectCallback = defaultGetObjectInvalRectCallback;
+	(*pconfig).recalcObjectCallback = defaultRecalcObjectCallback;
 	
-	(*config).recalcObjectCallback = defaultRecalcObjectCallback;
+	(*pconfig).debugObjectCallback = defaultDebugObjectCallback;
 	
-	(*config).debugObjectCallback = defaultDebugObjectCallback;
+	(*pconfig).clickObjectCallback = defaultClickObjectCallback;
 	
-	(*config).clickObjectCallback = defaultClickObjectCallback;
+	(*pconfig).setObjectCursorCallback = defaultSetObjectCursorCallback;
 	
-	(*config).setObjectCursorCallback = defaultSetObjectCursorCallback;
+	(*pconfig).catchReturnCallback = defaultCatchReturnCallback;
 	
-	(*config).catchReturnCallback = defaultCatchReturnCallback;
+	(*pconfig).getAttributesCallback = defaultAppleEventCallback;
 	
-	(*config).getAttributesCallback = defaultAppleEventCallback;
+	(*pconfig).setAttributesCallback = defaultAppleEventCallback;
 	
-	(*config).setAttributesCallback = defaultAppleEventCallback;
+	(*pconfig).packDataCallback = defaultPackDataCallback;
 	
-	(*config).packDataCallback = defaultPackDataCallback;
+	(*pconfig).unpackDataCallback = defaultUnpackDataCallback;
 	
-	(*config).unpackDataCallback = defaultUnpackDataCallback;
+	(*pconfig).disposeDataCallback = defaultDisposeDataCallback;
 	
-	(*config).disposeDataCallback = defaultDisposeDataCallback;
+	(*pconfig).handlesMouseTrack = false;
 	
-	(*config).handlesMouseTrack = false;
+	(*pconfig).editableInRunMode = false;
 	
-	(*config).editableInRunMode = false;
+	(*pconfig).isFontAware = true;
 	
-	(*config).isFontAware = true;
-	
-	(*callback) (config);
+	(*pcallback) (pconfig);
 	} /*callsetuproutine*/
 
 
@@ -625,7 +634,8 @@
 
 
 static pascal ComponentResult IOAclose (ComponentInstance self) {
-	
+#pragma unused(self)
+
 	return (noErr);
 	} /*IOAclose*/
 
@@ -1276,7 +1286,8 @@
 	//Code change by Timothy Paustian Saturday, July 8, 2000 8:23:29 AM
 	//I changed this to plain pascal instead of static. Will this shoot things?
 static	pascal ComponentResult IOAmain (ComponentParameters *params, Handle hstorage) {
-	
+#pragma unused (hstorage)
+
 #endif
 	
 	ComponentResult result;
@@ -1793,13 +1804,13 @@
 		} /*scrollbarmain*/
 		
 	
-	static boolean IOAregister (short ixarray, OSType subtype, ComponentRoutine main, setupcallback callback) {
+	static boolean IOAregister (short ixarray, OSType subtype, ComponentRoutine main, setupcallback pcallback) {
 		
 		ComponentDescription desc;
 		Component comp;
 		ComponentRoutineUPP routinePtr;
 		
-		callsetuproutine (callback, &configarray [ixarray]);
+		callsetuproutine (pcallback, &configarray [ixarray]);
 		
 		IOAclearbytes (&desc, longsizeof (desc));
 		

Modified: Frontier/trunk/Common/IOAToolkit/ioabutton.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioabutton.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioabutton.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -67,7 +67,8 @@
 	
 
 static boolean canreplicatebutton (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (true); /*it can be replicated*/
 	} /*canreplicatebutton*/
 	
@@ -99,7 +100,8 @@
 	
 
 static boolean debugbutton (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);
@@ -108,13 +110,21 @@
 
 #if TARGET_API_MAC_CARBON == 1
 
-	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
-		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
+static void
+MyThemeButtonDrawCallback (
+	const Rect					*bounds,
+	ThemeButtonKind				 kind,
+	const ThemeButtonDrawInfo	*info,
+	UInt32						 refcon,
+	SInt16						 depth,
+	Boolean						 isColorDev)
+{
+#pragma unused(kind, info, depth, isColorDev)
+
+	/*
+	 7.0b48 PBS: draw the label for a popup menu.
+	 */
 		
-		/*
-		7.0b48 PBS: draw the label for a popup menu.
-		*/
-		
 		Handle htext = (Handle) refcon;
 		ThemeFontID idfont;
 		bigstring fontname, bs;
@@ -293,7 +303,8 @@
 	
 	
 static boolean recalcbutton (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	bigstring errorstring;
 	Handle hvalue;
 	
@@ -309,7 +320,8 @@
 
 
 static boolean clickbutton (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(listhead, pt, flshiftkey, fl2click)
+
 	IOArunbuttonscript (h);
 	
 	return (true); /*do a minor recalc*/

Modified: Frontier/trunk/Common/IOAToolkit/ioacheckbox.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioacheckbox.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioacheckbox.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -79,7 +79,8 @@
 	
 
 static boolean canreplicatecheckbox (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (true); /*it can be replicated*/
 	} /*canreplicatecheckbox*/
 	
@@ -107,7 +108,8 @@
 	
 	
 static boolean debugcheckbox (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);
@@ -166,13 +168,15 @@
 	
 	
 static boolean initcheckbox (tyobject *obj) {
-	
+#pragma unused(obj)
+
 	return (true); /*nothing special, we do want to edit it*/
 	} /*initcheckbox*/
 	
 	
 static boolean recalccheckbox (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	bigstring errorstring;
 	Handle hboolvalue;
 	
@@ -186,7 +190,8 @@
 	
 
 static boolean clickcheckbox (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(listhead, pt, flshiftkey, fl2click)
+
 	(**h).objectflag = !(**h).objectflag;
 	
 	(**(**h).owningcard).runtimevaluechanged = true; /*DW 9/19/95*/

Modified: Frontier/trunk/Common/IOAToolkit/ioacolorpopup.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioacolorpopup.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioacolorpopup.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -436,7 +436,8 @@
 	
 
 static boolean clickcolorpopup (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(listhead, flshiftkey, fl2click)
+
 	hdlcolordata hdata = (hdlcolordata) (**h).objectdata;
 	RGBColor rgb;
 	
@@ -474,7 +475,7 @@
 	
 
 static boolean canreplicatecolorpopup (hdlobject h) {
-	
+#pragma unused(h)
 	return (true); 
 	} /*canreplicatecolorpopup*/
 	
@@ -592,7 +593,7 @@
 
 
 static boolean debugcolorpopup (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
 	setstringlength (errorstring, 0);
 	
 	return (true);
@@ -726,7 +727,8 @@
 	
 	
 static boolean recalccolorpopup (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	bigstring errorstring;
 	Handle hrgbvalue;
 	

Modified: Frontier/trunk/Common/IOAToolkit/ioaedittext.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioaedittext.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioaedittext.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -213,7 +213,8 @@
 	
 
 static boolean debugedittext (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);
@@ -256,7 +257,8 @@
 	
 	
 static boolean recalcedittext (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	hdltextdata hdata = (hdltextdata) (**h).objectdata;
 	
 	if (!(**hdata).bullets) 
@@ -301,7 +303,8 @@
 	
 	
 static boolean clickedittext (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(listhead, fl2click)
+
 	hdlcard hc = (**h).owningcard;
 	
 	if (h != (**hc).activetextobject) {
@@ -318,7 +321,8 @@
 	
 	
 static boolean setcursoredittext (hdlobject h, Point pt) {
-	
+#pragma unused(h, pt)
+
 	CursHandle hcursor;
 	
 	hcursor = GetCursor (iBeamCursor);
@@ -355,6 +359,7 @@
 	
 	
 static boolean idleedittext (hdlobject h) {
+#pragma unused(h)
 
 	IOAeditidle (IOAgetactiveeditrecord ());
 	

Modified: Frontier/trunk/Common/IOAToolkit/ioaframe.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioaframe.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioaframe.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -174,7 +174,8 @@
 	
 
 static boolean debugframe (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);
@@ -268,7 +269,8 @@
 	
 	
 static boolean recalcframe (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	return (IOArecalcobjectvalue (h));
 	} /*recalcframe*/
 	

Modified: Frontier/trunk/Common/IOAToolkit/ioaicon.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioaicon.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioaicon.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -94,7 +94,8 @@
 	
 
 static boolean canreplicateicon (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (true); /*it can be replicated*/
 	} /*canreplicateicon*/
 	
@@ -106,7 +107,8 @@
 	
 
 static boolean debugicon (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);
@@ -209,7 +211,8 @@
 	
 	
 static boolean recalciconobject (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	return (IOArecalcobjectvalue (h));
 	} /*recalciconobject*/
 	
@@ -326,12 +329,13 @@
 	
 	
 static boolean clickicon (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(listhead, pt, flshiftkey)
+
 	hdlicondata hdata = (hdlicondata) (**h).objectdata;
-	tyiconclickcallback callback = (**hdata).iconclick;
+	tyiconclickcallback lcallback = (**hdata).iconclick;
 	
-	if (callback != nil)
-		return ((*callback) (h, fl2click));
+	if (lcallback != nil)
+		return ((*lcallback) (h, fl2click));
 	
 	if (fl2click)
 		IOArunbuttonscript (h);

Modified: Frontier/trunk/Common/IOAToolkit/ioapicture.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioapicture.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioapicture.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -65,25 +65,29 @@
 	
 
 static boolean canreplicatepicture (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (true); /*it can be replicated*/
 	} /*canreplicatepicture*/
 	
 
 static boolean getpictureeditrect (hdlobject h, Rect *r) {
+#pragma unused(h, r)
 
 	return (false); /*text of object can't be edited*/
 	} /*getpictureeditrect*/
 	
 
 static boolean getpicturevalue (hdlobject h, Handle *hvalue) {
-	
+#pragma unused(h, hvalue)
+
 	return (false); /*picture doesn't have a value for a script*/
 	} /*getpicturevalue*/
 	
 
 static boolean debugpicture (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);

Modified: Frontier/trunk/Common/IOAToolkit/ioapopup.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioapopup.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioapopup.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -387,9 +387,9 @@
 	
 	/*side-effect -- we use the popup width when drawing the object*/ {
 		
-		hdlpopupdata hdata = (hdlpopupdata) (**h).objectdata;
+		hdlpopupdata lhdata = (hdlpopupdata) (**h).objectdata;
 		
-		(**hdata).popupwidth = popupwidth;
+		(**lhdata).popupwidth = popupwidth;
 		}
 	
 	return (true);
@@ -420,7 +420,8 @@
 	
 	
 static boolean clickpopup (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(listhead, flshiftkey, fl2click)
+
 	hdlpopupdata hdata = (hdlpopupdata) (**h).objectdata;
 	hdlcard hc = (**h).owningcard;
 	MenuHandle hmenu;
@@ -518,7 +519,8 @@
 
 	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
 		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
-		
+#pragma unused(kind, info, depth, isColorDev)
+
 		/*
 		7.0b48 PBS: draw the label for a popup menu.
 		*/
@@ -670,13 +672,14 @@
 	
 	return (true); /*we do want to edit it*/
 	} /*initpopup*/
-	
-	
+
+
 static boolean recalcpopup (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	bigstring errorstring;
 	Handle htoss;
-	
+
 	if (!IOAevalscript (h, (**h).objectrecalcscript, &htoss, (**h).objectlanguage, errorstring))
 		return (false);
 	
@@ -725,14 +728,15 @@
 	
 	return (true);
 	} /*getpopupinvalrect*/
-	
-	
+
+
 static boolean canreplicatepopup (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (true); 
 	} /*canreplicatepopup*/
-	
 
+
 static boolean getpopupeditrect (hdlobject h, Rect *redit) {
 	
 	hdlpopupdata hdata = (hdlpopupdata) (**h).objectdata;
@@ -765,7 +769,8 @@
 	
 
 static boolean debugpopup (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);

Modified: Frontier/trunk/Common/IOAToolkit/ioaradio.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioaradio.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioaradio.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -80,7 +80,8 @@
 	
 
 static boolean canreplicateradio (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (true); /*it can be replicated*/
 	} /*canreplicateradio*/
 	
@@ -108,7 +109,8 @@
 	
 	
 static boolean debugradio (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);
@@ -119,7 +121,8 @@
 
 	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
 		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
-		
+#pragma unused(bounds, kind, info, refcon, depth, isColorDev)
+
 		//StringPtr bs = (StringPtr) refcon;
 		
 		//pushstyle (geneva, 10, 0);
@@ -218,13 +221,15 @@
 	
 
 static boolean initradio (tyobject *obj) {
-	
+#pragma unused(obj)
+
 	return (true); /*nothing special, we do want to edit it*/
 	} /*initradio*/
 	
 	
 static boolean recalcradio (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	bigstring errorstring;
 	Handle hboolvalue;
 	
@@ -238,7 +243,8 @@
 	
 
 static boolean clickradio (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(pt, flshiftkey, fl2click)
+
 	/*
 	the one you hit goes on, all others go off
 	*/

Modified: Frontier/trunk/Common/IOAToolkit/ioarect.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioarect.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioarect.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -82,13 +82,15 @@
 	
 
 static boolean canreplicaterect (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (false); /*it can't be replicated*/
 	} /*canreplicaterect*/
 	
 
 static boolean getrecteditrect (hdlobject h, Rect *r) {
-	
+#pragma unused(h, r)
+
 	return (false); /*can't be edited*/
 	} /*getrecteditrect*/
 	
@@ -100,7 +102,8 @@
 	
 
 static boolean debugrectobject (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);
@@ -181,7 +184,8 @@
 
 
 static boolean clickrect (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(listhead, pt, flshiftkey, fl2click)
+
 	IOArunbuttonscript (h);
 	
 	return (true); /*do a minor recalc*/

Modified: Frontier/trunk/Common/IOAToolkit/ioascrollbar.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioascrollbar.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioascrollbar.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -81,7 +81,8 @@
 	
 
 static boolean cleanscrollbar (hdlobject h, short textheight, short textwidth, Rect *r) {
-	
+#pragma unused(textwidth, textheight)
+
 	short height, width;
 	
 	if (!checkcontrolexists (h))
@@ -175,7 +176,9 @@
 #endif
 		
 static boolean clickscrollbar (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
-	
+#pragma unused(listhead, flshiftkey, fl2click)
+
+	// hdlscrollbardata hdata = (hdlscrollbardata) (**h).objectdata;
 	hdlcard hc = (**h).owningcard;
 	
 	if (!checkcontrolexists (h))
@@ -297,7 +300,8 @@
 	
 	
 static boolean recalcscrollbar (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	return (IOArecalcobjectvalue (h));
 	} /*recalcscrollbar*/
 	
@@ -311,13 +315,15 @@
 	
 	
 static boolean canreplicatescrollbar (hdlobject h) {
-	
+#pragma unused(h)
+
 	return (true); 
 	} /*canreplicatescrollbar*/
 	
 
 static boolean getscrollbareditrect (hdlobject h, Rect *r) {
-	
+#pragma unused(h, r)
+
 	return (false); /*can't be edited*/
 	} /*getscrollbareditrect*/
 	
@@ -343,7 +349,8 @@
 	
 
 static boolean debugscrollbar (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);

Modified: Frontier/trunk/Common/IOAToolkit/ioastatic.c
===================================================================
--- Frontier/trunk/Common/IOAToolkit/ioastatic.c	2006-04-05 21:50:20 UTC (rev 1196)
+++ Frontier/trunk/Common/IOAToolkit/ioastatic.c	2006-04-05 22:01:22 UTC (rev 1197)
@@ -105,7 +105,8 @@
 	
 
 static boolean debugstatic (hdlobject h, bigstring errorstring) {
-	
+#pragma unused(h)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);
@@ -133,13 +134,15 @@
 	
 
 static boolean initstatic (tyobject *obj) {
-	
+#pragma unused(obj)
+
 	return (true); /*we do want to edit it*/
 	} /*initstatic*/
 	
 	
 static boolean recalcstatic (hdlobject h, boolean flmajorrecalc) {
-	
+#pragma unused(flmajorrecalc)
+
 	return (IOArecalcobjectvalue (h));
 	} /*recalcstatic*/
 	


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

SF.net SVN: frontierkernel: [1196] Frontier/trunk/Common/headers

[<kar...@us...>]

Revision: 1196
Author:   karstenw
Date:     2006-04-05 14:50:20 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1196&view=rev

Log Message:
-----------
removed some parameter names to resolve shadow warning

Modified Paths:
--------------
    Frontier/trunk/Common/headers/FDllCall.h
    Frontier/trunk/Common/headers/WinSockNetEvents.h
    Frontier/trunk/Common/headers/frontierconfig.h
    Frontier/trunk/Common/headers/langdll.h
Modified: Frontier/trunk/Common/headers/FDllCall.h
===================================================================
--- Frontier/trunk/Common/headers/FDllCall.h	2006-04-05 21:49:30 UTC (rev 1195)
+++ Frontier/trunk/Common/headers/FDllCall.h	2006-04-05 21:50:20 UTC (rev 1196)
@@ -262,9 +262,15 @@
 
 	odbBool (xCALLBACK *xOdbNewListValue) (odbRef odb, odbValueRecord *value, odbBool flRecord);
 	odbBool (xCALLBACK *xOdbGetListCount) (odbRef odb, odbValueRecord *value, long * cnt);
-	odbBool (xCALLBACK *xOdbDeleteListValue) (odbRef odb, odbValueRecord *value, long index, char * recordname);
-	odbBool (xCALLBACK *xOdbSetListValue) (odbRef odb, odbValueRecord *value, long index, char * recordname, odbValueRecord *valueData);
-	odbBool (xCALLBACK *xOdbGetListValue) (odbRef odb, odbValueRecord *value, long index, char * recordname, odbValueRecord *valueReturn);
+
+	// 2006-04-04 - kw --- removed parameter names
+	// odbBool (xCALLBACK *xOdbDeleteListValue) (odbRef odb, odbValueRecord *value, long index, char * recordname);
+	odbBool (xCALLBACK *xOdbDeleteListValue) (odbRef, odbValueRecord *, long, char *);
+	// odbBool (xCALLBACK *xOdbSetListValue) (odbRef odb, odbValueRecord *value, long index, char * recordname, odbValueRecord *valueData);
+	odbBool (xCALLBACK *xOdbSetListValue) (odbRef, odbValueRecord *, long, char *, odbValueRecord *);
+	// odbBool (xCALLBACK *xOdbGetListValue) (odbRef odb, odbValueRecord *value, long index, char * recordname, odbValueRecord *valueReturn);
+	odbBool (xCALLBACK *xOdbGetListValue) (odbRef, odbValueRecord *, long, char *, odbValueRecord *);
+
 	odbBool (xCALLBACK *xOdbAddListValue) (odbRef odb, odbValueRecord *value, char * recordname, odbValueRecord *valueData);
 
 	odbBool (xCALLBACK *xInvoke) (odbString bsscriptname, void * params, odbValueRecord * value, odbBool *flfound, unsigned int * errarg);

Modified: Frontier/trunk/Common/headers/WinSockNetEvents.h
===================================================================
--- Frontier/trunk/Common/headers/WinSockNetEvents.h	2006-04-05 21:49:30 UTC (rev 1195)
+++ Frontier/trunk/Common/headers/WinSockNetEvents.h	2006-04-05 21:50:20 UTC (rev 1196)
@@ -102,7 +102,9 @@
 extern boolean fwsNetEventWriteStream (unsigned long stream, unsigned long bytesToWrite, char * buffer);
 
 /* Set up a listner on a port */
-extern boolean fwsNetEventListenStream (unsigned long port, long depth, bigstring callback, unsigned long refcon, unsigned long * stream, unsigned long ipaddr, long hdatabase);
+// 2006-04-04 - kw --- removed parameter names
+// extern boolean fwsNetEventListenStream (unsigned long port, long depth, bigstring callback, unsigned long refcon, unsigned long * stream, unsigned long ipaddr, long hdatabase);
+extern boolean fwsNetEventListenStream (unsigned long, long, bigstring, unsigned long, unsigned long *, unsigned long, long);
 
 /* get the status of a stream */
 extern boolean fwsNetEventStatusStream (unsigned long stream, bigstring status, unsigned long * bytesPending);

Modified: Frontier/trunk/Common/headers/frontierconfig.h
===================================================================
--- Frontier/trunk/Common/headers/frontierconfig.h	2006-04-05 21:49:30 UTC (rev 1195)
+++ Frontier/trunk/Common/headers/frontierconfig.h	2006-04-05 21:50:20 UTC (rev 1196)
@@ -76,7 +76,7 @@
 	
 	boolean flvertscroll: 1;
 	
-	boolean flwindowfloats: 1; /*is it a floating palette window?*/
+	boolean flwindowfloats: 1; /*is it a floating palette window?*/		// NOT USED
 	
 	boolean flmessagearea: 1; /*allocate space for a message area?*/
 	

Modified: Frontier/trunk/Common/headers/langdll.h
===================================================================
--- Frontier/trunk/Common/headers/langdll.h	2006-04-05 21:49:30 UTC (rev 1195)
+++ Frontier/trunk/Common/headers/langdll.h	2006-04-05 21:50:20 UTC (rev 1196)
@@ -62,9 +62,16 @@
 
 odbBool xCALLBACK extOdbNewListValue (odbRef odb, odbValueRecord *valueList, odbBool flRecord);
 odbBool xCALLBACK extOdbGetListCount (odbRef odb, odbValueRecord *valueList, long * cnt);
-odbBool xCALLBACK extOdbDeleteListValue (odbRef odb, odbValueRecord *valueList, long index, char * recordname);
-odbBool xCALLBACK extOdbSetListValue (odbRef odb, odbValueRecord *valueList, long index, char * recordname, odbValueRecord *valueData);
-odbBool xCALLBACK extOdbGetListValue (odbRef odb, odbValueRecord *valueList, long index, char * recordname, odbValueRecord *valueReturn);
+
+// 2006-04-04 - kw --- removed parameter names
+// odbBool xCALLBACK extOdbDeleteListValue (odbRef odb, odbValueRecord *valueList, long index, char * recordname);
+odbBool xCALLBACK extOdbDeleteListValue (odbRef, odbValueRecord *, long, char *);
+
+// odbBool xCALLBACK extOdbSetListValue (odbRef odb, odbValueRecord *valueList, long index, char * recordname, odbValueRecord *valueData);
+odbBool xCALLBACK extOdbSetListValue (odbRef, odbValueRecord *, long, char *, odbValueRecord *);
+// odbBool xCALLBACK extOdbGetListValue (odbRef odb, odbValueRecord *valueList, long index, char * recordname, odbValueRecord *valueReturn);
+odbBool xCALLBACK extOdbGetListValue (odbRef, odbValueRecord *, long, char *, odbValueRecord *);
+
 odbBool xCALLBACK extOdbAddListValue (odbRef odb, odbValueRecord *valueList, char * recordname, odbValueRecord *valueData);
 
 odbBool xCALLBACK extInvoke (bigstring bsscriptname, void * pDispParams, odbValueRecord * retval, boolean *flfoundhandler, unsigned int * errarg);


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

SF.net SVN: frontierkernel: [1195] Frontier/trunk/Common/headers/process.h

[<kar...@us...>]

Revision: 1195
Author:   karstenw
Date:     2006-04-05 14:49:30 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1195&view=rev

Log Message:
-----------
disabled some retired functions

Modified Paths:
--------------
    Frontier/trunk/Common/headers/process.h
Modified: Frontier/trunk/Common/headers/process.h
===================================================================
--- Frontier/trunk/Common/headers/process.h	2006-04-05 21:30:52 UTC (rev 1194)
+++ Frontier/trunk/Common/headers/process.h	2006-04-05 21:49:30 UTC (rev 1195)
@@ -191,8 +191,11 @@
 
 extern boolean processkill (hdlprocessrecord);
 
-extern void processinvalidglobals (WindowPtr);
+// kw 2005-12-16 - These two are retired
+// extern void processinvalidglobals (WindowPtr);
 
+// extern void processinvalidoutline (struct tyoutlinerecord **);
+
 extern boolean abort1shotprocess (void);
 
 extern void killdependentprocesses (long);
@@ -272,7 +275,3 @@
 extern boolean processgetstats (hdlhashtable); /*6.2b6 AR*/
 
 #endif
-
-
-
-


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

SF.net SVN: frontierkernel: [1194] Frontier/trunk/Common/Paige/headers/PAIGE.H

[<kar...@us...>]

Revision: 1194
Author:   karstenw
Date:     2006-04-05 14:30:52 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1194&view=rev

Log Message:
-----------
removed some conflicting parameter names (mainly due 'index' usage)

Modified Paths:
--------------
    Frontier/trunk/Common/Paige/headers/PAIGE.H
Modified: Frontier/trunk/Common/Paige/headers/PAIGE.H
===================================================================
--- Frontier/trunk/Common/Paige/headers/PAIGE.H	2006-04-05 21:27:33 UTC (rev 1193)
+++ Frontier/trunk/Common/Paige/headers/PAIGE.H	2006-04-05 21:30:52 UTC (rev 1194)
@@ -1961,7 +1961,9 @@
 
 /* Async Lock/Unlock */
 
-extern PG_PASCAL (pg_boolean) pgSetLockID (pg_ref pg, long ID);
+// 2006-04-04 - kw --- removed parameter names
+//extern PG_PASCAL (pg_boolean) pgSetLockID (pg_ref pg, long ID);
+extern PG_PASCAL (pg_boolean) pgSetLockID (pg_ref, long);
 extern PG_PASCAL (long) pgGetLockID (pg_ref pg);
 
 
@@ -2115,7 +2117,11 @@
 extern PG_PASCAL (pg_boolean) pgGetStyleSheet (pg_ref pg, const select_pair_ptr selection, short PG_FAR *style_id);
 extern PG_PASCAL (short) pgFindStyleSheet (pg_ref pg, const style_info_ptr compare_style,
 		const style_info_ptr mask);
-extern PG_PASCAL (short) pgGetIndStyleSheet (pg_ref pg, short index, style_info_ptr stylesheet);
+
+// 2006-04-04 - kw --- removed parameter names
+// extern PG_PASCAL (short) pgGetIndStyleSheet (pg_ref pg, short index, style_info_ptr stylesheet);
+extern PG_PASCAL (short) pgGetIndStyleSheet (pg_ref, short, style_info_ptr);
+
 extern PG_PASCAL (short) pgNewParStyle (pg_ref pg, const par_info_ptr new_style);
 extern PG_PASCAL (void) pgRemoveParStyle (pg_ref pg, short style_id);
 extern PG_PASCAL (short) pgNumParStyles (pg_ref pg);
@@ -2128,17 +2134,28 @@
 extern PG_PASCAL (pg_boolean) pgGetParStyleSheet (pg_ref pg, const select_pair_ptr selection, short PG_FAR *style_id);
 extern PG_PASCAL (short) pgFindParStyleSheet (pg_ref pg, const par_info_ptr compare_style,
 		const par_info_ptr mask);
-extern PG_PASCAL (short) pgGetIndParStyleSheet (pg_ref pg, short index, par_info_ptr stylesheet);
+
+// 2006-04-04 - kw --- removed parameter names
+// extern PG_PASCAL (short) pgGetIndParStyleSheet (pg_ref pg, short index, par_info_ptr stylesheet);
+extern PG_PASCAL (short) pgGetIndParStyleSheet (pg_ref, short, par_info_ptr);
+
 extern PG_PASCAL (long) pgNewNamedStyle (pg_ref pg, pg_c_string_ptr stylename, const style_info_ptr style,
 		const font_info_ptr font, par_info_ptr par);
 extern PG_PASCAL (long) pgAddNamedStyle (pg_ref pg, pg_c_string_ptr stylename, const short style_id, const short par_id);
 extern PG_PASCAL (void) pgApplyNamedStyle (pg_ref pg, select_pair_ptr selection, pg_c_string_ptr stylename,
 		short draw_mode);
-extern PG_PASCAL (void) pgApplyNamedStyleIndex (pg_ref pg, select_pair_ptr selection, long index, short draw_mode);
+
+// 2006-04-04 - kw --- removed parameter names
+// extern PG_PASCAL (void) pgApplyNamedStyleIndex (pg_ref pg, select_pair_ptr selection, long index, short draw_mode);
+extern PG_PASCAL (void) pgApplyNamedStyleIndex (pg_ref, select_pair_ptr, long, short);
+
 extern PG_PASCAL (long) pgNumNamedStyles (pg_ref pg);
 extern PG_PASCAL (long) pgGetNamedStyleIndex (pg_ref pg, pg_c_string_ptr stylename);
-extern PG_PASCAL (void) pgGetNamedStyleInfo (pg_ref pg, long index, style_info_ptr style,
-		font_info_ptr font, par_info_ptr par);
+
+// 2006-04-04 - kw --- removed parameter names
+// extern PG_PASCAL (void) pgGetNamedStyleInfo (pg_ref pg, long index, style_info_ptr style, font_info_ptr font, par_info_ptr par);
+extern PG_PASCAL (void) pgGetNamedStyleInfo (pg_ref, long, style_info_ptr, font_info_ptr, par_info_ptr);
+
 extern PG_PASCAL (pg_boolean) pgGetNamedStyle (pg_ref pg, long named_style_index, named_stylesheet_ptr named_style);
 extern PG_PASCAL (pg_boolean) pgGetAppliedNamedStyle (pg_ref pg, select_pair_ptr selection, pg_c_string_ptr stylename);
 extern PG_PASCAL (void) pgDeleteNamedStyle (pg_ref pg, long named_style_index);
@@ -2341,7 +2358,11 @@
 		pg_short_t exclusion2, short draw_mode);
 extern PG_PASCAL (void) pgInsertExclusionShape (pg_ref pg, pg_short_t position,
 		shape_ref exclude_shape, short draw_mode);
-extern PG_PASCAL (void) pgAttachParExclusion (pg_ref pg, long position, pg_short_t index, short draw_mode);
+
+// 2006-04-04 - kw --- removed parameter names
+// extern PG_PASCAL (void) pgAttachParExclusion (pg_ref pg, long position, pg_short_t index, short draw_mode);
+extern PG_PASCAL (void) pgAttachParExclusion (pg_ref, long, pg_short_t, short);
+
 extern PG_PASCAL (long) pgGetAttachedPar (pg_ref pg, pg_short_t exclusion);
 
 


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

SF.net SVN: frontierkernel: [1193] Frontier/trunk/Common/IowaRuntime/Headers/iowaruntime.h

[<kar...@us...>]

Revision: 1193
Author:   karstenw
Date:     2006-04-05 14:27:33 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1193&view=rev

Log Message:
-----------
parameter shadow warning fixes

Modified Paths:
--------------
    Frontier/trunk/Common/IowaRuntime/Headers/iowaruntime.h
Modified: Frontier/trunk/Common/IowaRuntime/Headers/iowaruntime.h
===================================================================
--- Frontier/trunk/Common/IowaRuntime/Headers/iowaruntime.h	2006-04-05 21:26:48 UTC (rev 1192)
+++ Frontier/trunk/Common/IowaRuntime/Headers/iowaruntime.h	2006-04-05 21:27:33 UTC (rev 1193)
@@ -112,7 +112,8 @@
 
 boolean runCard (Handle, boolean, short, short, tycardeventcallback);
 
-boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback callback);
+// 2006-04-03 - kw --- renamed parameter
+boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback pcallback);
 
 boolean setObjectValue (hdlcard, bigstring, Handle);
 


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

SF.net SVN: frontierkernel: [1192] Frontier/trunk/Common/IowaRuntime/Source

[<kar...@us...>]

Revision: 1192
Author:   karstenw
Date:     2006-04-05 14:26:48 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1192&view=rev

Log Message:
-----------
parameter & variable shadow waring fixes

Modified Paths:
--------------
    Frontier/trunk/Common/IowaRuntime/Source/iowacore.c
    Frontier/trunk/Common/IowaRuntime/Source/iowaruntime.c
    Frontier/trunk/Common/IowaRuntime/Source/iowascript.c
Modified: Frontier/trunk/Common/IowaRuntime/Source/iowacore.c
===================================================================
--- Frontier/trunk/Common/IowaRuntime/Source/iowacore.c	2006-04-05 21:18:25 UTC (rev 1191)
+++ Frontier/trunk/Common/IowaRuntime/Source/iowacore.c	2006-04-05 21:26:48 UTC (rev 1192)
@@ -908,13 +908,13 @@
 	
 	if ((**h).objecthasframe) {
 		
-		Rect robject;
+		Rect tempRect; // 2006-04-03 - kw ---renamed from robject - shadowwarning
 		
-		robject = (**h).objectrect;
+		tempRect = (**h).objectrect;
 		
-		if (!EmptyRect (&robject)) { /*user has changed its rect, it takes precedence*/
+		if (!EmptyRect (&tempRect)) { /*user has changed its rect, it takes precedence*/
 			
-			rgroup = robject;
+			rgroup = tempRect;
 			
 			goto exit;
 			}

Modified: Frontier/trunk/Common/IowaRuntime/Source/iowaruntime.c
===================================================================
--- Frontier/trunk/Common/IowaRuntime/Source/iowaruntime.c	2006-04-05 21:18:25 UTC (rev 1191)
+++ Frontier/trunk/Common/IowaRuntime/Source/iowaruntime.c	2006-04-05 21:26:48 UTC (rev 1192)
@@ -613,10 +613,10 @@
 	
 	
 static void filterevent (EventRecord *ev) {
+	// 2006-04-03 - kw --- renamed callback -> lCallback
+	tycardeventcallback lCallback = (**runtimedata).callback;
 	
-	tycardeventcallback callback = (**runtimedata).callback;
-	
-	if (callback == nil) 
+	if (lCallback == nil) 
 		return;
 		
 	if ((*ev).what == nullEvent) /*DW 8/22/93*/
@@ -632,7 +632,7 @@
 		
 		x.message = (long) iowadata;
 		
-		(*callback) (&x);
+		(*lCallback) (&x);
 		}
 	
 	//Code change by Timothy Paustian Monday, August 21, 2000 9:34:50 PM
@@ -647,7 +647,7 @@
 	pushmacport (thePort);
 	}
 	
-	(*callback) (ev);
+	(*lCallback) (ev);
 	
 	popmacport ();
 	} /*filterevent*/
@@ -655,17 +655,17 @@
 	
 static void sendinitmessage (void) {
 
-	tycardeventcallback callback = (**runtimedata).callback;
+	tycardeventcallback lcallback = (**runtimedata).callback;
 	EventRecord ev;
 	
-	if (callback == nil) 
+	if (lcallback == nil) 
 		return;
 		
 	ev.what = iowaInitEvent;
 	
 	ev.message = (long) iowadata;
 	
-	(*callback) (&ev);
+	(*lcallback) (&ev);
 	} /*sendinitmessage*/
 	
 	
@@ -674,22 +674,23 @@
 	/*
 	return true if the buttonhit has been fully processed
 	*/
-	
-	tycardeventcallback callback = (**runtimedata).callback;
+
+	// 2006-04-03 - kw --- renamed callback -> lCallback
+	tycardeventcallback lCallback = (**runtimedata).callback;
 	EventRecord ev;
-		
-	if (callback == nil)
+
+	if (lCallback == nil)
 		return (true);
-	
+
 	ev.what = iowaButtonHitEvent;
-	
+
 	ev.message = (long) h;
-	
-	(*callback) (&ev);
-	
+
+	(*lCallback) (&ev);
+
 	if (ev.what == iowaRunScriptEvent) /*pass the buttonhit thru, run the script*/
 		return (false);
-	
+
 	if (ev.what == iowaCloseEvent) /*the client is telling us to close the window*/
 		closeCardWindow ((**runtimedata).macwindow);
 		
@@ -704,23 +705,24 @@
 	other reason the card is about to close. we call back to the client,
 	giving him a chance to save data from the card.
 	*/
-	
-	tycardeventcallback callback = (**runtimedata).callback;
+
+	// 2006-04-03 - kw --- renamed callback -> lCallback
+	tycardeventcallback lCallback = (**runtimedata).callback;
 	EventRecord ev;
-	
-	if (callback == nil)
+
+	if (lCallback == nil)
 		return (true);
-	
+
 	ev.what = iowaCloseEvent;
-	
+
 	ev.message = (long) iowadata;
-	
-	(*callback) (&ev);
-	
+
+	(*lCallback) (&ev);
+
 	return (ev.what != iowaCancelEvent);
 	} /*sendclosemessage*/
+
 	
-	
 static void objectclick (hdlobject listhead, hdlobject h) {
 	
 	/*
@@ -1566,11 +1568,10 @@
 		}
 	
 	SizeWindow (w, (**hc).rightborder, (**hc).bottomborder, false);
-	
-				
-				ShowWindow (w);
+
+	ShowWindow (w);
 	//Code change by Timothy Paustian Wednesday, August 23, 2000 9:20:56 PM
-		//
+	//
 	{
 	#if TARGET_API_MAC_CARBON
 	CGrafPtr	thePort = GetWindowPort(w);
@@ -2296,8 +2297,8 @@
 	} /*passthruevent*/
 
 
-boolean runModalCard (Handle hpackedcard, boolean flscriptedcard, short top, short left, tycardeventcallback callback) {
-	
+boolean runModalCard (Handle hpackedcard, boolean flscriptedcard, short top, short pLeft, tycardeventcallback pCallback) {
+	// 2006-04-03 - kw --- renamed params left -pLeft, callback -> pCallback
 	/*
 	dmb 1.0b24: changed flcallback logic. we no longer call back on activate
 	and update events that we just handled
@@ -2316,7 +2317,7 @@
 	
 	winpos.v = top;
 	
-	winpos.h = left;
+	winpos.h = pLeft;
 	
 	modalwindow = newCardWindow (winpos, !flscriptedcard, hpackedcard);
 	
@@ -2329,7 +2330,7 @@
 		goto exit;
 		}
 		
-	(**runtimedata).callback = callback;
+	(**runtimedata).callback = pCallback;
 		
 	(**runtimedata).modeless = false;
 	
@@ -2397,16 +2398,16 @@
 			}
 		*/
 			
-		if ((flcallback) && (callback != nil)) {
+		if ((flcallback) && (pCallback != nil)) {
 			
-			hdlcard oldiowadata = iowadata;
-			hdlruntimerecord oldruntimedata = runtimedata;
+			hdlcard loldiowadata = iowadata;
+			hdlruntimerecord loldruntimedata = runtimedata;
 			
-			(*callback) (&ev);
+			(*pCallback) (&ev);
 			
-			iowadata = oldiowadata;
+			iowadata = loldiowadata;
 		
-			runtimedata = oldruntimedata;
+			runtimedata = loldruntimedata;
 			//Code change by Timothy Paustian Wednesday, August 23, 2000 9:21:26 PM
 			//
 			{	
@@ -2488,7 +2489,7 @@
 	} /*isModelessCardEvent*/
 	
 	
-boolean runModelessCard (Handle hpackedcard, boolean flscriptedcard, short top, short left, tycardeventcallback callback) {
+boolean runModelessCard (Handle hpackedcard, boolean flscriptedcard, short top, short pLeft, tycardeventcallback pCallback) {
 	
 	/*
 	dmb 1.024: call cardcheckinit here, before showing window. 
@@ -2520,7 +2521,7 @@
 	
 	winpos.v = top;
 	
-	winpos.h = left;
+	winpos.h = pLeft;
 	
 	modelesswindow = newCardWindow (winpos, !flscriptedcard, hpackedcard);
 	
@@ -2533,7 +2534,7 @@
 		goto exit;
 		}
 		
-	(**runtimedata).callback = callback;
+	(**runtimedata).callback = pCallback;
 		
 	(**runtimedata).modeless = true;
 	
@@ -2580,14 +2581,14 @@
 	} /*runModelessCard*/
 	 
 
-boolean runCard (Handle hpackedcard, boolean flscriptedcard, short top, short left, tycardeventcallback callback) {
+boolean runCard (Handle hpackedcard, boolean flscriptedcard, short top, short pleft, tycardeventcallback pcallback) {
 	
 	boolean fl;
 	
 	if (cardIsModal (hpackedcard)) 
-		fl = runModalCard (hpackedcard, flscriptedcard, top, left, callback);
+		fl = runModalCard (hpackedcard, flscriptedcard, top, pleft, pcallback);
 	else
-		fl = runModelessCard (hpackedcard, flscriptedcard, top, left, callback);
+		fl = runModelessCard (hpackedcard, flscriptedcard, top, pleft, pcallback);
 		
 	return (fl);
 	} /*runCard*/
@@ -2666,7 +2667,7 @@
 #pragma global_optimizer reset
 	
 	
-boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback callback) {
+boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback pCallback) {
 	
 	hdlcard oldiowadata = iowadata; 
 	hdlruntimerecord oldruntimedata = runtimedata;
@@ -2682,7 +2683,7 @@
 	
 	flreturn = true;
 	
-	(**runtimedata).callback = callback;
+	(**runtimedata).callback = pCallback;
 	
 	(**runtimedata).modeless = true;
 	

Modified: Frontier/trunk/Common/IowaRuntime/Source/iowascript.c
===================================================================
--- Frontier/trunk/Common/IowaRuntime/Source/iowascript.c	2006-04-05 21:18:25 UTC (rev 1191)
+++ Frontier/trunk/Common/IowaRuntime/Source/iowascript.c	2006-04-05 21:26:48 UTC (rev 1192)
@@ -388,7 +388,8 @@
 #endif
 
 static boolean rungraphicalurl (Handle hscript, bigstring errorstring) {
-	
+#pragma unused(hscript)
+
 	setstringlength (errorstring, 0);
 	
 	return (true);


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

SF.net SVN: frontierkernel: [1191] Frontier/trunk/Common/UserLandIACToolkit

[<kar...@us...>]

Revision: 1191
Author:   karstenw
Date:     2006-04-05 14:18:25 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1191&view=rev

Log Message:
-----------
unused parameter warning fix

Modified Paths:
--------------
    Frontier/trunk/Common/UserLandIACToolkit/land.c
    Frontier/trunk/Common/UserLandIACToolkit/landsystem7.c
Modified: Frontier/trunk/Common/UserLandIACToolkit/land.c
===================================================================
--- Frontier/trunk/Common/UserLandIACToolkit/land.c	2006-04-05 21:16:40 UTC (rev 1190)
+++ Frontier/trunk/Common/UserLandIACToolkit/land.c	2006-04-05 21:18:25 UTC (rev 1191)
@@ -559,6 +559,7 @@
 	
 	
 pascal boolean landefaultbreakembrace (EventRecord *ev) {
+#pragma unused (ev)
 
 	/*
 	return true if the user is holding down the cmd, option and shift keys.

Modified: Frontier/trunk/Common/UserLandIACToolkit/landsystem7.c
===================================================================
--- Frontier/trunk/Common/UserLandIACToolkit/landsystem7.c	2006-04-05 21:16:40 UTC (rev 1190)
+++ Frontier/trunk/Common/UserLandIACToolkit/landsystem7.c	2006-04-05 21:18:25 UTC (rev 1191)
@@ -329,7 +329,9 @@
 
 
 static boolean landchecksameprocess (tynetworkaddress *adr) {
-	
+#if TARGET_API_MAC_CARBON == 1
+#	pragma unused (adr)
+#endif
 	/*
 	3/9/92 dmb: if GetProcessSerialNumberFromPortName returns an error, leave 
 	flsendingtoself false, but return true.  adr may be a valid port that 
@@ -426,7 +428,7 @@
 #else
 
 pascal boolean landstring2networkaddress (ConstStr255Param bsadr, tynetworkaddress *adr) {
-
+#pragma unused (bsadr, adr)
 	/*
 	2004-10-21 aradke: Can't do this on Carbon, send back a bogus error.
 	*/
@@ -444,9 +446,8 @@
 	//we don't do anything on Carbon because we can't use this anyway.
 
 static pascal Boolean landbrowserfilter (LocationNamePtr ln, PortInfoPtr port) {
+#pragma unused (ln)
 	
-	#pragma unused (ln)
-	
 	register hdllandglobals hg;
 	register tyapplicationid id;
 	long type;
@@ -491,7 +492,9 @@
 
 
 pascal boolean landbrowsenetworkapps (ConstStr255Param bsprompt, tynetworkaddress *adr, tyapplicationid id) {
-	
+#if TARGET_API_MAC_CARBON
+#	pragma unused (bsprompt, adr, id)
+#endif
 	/*
 	7/15/91 DW: return false on system 6.
 	
@@ -1055,7 +1058,7 @@
 
 
 static pascal OSErr landsystem7replyroutine (AppleEvent *message, AppleEvent *reply, long refcon) {
-
+#pragma unused (reply, refcon)
 	/*
 	10/24/91 dmb: created.
 	
@@ -1090,6 +1093,7 @@
 
 
 static pascal OSErr landsystem7openapproutine (AppleEvent *message, AppleEvent *reply, long refcon) {
+#pragma unused(reply, message, refcon)
 
 	/*
 	this is the dispatch routine for the open application (required) core event.
@@ -1165,7 +1169,7 @@
 
 
 static pascal OSErr landsystem7opendocsroutine (AppleEvent *message, AppleEvent *reply, long refcon) {
-
+#pragma unused (reply, refcon)
 	/*
 	this is the dispatch routine for the open documents (required) core event.
 	*/
@@ -1192,7 +1196,7 @@
 
 
 static pascal OSErr landsystem7quitapproutine (AppleEvent *message, AppleEvent *reply, long refcon) {
-
+#pragma unused (message, reply, refcon)
 	/*
 	this is the dispatch routine for the quit application (required) core event.
 	
@@ -1332,13 +1336,13 @@
 
 
 static pascal Boolean landsystem7idleroutine (EventRecord *ev, long *sleep, RgnHandle *mousergn) {
+#pragma unused (sleep, mousergn)
 	
 	/*
 	10/23/91 dmb: we now pass the event through to the application so it can 
 	respond to it
 	*/
 	
-	#pragma unused (sleep, mousergn)
 	
 	if (landbreakembrace (ev)) /*user holding down cmd, option and shift keys*/
 		return (-1); /*stop waiting*/
@@ -2037,7 +2041,8 @@
 
 
 static pascal OSErr whyinternational (DescType itxt, const void *x, Size len, DescType text, SInt32 refcon, AEDesc *result) {
-	
+#pragma unused (itxt, refcon)
+
 	if (*(short *) x != smRoman) /*can't treat this as plain text*/
 		return (errAECoercionFail);
 	


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

SF.net SVN: frontierkernel: [1190] Frontier/trunk/Common/UserLandIACToolkit/landgetparam.c

[<kar...@us...>]

Revision: 1190
Author:   karstenw
Date:     2006-04-05 14:16:40 -0700 (Wed, 05 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1190&view=rev

Log Message:
-----------
nil dereference fix

Modified Paths:
--------------
    Frontier/trunk/Common/UserLandIACToolkit/landgetparam.c
Modified: Frontier/trunk/Common/UserLandIACToolkit/landgetparam.c
===================================================================
--- Frontier/trunk/Common/UserLandIACToolkit/landgetparam.c	2006-04-04 19:02:48 UTC (rev 1189)
+++ Frontier/trunk/Common/UserLandIACToolkit/landgetparam.c	2006-04-05 21:16:40 UTC (rev 1190)
@@ -138,29 +138,35 @@
 pascal boolean landgetlongparam (hdlverbrecord hverb, typaramkeyword key, long *x) {
 	
 	typaramrecord param;
-	
+	Handle			 theData;
+	boolean			 done = false;
+
 	if (!landgetparam (hverb, key, longtype, &param)) 
 		return (false);
 
-	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
-	
-		{		
-		Handle h;
-		
-		copydatahandle (&(param.desc), &h);
-		
-		*x = **(long **) h;
-		}
-	
-	#else
-	
-		*x = **(long **) param.desc.dataHandle;
-	
-	#endif
-	
+	/* kw - 2006-02-19 --- don't dereference the nil handle... */
+#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
+
+	if (copydatahandle (&(param.desc), &theData))
+	{
+		lockhandle(theData);
+
+		*x = **(long **) theData;
+
+		unlockhandle(theData);
+
+		disposehandle (theData);
+
+		done = true;
+	}
+#else
+	done = true;
+	*x = **(long **) param.desc.dataHandle;
+#endif
+
 	landdisposeparamrecord (&param);
 	
-	return (true);
+	return (done);
 	} /*landgetlongparam*/
 	
 


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