frontierkernel-commits — Mailing list for Subversion commit messages.

[frontierkernel-commits] Frontier/Common/source fileverbs.c,1.2,1.3 filedialog.c,1.2,1.3 resources.c,1.2,1.3 fileops.c,1.3,1.4

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3038

Modified Files:
	fileverbs.c filedialog.c resources.c fileops.c 
Log Message:
Fixed GCC compiler warnings.

Index: resources.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/resources.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** resources.c	23 Oct 2004 22:50:19 -0000	1.2
--- resources.c	29 Oct 2004 19:58:27 -0000	1.3
***************
*** 218,222 ****
  			return (false);
  		
! 		/*SetResInfo (hresource, id, bsname); /*set the name of the resource*/
  		
  		ChangedResource (hresource);
--- 218,222 ----
  			return (false);
  		
! 		//SetResInfo (hresource, id, bsname); /*set the name of the resource*/
  		
  		ChangedResource (hresource);

Index: fileops.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/fileops.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fileops.c	23 Oct 2004 22:18:51 -0000	1.3
--- fileops.c	29 Oct 2004 19:58:27 -0000	1.4
***************
*** 1410,1447 ****
  	} /*largefilebuffer*/
  
- /*
- static boolean xlargefilebuffer (Handle *hbuffer) {
- 	
- 	/*
- 	allocate a "large" buffer for a file copy or some kind of transfer.
- 	
- 	we compact the application heap, and then ask for half of what's
- 	available, divisble by 1024.
- 
- 	we think this is a particularly efficient size for the FS routines.
- 	is it?
- 	
- 	12/30/91 dmb: generate memoryerror when returning false.
- 	%/
- 	
- 	register long ctbytes;
- 	
- 	ctbytes = CompactMem (maxSize); /*compact the heap, find out how much is free%/
- 	
- 	ctbytes = ctbytes / 2; /*we'll ask for approx half of the memory available%/
- 	
- 	if (ctbytes < 1024) { /*couldn't allocate a minimum size block%/
- 		
- 		memoryerror ();
- 		
- 		*hbuffer = nil;
- 		
- 		return (false);
- 		}
- 		
- 	ctbytes = (ctbytes / 1024) * 1024; /*an even multiple of 1024%/
- 	
- 	return (newhandle (ctbytes, hbuffer)); /*shouldn't fail at this point, but let's be sure%/
- 	} /*xlargefilebuffer*/
  
  #ifdef MACVERSION
--- 1410,1413 ----
***************
*** 1888,1892 ****
  		
  		/*
! 		if (!directorytopath (dirid, vnum, bspath)) /*shouldn't fail%/
  			errcode = dirNFErr;
  		*/
--- 1854,1858 ----
  		
  		/*
! 		if (!directorytopath (dirid, vnum, bspath)) /%shouldn't fail%/
  			errcode = dirNFErr;
  		*/
***************
*** 2272,2301 ****
  
  
- /*
- boolean renamevolume (bsoldname, bsnewname) bigstring bsoldname, bsnewname; {
- 	
- 	/*
- 	6/x/91 mao
- 	%/
- 	
- 	short vnum;
- 	HParamBlockRec pb;
- 	
- 	if (!pathtovolume (bsoldname, &vnum))
- 		return (false);
- 	
- 	clearbytes (&pb, sizeof (pb));
- 	
- 	pb.volumeParam.ioVRefNum = vnum;
- 	
- 	if (oserror (PBHGetVInfoSync (&pb)))
- 		return (false);
- 		
- 	pb.volumeParam.ioNamePtr = bsnewname;
- 	
- 	return (!oserror (PBSetVInfoSync (&pb)));
- 	} /*renamevolume*/
- 
- 
  boolean lockvolume (const tyfilespec *fs, boolean fllock) {
  #ifdef MACVERSION
--- 2238,2241 ----
***************
*** 2346,2383 ****
  
  
- /*
- static boolean xlockvolume (bigstring bsname, boolean fllock) {
- 	
- 	/*
- 	6/x/91 mao
- 	%/
- 	
- 	short vnum;
- 	HParamBlockRec pb;
- 	
- 	if (!pathtovolume (bsname, &vnum))
- 		return (false);
- 	
- 	clearbytes (&pb, sizeof (pb));
- 	
- 	pb.volumeParam.ioVRefNum = vnum;
- 	
- 	if (oserror (PBHGetVInfoSync (&pb)))
- 		return (false);
- 	
- 	if (fllock)
- 		BitSet (&pb.volumeParam.ioVAtrb, 0);
- 	else
- 		BitClr (&pb.volumeParam.ioVAtrb, 0);
- 	
- 	if (oserror (PBSetVInfoSync (&pb)))
- 		return (false);
- 	
- 	PBFlushVolSync (&pb);
- 	
- 	return (true);
- 	} /*lockvolume*/
- 
- 
  #ifdef WIN95VERSION
  boolean findapplication (OSType creator, tyfilespec *fsapp) {
--- 2286,2289 ----
***************
*** 2440,2444 ****
  boolean drivenumtovolname (short drivenum, bigstring bsvol) {
  	
! 	ParamBlockRec pb;
  	
  	clearbytes (&pb, sizeof (pb));
--- 2346,2350 ----
  boolean drivenumtovolname (short drivenum, bigstring bsvol) {
  	
! 	HParamBlockRec pb;
  	
  	clearbytes (&pb, sizeof (pb));
***************
*** 2570,2574 ****
  
  
! /*
  static boolean getdesktopdatabasepath (short vnum, DTPBRec *dt) {
  	
--- 2476,2481 ----
  
  
! #if 0
! 
  static boolean getdesktopdatabasepath (short vnum, DTPBRec *dt) {
  	
***************
*** 2581,2584 ****
--- 2488,2493 ----
  	} /*getdesktopdatabasepath*/
  
+ #endif
+ 
  
  boolean getfilecomment (const tyfilespec *fs, bigstring bscomment) {
***************
*** 2835,2843 ****
  
  #ifdef NEWFILESPECTYPE
! boolean fileparsevolname (bigstring bspath, long *vnum, bigstring bsvol) {
  #else
! boolean fileparsevolname (bigstring bspath, short *vnum, bigstring bsvol) {
  #endif
! 
  	/*
  	convert a full path, which might contain a volume name at the beginning
--- 2744,2752 ----
  
  #ifdef NEWFILESPECTYPE
! boolean fileparsevolname (bigstring bspath, long *vnum, bigstring bsvol)
  #else
! boolean fileparsevolname (bigstring bspath, short *vnum, bigstring bsvol)
  #endif
! 	{
  	/*
  	convert a full path, which might contain a volume name at the beginning
***************
*** 2861,2865 ****
  	short ix = 1;
  	bigstring bsvolname;
! 	ParamBlockRec pb;
  	short drivenum;
  	bigstring bs;
--- 2770,2774 ----
  	short ix = 1;
  	bigstring bsvolname;
! 	HParamBlockRec pb;
  	short drivenum;
  	bigstring bs;
***************
*** 3058,3062 ****
  	} /*getfileparentfolder*/
  
! /*
  boolean getdefaultpath (bigstring bs) {
  
--- 2967,2973 ----
  	} /*getfileparentfolder*/
  
! 
! #if 0
! 
  boolean getdefaultpath (bigstring bs) {
  
***************
*** 3075,3078 ****
--- 2986,2993 ----
  	return (filegetpath (pb.fileParam.ioVRefNum, bs));
  	} /*getdefaultpath*/
+ 
+ #endif
+ 
+ 
  #endif
  

Index: fileverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/fileverbs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fileverbs.c	23 Oct 2004 22:19:25 -0000	1.2
--- fileverbs.c	29 Oct 2004 19:58:27 -0000	1.3
***************
*** 2176,2180 ****
  
  
! /*
  static boolean writewholefileverb (hdltreenode hparam1, tyvaluerecord *v) {
  
--- 2176,2181 ----
  
  
! #if 0
! 
  static boolean writewholefileverb (hdltreenode hparam1, tyvaluerecord *v) {
  
***************
*** 2197,2201 ****
  	*/
  	
- 	/*
  	tyfilespec fs;
  	tyvaluerecord val;
--- 2198,2201 ----
***************
*** 2217,2220 ****
--- 2217,2222 ----
  	} /*writewholefileverb*/
  
+ #endif
+ 
  
  static boolean comparefilesverb (hdltreenode hparam1, tyvaluerecord *v) {
***************
*** 2406,2410 ****
  	register hdltreenode hp1 = hparam1;
  	register tyvaluerecord *v = vreturned;
- 	register short errornum = 0;
  	
  	setbooleanvalue (false, v); /*by default, file functions return false*/
--- 2408,2411 ----

Index: filedialog.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/filedialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** filedialog.c	23 Oct 2004 22:17:48 -0000	1.2
--- filedialog.c	29 Oct 2004 19:58:27 -0000	1.3
***************
*** 490,500 ****
  	*/
  	
- 	//register short id;
- 	Point pt = {-1, -1};
- 	short cttypes = -1;
- 	OSType *types = nil;
  	Str255 bs;
- 	//DlgHookYDUPP sfhook = nil;
- 	//FileFilterYDUPP sffilefilter = nil;
  	tysfdata sfdata;
  	FSSpec *fs = &sfdata.sfreply.sfFile;
--- 490,494 ----
***************
*** 503,506 ****
--- 497,501 ----
  	long appA5;
  	#endif
+ 
  	//move the switch statement to below because it's smarter to call it there when using 
  	//the new routines for Nav services.
***************
*** 1085,1089 ****
  			SInt32			hSize = (sizeof(NavTypeList) +
  							sizeof(OSType) * (filetypes->cttypes - 1));
! 			newhandle(hSize, &typeList);
  			typesP = (NavTypeListPtr) *((Handle) typeList);
  			
--- 1080,1084 ----
  			SInt32			hSize = (sizeof(NavTypeList) +
  							sizeof(OSType) * (filetypes->cttypes - 1));
! 			newhandle(hSize, (Handle*) &typeList);
  			typesP = (NavTypeListPtr) *((Handle) typeList);
  			

[frontierkernel-commits] Frontier/Common/source file.c,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30977

Modified Files:
	file.c 
Log Message:
Moved prototypes for fileinit and fileshutdown to file.h to fix GCC compiler warnings in file.c. Use universal procedure pointer (UPP) for iocompletion on Mach-O.

Index: file.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/file.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** file.c	23 Oct 2004 22:17:19 -0000	1.2
--- file.c	29 Oct 2004 19:40:38 -0000	1.3
***************
*** 371,375 ****
  static boolean filereadhandlebytes (short fnum, long ctbytes, Handle *hreturned) {
  	
! 	/*
  	6/x/91 mao
  	this one is parallel to filewritehandle
--- 371,375 ----
  static boolean filereadhandlebytes (short fnum, long ctbytes, Handle *hreturned) {
  	
! 	/%
  	6/x/91 mao
  	this one is parallel to filewritehandle
***************
*** 381,385 ****
  		return (false);
  		
! 	h = *hreturned; /*copy into register%/
  		
  	if (oserror (fileread (fnum, ctbytes, *h))) {
--- 381,385 ----
  		return (false);
  		
! 	h = *hreturned; /%copy into register%/
  		
  	if (oserror (fileread (fnum, ctbytes, *h))) {
***************
*** 391,395 ****
  		
  	return (true);
! 	} /*filereadhandlebytes*/	
  
  
--- 391,396 ----
  		
  	return (true);
! 	} /%filereadhandlebytes%/
! */
  
  
***************
*** 432,450 ****
  	} /*iocompletion*/
  
! #if TARGET_RT_MAC_CFM
! 	#if !TARGET_API_MAC_CARBON
! 		static RoutineDescriptor iocompletionDesc = BUILD_ROUTINE_DESCRIPTOR (uppIOCompletionProcInfo, iocompletion);
! 		#define iocompletionUPP (&iocompletionDesc)
! 	#else
  		//looks like we need some kind of file UPP
  		//do we need to create a UPP, yes we do.
  		IOCompletionUPP	iocompletionDesc = nil;
  		#define iocompletionUPP (iocompletionDesc)
  	#endif
- #endif /*TARGET_RT_MAC_CFM*/
  
! #if TARGET_RT_MAC_MACHO
  	static IOCompletionUPP iocompletionUPP = &iocompletion;
! #endif /*TARGET_RT_MAC_MACHO*/
  
  #endif //MACVERSION
--- 433,460 ----
  	} /*iocompletion*/
  
! 
! #if TARGET_RT_MAC_CFM || TARGET_RT_MAC_MACHO
! 
! 	#if TARGET_API_MAC_CARBON
! 
  		//looks like we need some kind of file UPP
  		//do we need to create a UPP, yes we do.
  		IOCompletionUPP	iocompletionDesc = nil;
+ 
  		#define iocompletionUPP (iocompletionDesc)
+ 
+ 	#else
+ 
+ 		static RoutineDescriptor iocompletionDesc = BUILD_ROUTINE_DESCRIPTOR (uppIOCompletionProcInfo, iocompletion);
+ 
+ 		#define iocompletionUPP (&iocompletionDesc)
+ 
  	#endif
  
! #else
! 
  	static IOCompletionUPP iocompletionUPP = &iocompletion;
! 
! #endif
  
  #endif //MACVERSION
***************
*** 478,499 ****
  //Code change by Timothy Paustian Wednesday, July 26, 2000 10:52:49 PM
  //new routine to create UPPS for the async file saves.
! 
! extern void fileinit ();
! 
! void fileinit()
! {
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	if(iocompletionDesc == nil)
  		iocompletionDesc = NewIOCompletionUPP(iocompletion);
  	#endif
! }
! extern void fileshutdown ();
! void fileshutdown()
! {
! 	#if TARGET_API_MAC_CARBON  && TARGET_RT_MAC_CFM
  	if(iocompletionDesc != nil)
  		DisposeIOCompletionUPP(iocompletionDesc);
  	#endif
! }
  
  static boolean filecreateandopen (const tyfilespec *fs, OSType creator, OSType filetype, hdlfilenum *fnum) {
--- 488,507 ----
  //Code change by Timothy Paustian Wednesday, July 26, 2000 10:52:49 PM
  //new routine to create UPPS for the async file saves.
! void fileinit (void) {
! 	#if TARGET_API_MAC_CARBON
  	if(iocompletionDesc == nil)
  		iocompletionDesc = NewIOCompletionUPP(iocompletion);
  	#endif
! 	} /*fileinit*/
! 
! 
! void fileshutdown(void) {
! 
! 	#if TARGET_API_MAC_CARBON
  	if(iocompletionDesc != nil)
  		DisposeIOCompletionUPP(iocompletionDesc);
  	#endif
! 	} /*fileshutdown*/
! 
  
  static boolean filecreateandopen (const tyfilespec *fs, OSType creator, OSType filetype, hdlfilenum *fnum) {

[frontierkernel-commits] Frontier/Common/headers file.h,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30721

Modified Files:
	file.h 
Log Message:
Moved prototypes for fileinit and fileshutdown to file.h to fix GCC compiler warnings in file.c.

Index: file.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/file.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** file.h	28 Oct 2004 22:59:21 -0000	1.2
--- file.h	29 Oct 2004 19:39:24 -0000	1.3
***************
*** 277,280 ****
--- 277,284 ----
  extern boolean newfile (const tyfilespec *, OSType, OSType);
  
+ extern void fileinit (void);
+ 
+ extern void fileshutdown (void);
+ 
  extern boolean fileopenorcreate (const tyfilespec *, OSType, OSType, hdlfilenum *);
  

[frontierkernel-commits] Frontier/Common/source shell.c,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30639

Modified Files:
	shell.c 
Log Message:
Moved prototypes for fileinit and fileshutdown to file.h to fix GCC compiler warnings in file.c.

Index: shell.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shell.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shell.c	23 Oct 2004 22:52:10 -0000	1.2
--- shell.c	29 Oct 2004 19:39:12 -0000	1.3
***************
*** 202,208 ****
  #endif
  
  extern void shellshutdownscroll ();
  
- extern void fileshutdown ();
  
  boolean shellshutdown (void) {
--- 202,208 ----
  #endif
  
+ 
  extern void shellshutdownscroll ();
  
  
  boolean shellshutdown (void) {
***************
*** 1163,1168 ****
  extern void shellinitscroll ();
  
- extern void fileinit ();
- 
  
  boolean shellinit (void) {
--- 1163,1166 ----

[frontierkernel-commits] Frontier/FrontierSDK/Toolkits/AppletToolkit/Source applettextedit.c,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/AppletToolkit/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28057

Modified Files:
	applettextedit.c 
Log Message:
Fixed GCC  compiler warnings.

Index: applettextedit.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/AppletToolkit/Source/applettextedit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** applettextedit.c	23 Oct 2004 21:18:03 -0000	1.2
--- applettextedit.c	29 Oct 2004 19:27:24 -0000	1.3
***************
*** 90,96 ****
  		case rightjustified:
  			return (teJustRight);
  		} /*switch*/
- 
- 	return (teJustLeft);
  	} /*getTEjustification*/
  	
--- 90,97 ----
  		case rightjustified:
  			return (teJustRight);
+ 		
+ 		default:
+ 			return (teJustLeft);
  		} /*switch*/
  	} /*getTEjustification*/
  	
***************
*** 247,251 ****
  	olddest = (**macbuffer).destRect; 
  	
! 	oldport = (**macbuffer).inPort;
  	
  	(**macbuffer).viewRect = rport;
--- 248,252 ----
  	olddest = (**macbuffer).destRect; 
  	
! 	oldport = (WindowPtr) (**macbuffer).inPort;	/* inPort is a GrafPtr */
  	
  	(**macbuffer).viewRect = rport;
***************
*** 253,257 ****
  	(**macbuffer).destRect = rport;
  	
! 	(**macbuffer).inPort = w;
  	
  	TEUpdate (&rport, macbuffer);
--- 254,258 ----
  	(**macbuffer).destRect = rport;
  	
! 	(**macbuffer).inPort = (GrafPtr) w;
  	
  	TEUpdate (&rport, macbuffer);
***************
*** 261,265 ****
  	(**macbuffer).destRect = olddest;
  	
! 	(**macbuffer).inPort = oldport;
  	} /*editupdateport*/
  	
--- 262,266 ----
  	(**macbuffer).destRect = olddest;
  	
! 	(**macbuffer).inPort = (GrafPtr) oldport;
  	} /*editupdateport*/
  	

[frontierkernel-commits] Frontier/build_XCode/Frontier.xcode project.pbxproj,1.9,1.10

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24555

Modified Files:
	project.pbxproj 
Log Message:
Disabled ZeroLink feature in Development build style because it does not seem to work consistently with the Paige static library.

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode/project.pbxproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** project.pbxproj	28 Oct 2004 19:59:38 -0000	1.9
--- project.pbxproj	29 Oct 2004 19:13:54 -0000	1.10
***************
*** 51,55 ****
  				GCC_WARN_UNKNOWN_PRAGMAS = YES;
  				REZ_PREPROCESSOR_DEFINITIONS = "";
! 				ZERO_LINK = YES;
  			};
  			isa = PBXBuildStyle;
--- 51,55 ----
  				GCC_WARN_UNKNOWN_PRAGMAS = YES;
  				REZ_PREPROCESSOR_DEFINITIONS = "";
! 				ZERO_LINK = NO;
  			};
  			isa = PBXBuildStyle;

[frontierkernel-commits] Frontier/Common/source oplist.c,1.2,1.3 langlist.c,1.2,1.3

[Henri A. <has...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18283

Modified Files:
	oplist.c langlist.c 
Log Message:
Added opunshifthandle() to make list additions more efficient and logical: we now only iterate through the smaller list, pushing into the longer list if the longer list is on the left side of the operand, and unshifting into the longer list if it's on the right side of the operand.

Index: oplist.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** oplist.c	23 Oct 2004 22:42:17 -0000	1.2
--- oplist.c	29 Oct 2004 09:02:22 -0000	1.3
***************
*** 240,243 ****
--- 240,322 ----
  	} /*oppushhandle*/
  	
+ 	
+ boolean opunshifthandle (hdllistrecord hlist, ptrstring pname, Handle hdata) {
+ 	
+ 	/*
+ 	add a new item at the beginning of the list.  link in the indicated handle in the
+ 	refcon field of the allocated headrecord.  return false if there's an allocation
+ 	error.
+ 	*/
+ 	
+ 	register hdllistrecord h = hlist;
+ 	register hdlheadrecord hstart;
+ 	register hdloutlinerecord ho;
+ 	register long ctitems;
+ 	hdlheadrecord hnew;
+ 	bigstring bs;
+ 	
+ 	if ((**h).isrecord && (pname == nil))
+ 		goto error;
+ 
+ 	ho = (hdloutlinerecord) (**h).houtline;
+ 	
+ 	if (!oppushoutline (ho))
+ 		goto error;
+ 	
+ 	ctitems = (**h).ctitems;
+ 	
+ 	copystring (pname, bs); /*checks for nil*/
+ 	
+ 	if (ctitems == 0) { /*adding to an empty list*/
+ 		
+ 		hnew = (**ho).hsummit; /*set this guy's refcon handle*/
+ 		
+ 		opsetheadstring (hnew, bs);
+ 		}
+ 		
+ 	else {
+ 		hstart = (**ho).hsummit;
+ 
+ 		if (!opaddheadline (hstart, up, bs, &hnew)) {
+ 
+ 			oppopoutline ();
+ 
+ 			goto error;
+ 			}
+ 		
+ 		(**ho).ctexpanded++;
+ 		
+ 		(**hnew).flexpanded = true;
+ 		}
+ 	
+ 	#ifdef fldebug
+ 	
+ 	if (fldebugging) {
+ 		
+ 		copystring ((ptrstring) "\x0A" "headline #", bs);
+ 		
+ 		pushint (ctitems + 1, bs);
+ 		
+ 		opsetheadstring (hnew, bs);
+ 		}
+ 	
+ 	#endif
+ 	
+ 	(**hnew).hrefcon = hdata; /*link in the user's data structure*/
+ 	
+ 	(**h).ctitems++;
+ 
+ 	oppopoutline ();
+ 
+ 	return (true);
+ 
+ 	error:
+ 		
+ 		disposehandle (hdata);
+ 
+ 		return (false);
+ 	} /*opunshifthandle*/
+ 	
+ 
  
  boolean oppushdata (hdllistrecord hlist, ptrstring pname, ptrvoid pdata, long ctbytes) {

Index: langlist.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langlist.c	23 Oct 2004 22:28:09 -0000	1.2
--- langlist.c	29 Oct 2004 09:02:23 -0000	1.3
***************
*** 892,933 ****
  	5.0.2b10 dmb: since we throw away v1 and v2, we can boost performance
  	by adding directly to v1 and making that the return value.
  	*/
  	
! 	hdllistrecord list1 = (*v1).data.listvalue;
! 	hdllistrecord list2 = (*v2).data.listvalue;
  	hdllistrecord list3;
! 	long i, n;
  	Handle hitem, hignore;
  	bigstring key;
  	
! 	//if (!copyvaluerecord (*v1, vreturned))
! 	//	return (false);
! 	
! 	*vreturned = *v1;
  	
! 	initvalue (v1, novaluetype);
  
! 	list3 = (*vreturned).data.listvalue;
  
! 	n = opcountlistitems (list2);
! 	
! 	for (i = 1; i <= n; ++i) { /*copy values over from second list*/
! 		
! 		if (!opgetlisthandle (list2, i, key, &hitem))
! 			return (false);
  		
! 		if (!copyhandle (hitem, &hitem))
! 			return (false);
! 
! 		if ((**list3).isrecord) {
  			
! 			if (opgetlisthandle (list3, -1, key, &hignore))
! 				disposehandle (hitem);
  			else
  				oppushhandle (list3, key, hitem);
! 			}
! 		else
! 			oppushhandle (list3, nil, hitem);
! 		}
  	
  	return (true);
--- 892,962 ----
  	5.0.2b10 dmb: since we throw away v1 and v2, we can boost performance
  	by adding directly to v1 and making that the return value.
+ 	
+ 	10.0a1 hra: we were always looping through v2, so adding a long list to a small
+ 	list was significantly slower (2x or more) than adding the small list to the long
+ 	list. Now we always loop through the shortest of the 2 lists.
  	*/
  	
! 	hdllistrecord list2;
  	hdllistrecord list3;
! 	long i, n, m, min_mn;
  	Handle hitem, hignore;
  	bigstring key;
  	
! 	m = opcountlistitems ((*v1).data.listvalue);
! 	n = opcountlistitems ((*v2).data.listvalue);
  	
! 	if ( m > n ) { /* the first list is longer than the second: append to the first */
! 		list2 = (*v2).data.listvalue;
! 		*vreturned = *v1;
! 		initvalue (v1, novaluetype);
  
! 		list3 = (*vreturned).data.listvalue;
  
! 		for (i = 1; i <= n; ++i) { /*copy values over from second list*/
  		
! 			if (!opgetlisthandle (list2, i, key, &hitem))
! 				return (false);
  			
! 			if (!copyhandle (hitem, &hitem))
! 				return (false);
! 
! 			if ((**list3).isrecord) {
! 				
! 				if (opgetlisthandle (list3, -1, key, &hignore))
! 					disposehandle (hitem);
! 				else
! 					oppushhandle (list3, key, hitem);
! 				}
  			else
  				oppushhandle (list3, key, hitem);
! 			} /*for*/
! 
! 	} else { /* the second list is longer than the first: prepend to the second */
! 		list2 = (*v1).data.listvalue;
! 		*vreturned = *v2;
! 		initvalue (v2, novaluetype);
! 		
! 		list3 = (*vreturned).data.listvalue;
! 		
! 		for (i = m; i >= 1; --i) { /*copy values over from first list, in reverse*/
! 		
! 			if (!opgetlisthandle (list2, i, key, &hitem))
! 				return (false);
! 			
! 			if (!copyhandle (hitem, &hitem))
! 				return (false);
! 
! 			if ((**list3).isrecord) {
! 				
! 				if (opgetlisthandle (list3, -1, key, &hignore))
! 					disposehandle (hitem);
! 				else
! 					opunshifthandle (list3, key, hitem);
! 				}
! 			else
! 				opunshifthandle (list3, key, hitem);
! 			} /*for*/
! 	}		
  	
  	return (true);
***************
*** 1056,1060 ****
--- 1085,1093 ----
  			
  			break;
+ 		
+ 		default:
+ 			break;
  		}
+ 
  	
  	for (; ix1 <= ix2; ++ix1) {

[frontierkernel-commits] Frontier/Common/headers oplist.h,1.1,1.2

[Henri A. <has...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18248

Modified Files:
	oplist.h 
Log Message:
Added opunshifthandle() to make list additions more efficient and logical: we now only iterate through the smaller list, pushing into the longer list if the longer list is on the left side of the operand, and unshifting into the longer list if it's on the right side of the operand.

Index: oplist.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/oplist.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** oplist.h	9 Oct 2004 21:02:40 -0000	1.1
--- oplist.h	29 Oct 2004 09:02:16 -0000	1.2
***************
*** 55,58 ****
--- 55,60 ----
  extern boolean oppushhandle (hdllistrecord, ptrstring, Handle);
  
+ extern boolean opunshifthandle (hdllistrecord, ptrstring, Handle);
+ 
  extern boolean oppushdata (hdllistrecord, ptrstring, ptrvoid, long);
  

[frontierkernel-commits] Frontier/Common/source findinfile.c,1.2,1.3 kb.c,1.2,1.3 filelaunch.c,1.2,1.3 filealias.c,1.2,1.3

[Henri A. <has...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32487

Modified Files:
	findinfile.c kb.c filelaunch.c filealias.c 
Log Message:
Removed some gcc warnings.

Index: filelaunch.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/filelaunch.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** filelaunch.c	23 Oct 2004 22:18:00 -0000	1.2
--- filelaunch.c	29 Oct 2004 07:25:21 -0000	1.3
***************
*** 43,47 ****
  #define kAEPrintSelection 'spri'
  
! 
  static ProcessSerialNumber FinderNumber;
  //Code change by Timothy Paustian Wednesday, June 21, 2000 4:04:43 PM
--- 43,48 ----
  #define kAEPrintSelection 'spri'
  
! #if TARGET_API_MAC_CARBON == 1
! #else
  static ProcessSerialNumber FinderNumber;
  //Code change by Timothy Paustian Wednesday, June 21, 2000 4:04:43 PM
***************
*** 49,55 ****
  //to do is launch an application, lets try that.
  static OSErr GetFinderPort(void) {
- 	#if TARGET_API_MAC_CARBON == 1
- 	return noErr;
- 	#else
  		
  	IPCListPortsPBRec ipc;
--- 50,53 ----
***************
*** 89,95 ****
  		return 0;
  	};
- 	#endif
  		
  }
  
  /*
--- 87,93 ----
  		return 0;
  	};
  		
  }
+ #endif
  
  /*

Index: filealias.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/filealias.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** filealias.c	23 Oct 2004 22:17:31 -0000	1.2
--- filealias.c	29 Oct 2004 07:25:21 -0000	1.3
***************
*** 80,89 ****
  	// Forward declarations
  	
! Boolean FSpIsVolume(const FSSpec* fsSpec);
! Boolean FSpIsFolder(const FSSpec* fsSpec, long* dirID, unsigned short* fdFlags);
! Boolean CopyCustomIcons(const FSSpec* source, short sourceID,
  							short destRefnum, short destID);
! Boolean CopyDriverIcon(const FSSpec* volSpec, short destRefnum, short destID);
! OSErr DetermineAliasInfo(const FSSpec* fsSpec, OSType* creator, OSType* fType,
  							Boolean* gotCustom, FSSpec* iconSpec, short* rsrcID, unsigned short* fdFlags);
  
--- 80,89 ----
  	// Forward declarations
  	
! static Boolean FSpIsVolume(const FSSpec* fsSpec);
! static Boolean FSpIsFolder(const FSSpec* fsSpec, long* dirID, unsigned short* fdFlags);
! static Boolean CopyCustomIcons(const FSSpec* source, short sourceID,
  							short destRefnum, short destID);
! static Boolean CopyDriverIcon(const FSSpec* volSpec, short destRefnum, short destID);
! static OSErr DetermineAliasInfo(const FSSpec* fsSpec, OSType* creator, OSType* fType,
  							Boolean* gotCustom, FSSpec* iconSpec, short* rsrcID, unsigned short* fdFlags);
  

Index: kb.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/kb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** kb.c	23 Oct 2004 22:22:41 -0000	1.2
--- kb.c	29 Oct 2004 07:25:21 -0000	1.3
***************
*** 435,439 ****
  void keyboardsetescape (void) {
  	
! 	/*ouch (); /*audible feedback asap, multimedia!*/
  	
  	/*
--- 435,439 ----
  void keyboardsetescape (void) {
  	
! 	/*ouch (); %*audible feedback asap, multimedia!*/
  	
  	/*
***************
*** 516,520 ****
  	
  	return (keydown (75));
! 	} /*enterkeydown*/
  	
  	
--- 516,520 ----
  	
  	return (keydown (75));
! 	} %*enterkeydown*/
  	
  	

Index: findinfile.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/findinfile.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** findinfile.c	23 Oct 2004 22:19:51 -0000	1.2
--- findinfile.c	29 Oct 2004 07:25:21 -0000	1.3
***************
*** 385,389 ****
  	*/
  	
- 	register long ctmatches = 0;
  	hdlfilenum fnum1 = 0, fnum2 = 0;
  	Handle hbuffer1 = nil, hbuffer2 = nil;
--- 385,388 ----

[frontierkernel-commits] Frontier/Common/UserLandIACToolkit landqueue.c,1.2,1.3

[Henri A. <has...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32460

Modified Files:
	landqueue.c 
Log Message:
Removed some gcc warnings.

Index: landqueue.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landqueue.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** landqueue.c	23 Oct 2004 21:30:56 -0000	1.2
--- landqueue.c	29 Oct 2004 07:25:10 -0000	1.3
***************
*** 48,52 ****
  	register hdllandglobals hg = landgetglobals ();
  	register hdlqueuerecord x;
! 	register hdlqueuerecord hlast;
  	register short queuedepth = 0;
  	hdlqueuerecord hnew;
--- 48,52 ----
  	register hdllandglobals hg = landgetglobals ();
  	register hdlqueuerecord x;
! 	register hdlqueuerecord hlast = nil;
  	register short queuedepth = 0;
  	hdlqueuerecord hnew;

[frontierkernel-commits] Frontier/Common/source OpenTransportNetEvents.c,1.4,1.5

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16550/Frontier/Common/source

Modified Files:
	OpenTransportNetEvents.c 
Log Message:
OTLink and OTLIFO variables must be aligned on 32-bit boundaries. I forgot this when I fixed a compiler warning in the previous revision by changing the type of the flags in the tylistenrecord and tyendpointrecord from UInt32 to UInt8. Some OTLIFO/OTLink elements in these records ended up off-boundary and the app froze hard during startup. Moving the OTLIFO/OTLINK elements to the top of the records should take care of the problem.

Index: OpenTransportNetEvents.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/OpenTransportNetEvents.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OpenTransportNetEvents.c	28 Oct 2004 22:07:07 -0000	1.4
--- OpenTransportNetEvents.c	29 Oct 2004 00:12:20 -0000	1.5
***************
*** 327,334 ****
  	long	ctwaiting;
  	} tyepstatsrecord;
  	
  typedef struct tylistenrecord {
  	EndpointRef			ep;
- 	UInt8				stateflags;
  	OTLink				validationlink;		/* Link into an OT FIFO (not atomic) */
  	OTLIFO				idleEPs;			/* Endpoints ready to accept a new incoming connection */
--- 327,337 ----
  	long	ctwaiting;
  	} tyepstatsrecord;
+ 
+ /*
+ 	2004-10-28 aradke: OTLink and OTLIFO must be aligned on 32-bit boundaries!
+ */
  	
  typedef struct tylistenrecord {
  	EndpointRef			ep;
  	OTLink				validationlink;		/* Link into an OT FIFO (not atomic) */
  	OTLIFO				idleEPs;			/* Endpoints ready to accept a new incoming connection */
***************
*** 336,339 ****
--- 339,343 ----
  	OTLIFO				readyEPs;			/* Ready to be picked up by the worker thread which will spawn a thread to call the daemon */
  	OTLIFO				waitingEPs;			/* Endpoints waiting to complete an orderly disconnect */
+ 	UInt8				stateflags;
  	OTConfigurationRef	masterconfig;
  	EndpointRecordRef	acceptors;

[frontierkernel-commits] Frontier/Common/source quickdraw.c,1.2,1.3

[Henri A. <has...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16335

Modified Files:
	quickdraw.c 
Log Message:
Warnings fixes.

Index: quickdraw.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/quickdraw.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** quickdraw.c	23 Oct 2004 22:49:57 -0000	1.2
--- quickdraw.c	29 Oct 2004 00:10:58 -0000	1.3
***************
*** 70,73 ****
--- 70,75 ----
  RGBColor blackcolor = {0, 0, 0};
  
+ RGBColor greencolor = {0, 32767, 0};
+ 
  RGBColor lightbluecolor = {52428, 52428, 65535};
  
***************
*** 406,410 ****
  	CGrafPtr	thePort;
  	#if TARGET_API_MAC_CARBON == 1
! 	thePort = GetWindowPort(scratchport);
  	#else
  	thePort = (CGrafPtr)scratchport;
--- 408,412 ----
  	CGrafPtr	thePort;
  	#if TARGET_API_MAC_CARBON == 1
! 	thePort = scratchport; /* hra: scratchport is already a CGrafPtr, not a WindowPtr */
  	#else
  	thePort = (CGrafPtr)scratchport;
***************
*** 1399,1403 ****
  		(*r).right++;
  		}
! 	} /*evenrectangle*/
  	
  
--- 1401,1405 ----
  		(*r).right++;
  		}
! 	} %*evenrectangle*/
  	
  
***************
*** 1420,1424 ****
  		(*r).right++;
  		}
! 	} /*oddrectangle*/
  	
  
--- 1422,1426 ----
  		(*r).right++;
  		}
! 	} %*oddrectangle*/
  	
  
***************
*** 2561,2565 ****
  				(*rconstrain).top += doctitlebarheight;
  			
! 			/*
  			titleheight = (**(*wpeek).contRgn).rgnBBox.top - (**(*wpeek).strucRgn).rgnBBox.top;
  			
--- 2563,2567 ----
  				(*rconstrain).top += doctitlebarheight;
  			
! 			%*
  			titleheight = (**(*wpeek).contRgn).rgnBBox.top - (**(*wpeek).strucRgn).rgnBBox.top;
  			
***************
*** 2624,2628 ****
  	accountfortitlebar (w, &rscreen);
  	
! 	/***insetrect (&rscreen, 3, 3); /*an aesthetic border of desktop*/
  	
  	return (constraintorect (rparam, rscreen, false)); /*4.1b7 dmb: flcenter parm was true*/
--- 2626,2630 ----
  	accountfortitlebar (w, &rscreen);
  	
! 	/***insetrect (&rscreen, 3, 3); %*an aesthetic border of desktop*/
  	
  	return (constraintorect (rparam, rscreen, false)); /*4.1b7 dmb: flcenter parm was true*/
***************
*** 2784,2788 ****
  
  
! boolean colorenabled () {
  	
  	/*
--- 2786,2790 ----
  
  
! boolean colorenabled (void) {
  	
  	/*
***************
*** 2872,2876 ****
  	
  	return (true);
! 	} /*getclut*/
  
  /*
--- 2874,2878 ----
  	
  	return (true);
! 	} %*getclut*/
  
  /*
***************
*** 2884,2888 ****
  		return (false);
  		
! 	/*
  	if (!getclut (128, &hctab))
  		return (false);
--- 2886,2890 ----
  		return (false);
  		
! 	%*
  	if (!getclut (128, &hctab))
  		return (false);
***************
*** 2892,2896 ****
  	
  	return (true);
! 	} /*getcolorfromindex*/
  
  #endif /*flruntime*/
--- 2894,2898 ----
  	
  	return (true);
! 	} %*getcolorfromindex*/
  
  #endif /*flruntime*/

[frontierkernel-commits] Frontier/Common/headers quickdraw.h,1.1,1.2

[Henri A. <has...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16320

Modified Files:
	quickdraw.h 
Log Message:
Warnings fixes.

Index: quickdraw.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/quickdraw.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** quickdraw.h	9 Oct 2004 21:05:42 -0000	1.1
--- quickdraw.h	29 Oct 2004 00:10:54 -0000	1.2
***************
*** 247,251 ****
  extern boolean systemhascolor (void);
  
! extern boolean colorenabled ();
  
  extern short iscolorport (CGrafPtr);
--- 247,251 ----
  extern boolean systemhascolor (void);
  
! extern boolean colorenabled (void);
  
  extern short iscolorport (CGrafPtr);

[frontierkernel-commits] Frontier/Common/source opdisplay.c,1.2,1.3

[Henri A. <has...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16075

Modified Files:
	opdisplay.c 
Log Message:
Centralized all colors into quickdraw.c.

Index: opdisplay.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opdisplay.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** opdisplay.c	23 Oct 2004 22:39:22 -0000	1.2
--- opdisplay.c	29 Oct 2004 00:09:40 -0000	1.3
***************
*** 49,68 ****
  
  
- static RGBColor lightgreencolor = {52428, 65535, 52428};
- 
- static RGBColor lightredcolor = {65535, 52428, 52428};
- 
- static RGBColor darkredcolor = {32767, 0, 0};
- 
- static RGBColor darkbluecolor = {0, 0, 32767};
- 
- static RGBColor darkgreencolor = {0, 32767, 0};
- 
- static RGBColor verydarkgreencolor = {0, 32767 / 4, 0};
- 
- static RGBColor mediumgraycolor = {52428, 52428, 52428};
- 
- static RGBColor yellowcolor = {64512, 62333, 1327}; 
- 
  static RGBColor invertedbackcolor, invertedtextcolor;
  
--- 49,52 ----

[frontierkernel-commits] Frontier/Common/IOAToolkit ioacolorpopup.c,1.2,1.3 ioacolorpopup.h,1.1,1.2

[Henri A. <has...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/IOAToolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16041

Modified Files:
	ioacolorpopup.c ioacolorpopup.h 
Log Message:
Centralized all colors into quickdraw.c.

Index: ioacolorpopup.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioacolorpopup.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ioacolorpopup.h	9 Oct 2004 20:28:40 -0000	1.1
--- ioacolorpopup.h	29 Oct 2004 00:09:35 -0000	1.2
***************
*** 37,39 ****
--- 37,44 ----
  	
  
+ extern RGBColor blackcolor, whitecolor, greencolor, lightbluecolor, lightgraycolor, graycolor, darkgraycolor;
+ 
+ extern RGBColor lightyellowcolor, lightgreencolor, lightpurplecolor, lightredcolor;
+ 
+ extern RGBColor darkredcolor, darkbluecolor, darkgreencolor, mediumgraycolor, darkpurplecolor;
  

Index: ioacolorpopup.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioacolorpopup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ioacolorpopup.c	23 Oct 2004 21:39:45 -0000	1.2
--- ioacolorpopup.c	29 Oct 2004 00:09:35 -0000	1.3
***************
*** 49,60 ****
  #define unimplementedtrap 0xA09F
  
- static RGBColor greencolor = {0, 32767, 0};
- 
- static RGBColor whitecolor = {65535, 65535, 65535};
- 
- static RGBColor blackcolor = {0, 0, 0};
- 
- static RGBColor lightbluecolor = {52428, 52428, 65535};
- 
  
  static boolean gestaltavailable (void) {
--- 49,52 ----

[frontierkernel-commits] Frontier/Common/source shellbuttons.c,1.2,1.3

[Henri A. <has...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14655

Modified Files:
	shellbuttons.c 
Log Message:
colorenabled() doesn't take any params.

Index: shellbuttons.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellbuttons.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellbuttons.c	23 Oct 2004 22:52:46 -0000	1.2
--- shellbuttons.c	29 Oct 2004 00:02:39 -0000	1.3
***************
*** 318,322 ****
  		if ((**shellwindowinfo).flwindowactive) {
  			
! 			if (colorenabled (r))
  				
  				#if TARGET_API_MAC_CARBON == 1
--- 318,322 ----
  		if ((**shellwindowinfo).flwindowactive) {
  			
! 			if (colorenabled ())
  				
  				#if TARGET_API_MAC_CARBON == 1

[frontierkernel-commits] Frontier/Common/source mac.c,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3142/Frontier/Common/source

Modified Files:
	mac.c 
Log Message:
Eliminated GCC compiler warnings.

Index: mac.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/mac.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mac.c	23 Oct 2004 22:34:43 -0000	1.2
--- mac.c	28 Oct 2004 23:08:45 -0000	1.3
***************
*** 214,218 ****
  	
  	
! getinitialfile (short ix, bigstring fname, short *vnum) {
  
  	AppFile appfilerecord;
--- 214,218 ----
  	
  	
! void getinitialfile (short ix, bigstring fname, short *vnum) {
  
  	AppFile appfilerecord;
***************
*** 260,274 ****
  
  
! #if TARGET_API_MAC_CARBON == 0
  
! int WriteToConsole (char *s)
  {
  
  	CFShow(CFStringCreateWithCString(NULL,s,kCFStringEncodingMacRoman));
  		
- 	return 0;
  }
  
! int DoErrorAlert(OSStatus status, CFStringRef errorFormatString)
  {	
      CFStringRef formatStr = NULL, printErrorMsg = NULL;
--- 260,273 ----
  
  
! #if TARGET_API_MAC_CARBON
  
! void WriteToConsole (char *s)
  {
  
  	CFShow(CFStringCreateWithCString(NULL,s,kCFStringEncodingMacRoman));
  		
  }
  
! void DoErrorAlert(OSStatus status, CFStringRef errorFormatString)
  {	
      CFStringRef formatStr = NULL, printErrorMsg = NULL;
***************
*** 297,302 ****
          }
      }
- 
- 	return 0;
  }
  	
--- 296,299 ----

[frontierkernel-commits] Frontier/Common/source langvalue.c,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3034/Frontier/Common/source

Modified Files:
	langvalue.c 
Log Message:
Eliminated GCC compiler warnings.

Index: langvalue.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langvalue.c	23 Oct 2004 22:32:51 -0000	1.2
--- langvalue.c	28 Oct 2004 23:08:32 -0000	1.3
***************
*** 7301,7305 ****
  	
  	
! unaryminusvalue (tyvaluerecord v1, tyvaluerecord *vreturned) {
  	
  	register boolean fl = true;
--- 7301,7305 ----
  	
  	
! boolean unaryminusvalue (tyvaluerecord v1, tyvaluerecord *vreturned) {
  	
  	register boolean fl = true;
***************
*** 7356,7360 ****
  
  
! notvalue (tyvaluerecord v1, tyvaluerecord *vreturned) {
  	
  	/*
--- 7356,7360 ----
  
  
! boolean notvalue (tyvaluerecord v1, tyvaluerecord *vreturned) {
  	
  	/*

[frontierkernel-commits] Frontier/Common/source langtree.c,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2917/Frontier/Common/source

Modified Files:
	langtree.c 
Log Message:
Eliminated GCC compiler warnings.

Index: langtree.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langtree.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langtree.c	23 Oct 2004 22:32:24 -0000	1.2
--- langtree.c	28 Oct 2004 23:08:10 -0000	1.3
***************
*** 334,338 ****
  			
  
! langdisposetree (hdltreenode htree) {
  
  	/*
--- 334,338 ----
  			
  
! boolean langdisposetree (hdltreenode htree) {
  
  	/*

[frontierkernel-commits] Frontier/Common/headers menueditor.h,1.1,1.2

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2862/Frontier/Common/headers

Modified Files:
	menueditor.h 
Log Message:
Eliminated GCC compiler warnings.

Index: menueditor.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/menueditor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** menueditor.h	9 Oct 2004 21:00:14 -0000	1.1
--- menueditor.h	28 Oct 2004 23:07:54 -0000	1.2
***************
*** 201,205 ****
  		/***boolean flpopupactive;*/
  		
! 		/***boolean flzoomscriptwindow; /*zoom out the window in the next idle?*/
  		
  		long menurefcon; /*for use by application, menueditor doesn't touch it, but menuverbs does*/
--- 201,205 ----
  		/***boolean flpopupactive;*/
  		
! 		/***boolean flzoomscriptwindow; /%zoom out the window in the next idle?*/
  		
  		long menurefcon; /*for use by application, menueditor doesn't touch it, but menuverbs does*/

[frontierkernel-commits] Frontier/Common/headers mac.h,1.1,1.2

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2779/Frontier/Common/headers

Modified Files:
	mac.h 
Log Message:
Eliminated GCC compiler warnings.

Index: mac.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/mac.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mac.h	9 Oct 2004 20:59:11 -0000	1.1
--- mac.h	28 Oct 2004 23:07:42 -0000	1.2
***************
*** 66,76 ****
  extern short countinitialfiles (void);
  
! extern getinitialfile (short, bigstring, short *);
  
  extern boolean installgestaltfunction (void);
  
  #ifdef MACVERSION //JES 2004.03.29: MacOS Specific function declarations
! 	extern WriteToConsole (char *s);
! 	extern DoErrorAlert(OSStatus status, CFStringRef errorFormatString);
  #endif
  
--- 66,76 ----
  extern short countinitialfiles (void);
  
! extern void getinitialfile (short, bigstring, short *);
  
  extern boolean installgestaltfunction (void);
  
  #ifdef MACVERSION //JES 2004.03.29: MacOS Specific function declarations
! 	extern void WriteToConsole (char *s);
! 	extern void DoErrorAlert(OSStatus status, CFStringRef errorFormatString);
  #endif
  

[frontierkernel-commits] Frontier/Common/headers langinternal.h,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2718/Frontier/Common/headers

Modified Files:
	langinternal.h 
Log Message:
Eliminated GCC compiler warnings.

Index: langinternal.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langinternal.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langinternal.h	24 Oct 2004 19:28:11 -0000	1.2
--- langinternal.h	28 Oct 2004 23:07:31 -0000	1.3
***************
*** 351,355 ****
  extern boolean languserescaped (boolean);
  
! extern langprogramkilled (void);
  
  extern boolean langdebuggercall (hdltreenode);
--- 351,355 ----
  extern boolean languserescaped (boolean);
  
! //extern langprogramkilled (void);
  
  extern boolean langdebuggercall (hdltreenode);

[frontierkernel-commits] Frontier/Common/headers lang.h,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2651/Frontier/Common/headers

Modified Files:
	lang.h 
Log Message:
Eliminated GCC compiler warnings.

Index: lang.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/lang.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lang.h	23 Oct 2004 21:53:47 -0000	1.2
--- lang.h	28 Oct 2004 23:07:18 -0000	1.3
***************
*** 912,916 ****
  extern boolean hashinsert (const bigstring, tyvaluerecord);
  
! extern hashmerge (hdlhashtable, hdlhashtable);
  
  extern boolean hashlocate (const bigstring, hdlhashnode *, hdlhashnode *);
--- 912,916 ----
  extern boolean hashinsert (const bigstring, tyvaluerecord);
  
! //extern hashmerge (hdlhashtable, hdlhashtable);
  
  extern boolean hashlocate (const bigstring, hdlhashnode *, hdlhashnode *);
***************
*** 1051,1055 ****
  
  
! extern langdisposetree (hdltreenode); /*langtree.c*/
  
  
--- 1051,1055 ----
  
  
! extern boolean langdisposetree (hdltreenode); /*langtree.c*/
  
  
***************
*** 1307,1313 ****
  extern boolean ororvalue (tyvaluerecord, hdltreenode, tyvaluerecord *);
  
! extern unaryminusvalue (tyvaluerecord, tyvaluerecord *);
  
! extern notvalue (tyvaluerecord, tyvaluerecord *);
  
  extern boolean kernelfunctionvalue (hdlhashtable, bigstring, hdltreenode, tyvaluerecord *);
--- 1307,1313 ----
  extern boolean ororvalue (tyvaluerecord, hdltreenode, tyvaluerecord *);
  
! extern boolean unaryminusvalue (tyvaluerecord, tyvaluerecord *);
  
! extern boolean notvalue (tyvaluerecord, tyvaluerecord *);
  
  extern boolean kernelfunctionvalue (hdlhashtable, bigstring, hdltreenode, tyvaluerecord *);

[frontierkernel-commits] Frontier/Common/headers langparser.h,1.1,1.2

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2261/Frontier/Common/headers

Modified Files:
	langparser.h 
Log Message:
Eliminated GCC compiler warnings.

Index: langparser.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langparser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** langparser.h	9 Oct 2004 20:57:56 -0000	1.1
--- langparser.h	28 Oct 2004 23:05:48 -0000	1.2
***************
*** 33,37 ****
  #define tokentype short /*something that's returned by parsegettoken*/
  
! /***extern tymodulerecord parseresult; /*this is what yyparse returns*/
  
  
--- 33,37 ----
  #define tokentype short /*something that's returned by parsegettoken*/
  
! /***extern tymodulerecord parseresult; /%this is what yyparse returns*/
  
  

[frontierkernel-commits] Frontier/Common/headers process.h,1.1,1.2

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2054/Frontier/Common/headers

Modified Files:
	process.h 
Log Message:
Eliminated GCC compiler warnings.

Index: process.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/process.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** process.h	9 Oct 2004 21:05:27 -0000	1.1
--- process.h	28 Oct 2004 23:05:02 -0000	1.2
***************
*** 104,108 ****
  	hdlprocessrecord hfirstprocess; /*head of list*/
  	
! 	/*hdlprocessrecord processlistmarker; /*for scheduler, pick up search from here*/
  	
  	short ctrunning; /*number of processes in this list currently running*/
--- 104,108 ----
  	hdlprocessrecord hfirstprocess; /*head of list*/
  	
! 	/*hdlprocessrecord processlistmarker; /%for scheduler, pick up search from here*/
  	
  	short ctrunning; /*number of processes in this list currently running*/