[frontierkernel-commits] Frontier/Common/source tablestructure.c,1.2,1.3 tablepack.c,1.2,1.3 tablerunbutton.c,1.2,1.3 tableformats.c,1.2,1.3 CallMachOFrameWork.c,1.3,1.4 tablevalidate.c,1.2,1.3 tableops.c,1.2,1.3 tableverbs.c,1.2,1.3 tablecompare.c,1.2,1.3 tabledisplay.c,1.2,1.3 tablescrap.c,1.2,1.3 tableexternal.c,1.2,1.3 tablewindow.c,1.2,1.3 tablepopup.c,1.2,1.3 wpengine.c,1.3,1.4 tablefind.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-serv17087

Modified Files:
	tablestructure.c tablepack.c tablerunbutton.c tableformats.c 
	CallMachOFrameWork.c tablevalidate.c tableops.c tableverbs.c 
	tablecompare.c tabledisplay.c tablescrap.c tableexternal.c 
	tablewindow.c tablepopup.c wpengine.c tablefind.c 
Log Message:
Fixed GCC compiler warnings.

Index: tablerunbutton.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablerunbutton.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tablerunbutton.c	23 Oct 2004 23:02:51 -0000	1.2
--- tablerunbutton.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 42,60 ****
  static char *iconstrings [] = {
  	
! 	"\pZoom",			/*0%/
  	
! 	"\pOutline", 		/*1%/
  	
! 	"\pWP-Text", 		/*2%/
  	
  	nil,
  	
! 	"\pTable", 			/*4%/
  	
! 	"\pScript", 		/*5%/
  	
! 	"\pMenuBar", 		/*6%/
  	
! 	"\pPicture" 		/*7%/
  	};
  */
--- 42,60 ----
  static char *iconstrings [] = {
  	
! 	"\pZoom",			/%0%/
  	
! 	"\pOutline", 		/%1%/
  	
! 	"\pWP-Text", 		/%2%/
  	
  	nil,
  	
! 	"\pTable", 			/%4%/
  	
! 	"\pScript", 		/%5%/
  	
! 	"\pMenuBar", 		/%6%/
  	
! 	"\pPicture" 		/%7%/
  	};
  */
***************
*** 102,106 ****
  	tyvaluerecord val;
  	
! 	ixicontitle = 0; /*default%/
  	
  	if (tablegetcursorinfo (bs, &val)) {
--- 102,106 ----
  	tyvaluerecord val;
  	
! 	ixicontitle = 0; /%default%/
  	
  	if (tablegetcursorinfo (bs, &val)) {
***************
*** 168,172 ****
  	*/
  	
- 	register boolean flrunnable;
  	hdlhashtable  htable;
  	bigstring bs;
--- 168,171 ----
***************
*** 177,202 ****
  		return (false);
  		
! 	flrunnable = false;
! 	
! 	switch (val.valuetype) {
! 		
! 		case stringvaluetype:
! 			flrunnable = true;
! 			
! 			break;
! 			
! 		case externalvaluetype:
! 			switch (langexternalgettype (val)) {
! 				
! 				case idscriptprocessor:
! 					flrunnable = true;
! 					
! 					break;
! 				} /*switch*/
! 				
! 			break;
! 		} /*switch*/
! 		
! 	return (flrunnable);
  	} /*tablecursorisrunnable*/
  
--- 176,182 ----
  		return (false);
  		
! 	return (val.valuetype == stringvaluetype
! 			|| (val.valuetype == externalvaluetype
! 					&& langexternalgettype (val) == idscriptprocessor));
  	} /*tablecursorisrunnable*/
  
***************
*** 204,208 ****
  boolean tableruncursor (void) {
  	
- 	register hdltableformats hf = tableformatsdata;
  	tyvaluerecord val;
  	hdlhashtable htable;
--- 184,187 ----
***************
*** 232,246 ****
  		
  		case externalvaluetype:
! 			switch (langexternalgettype (val)) {
  				
! 				case idscriptprocessor:
! 					tablegetcursorpath (bsscript);
! 					
! 					pushstring ((ptrstring) "\x02()", bsscript);
! 					
! 					return (langrunstring (bsscript, bsresult));
! 				} /*switch*/
  				
  			break;
  		} /*switch*/
  	
--- 211,229 ----
  		
  		case externalvaluetype:
! 			if (langexternalgettype (val) == idscriptprocessor) {
! 			
! 				tablegetcursorpath (bsscript);
  				
! 				pushstring ((ptrstring) "\x02()", bsscript);
! 				
! 				return (langrunstring (bsscript, bsresult));
! 				} /*if*/
  				
  			break;
+ 
+ 		default:
+ 			/* do nothing */
+ 			break;
+ 
  		} /*switch*/
  	

Index: tablefind.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablefind.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tablefind.c	23 Oct 2004 23:00:36 -0000	1.2
--- tablefind.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 419,423 ****
  	
  	/*
! 	if (searchparams.floneobject) /*user has flat search turned off%/
  		return (false);
  	*/
--- 419,423 ----
  	
  	/*
! 	if (searchparams.floneobject) /%user has flat search turned off%/
  		return (false);
  	*/

Index: wpengine.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpengine.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wpengine.c	30 Oct 2004 20:49:51 -0000	1.3
--- wpengine.c	31 Oct 2004 20:41:10 -0000	1.4
***************
*** 443,448 ****
  	*/
  	
- 	register hdlwindowinfo hw = wpwindowinfo;
- 	
  	if ((wpwindowinfo != nil) && wpdisplayenabled ())
  		(**wpwindowinfo).selectioninfo.fldirty = true;
--- 443,446 ----
***************
*** 644,648 ****
  	
  	(*bounds).right = (*r).left + wpavailwidth ();
! 	} /*getlongbounds*/
  
  
--- 642,647 ----
  	
  	(*bounds).right = (*r).left + wpavailwidth ();
! 	} /%getlongbounds%/
! */
  
  
***************
*** 962,966 ****
  	
  	return (lastline - line1 + 1);
! 	} /*wpgetcurrentscreenlines*/
  
  
--- 961,966 ----
  	
  	return (lastline - line1 + 1);
! 	} /%wpgetcurrentscreenlines%/
! */
  
  
***************
*** 1684,1687 ****
--- 1684,1691 ----
  			
  			break;
+ 		
+ 		default:
+ 			/* nothing to do */
+ 			break;
  		}
  	
***************
*** 1817,1822 ****
  	if (wpsetglobals ()) {
  		
! 		register pg_ref pg = wpbuffer;
! 		Rect rcontent = (**wpdata).wprect;
  		graf_device_ptr updateport = NULL;
  		hdlregion updatergn = nil;
--- 1821,1827 ----
  	if (wpsetglobals ()) {
  		
! 		#ifdef gray3Dlook
! 			Rect rcontent = (**wpdata).wprect;
! 		#endif
  		graf_device_ptr updateport = NULL;
  		hdlregion updatergn = nil;
***************
*** 1842,1850 ****
  		#endif
  		
- 		#ifdef gray3Dlook
- 			pushbackcolor (&whitecolor);
- 			
- 			eraserect (rcontent);
- 		#endif
  		
  		if (updatergn == nil)
--- 1847,1850 ----
***************
*** 3067,3071 ****
  
  
! static void wppostruleredit (boolean flchangedtext, boolean flvisi) {
  	
  	/*
--- 3067,3071 ----
  
  
! void wppostruleredit (boolean flchangedtext, boolean flvisi) {
  	
  	/*
***************
*** 3133,3137 ****
  	
  	return (false);
! 	} /*wperrorhandler*/
  
  
--- 3133,3138 ----
  	
  	return (false);
! 	} /%wperrorhandler%/
! */
  
  
***************
*** 3215,3219 ****
  
  
! static boolean wppushundo (long undocode, void *insertref) {
  	
  	setupundo (undocode, insertref);
--- 3216,3220 ----
  
  
! boolean wppushundo (long undocode, void *insertref) {
  	
  	setupundo (undocode, insertref);
***************
*** 3229,3233 ****
  
  
! static boolean wppushformatundo (void) {
  	
  	return (wppushrulerundo ());
--- 3230,3234 ----
  
  
! boolean wppushformatundo (void) {
  	
  	return (wppushrulerundo ());
***************
*** 3381,3386 ****
  	#endif
  	return (false);	
! 	} /*wptrimrighthiddentextfromselection*/
! 
  
  boolean wpkeystroke (void) {
--- 3382,3387 ----
  	#endif
  	return (false);	
! 	} /%wptrimrighthiddentextfromselection%/
! */
  
  boolean wpkeystroke (void) {
***************
*** 3395,3399 ****
  	pg_byte chkey = keyboardstatus.chkb;
  	short modifiers = 0;
- 	long extending = 0;
  	boolean flinserting = true;	
  	pg_short_t caretverb = (pg_short_t) -1;
--- 3396,3399 ----

Index: tablestructure.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablestructure.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tablestructure.c	23 Oct 2004 23:03:32 -0000	1.2
--- tablestructure.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 244,248 ****
  	*/
  	
- 	Handle hdata = (Handle) (**internaltable).hashtablerefcon;
  	hdlhashtable hsystem, htemp;
  	
--- 244,247 ----
***************
*** 534,538 ****
  
  
! static boolean checktablestructure (boolean flcreate) {
  
  	/*
--- 533,537 ----
  
  
! boolean checktablestructure (boolean flcreate) {
  
  	/*
***************
*** 594,598 ****
  		}
  		
! 	/*usertable = roottable; /*does this work?*/
  	
  	return (fl);
--- 593,597 ----
  		}
  		
! 	//usertable = roottable; /*does this work?*/
  	
  	return (fl);

Index: tableformats.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tableformats.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tableformats.c	23 Oct 2004 23:00:50 -0000	1.2
--- tableformats.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 116,120 ****
  	
  	register hdltableformats hf = tableformatsdata;
! 	register hdlhashtable ht = (hdlhashtable) (**hf).htable;
  	hdloutlinerecord ho = (**hf).houtline;
  	
--- 116,120 ----
  	
  	register hdltableformats hf = tableformatsdata;
! 	//register hdlhashtable ht = (hdlhashtable) (**hf).htable;
  	hdloutlinerecord ho = (**hf).houtline;
  	
***************
*** 235,239 ****
  	
  	register hdltableformats hc = tableformatsdata;
- 	hdloutlinerecord ho = outlinedata;
  	long curwidth, newwidth;
  	short i;
--- 235,238 ----
***************
*** 466,472 ****
  //	(**ho).returnkeycallback = tablereturnkey;
  	
! 	(**ho).setscrapcallback = browsersetscrap;
  
! 	(**ho).getscrapcallback = browsergetscrap;
  	
  	(**ho).beforeprintpagecallback = tablebeforeprintpage;
--- 465,471 ----
  //	(**ho).returnkeycallback = tablereturnkey;
  	
! 	(**ho).setscrapcallback = (opsetscrapcallback) browsersetscrap;
  
! 	(**ho).getscrapcallback = (opgetscrapcallback) browsergetscrap;
  	
  	(**ho).beforeprintpagecallback = tablebeforeprintpage;
***************
*** 478,485 ****
  static boolean duplicateexpansion (hdlheadrecord, hdlheadrecord); // forward
  
! static boolean duplicateexpansionvisit (hdlheadrecord hnode, hdlheadrecord hfirstnew) {
  	
  	if (opsubheadsexpanded (hnode)) {
  		
  		bigstring bs;
  		hdlheadrecord hmatch;
--- 477,485 ----
  static boolean duplicateexpansion (hdlheadrecord, hdlheadrecord); // forward
  
! static boolean duplicateexpansionvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	if (opsubheadsexpanded (hnode)) {
  		
+ 		hdlheadrecord hfirstnew = (hdlheadrecord) refcon;
  		bigstring bs;
  		hdlheadrecord hmatch;
***************
*** 726,730 ****
  void tabledisposeoutline (hdltableformats hf) {
  
! 	hdlhashtable ht = (**hf).htable;
  	hdloutlinerecord ho = (**hf).houtline;
  
--- 726,730 ----
  void tabledisposeoutline (hdltableformats hf) {
  
! 	//hdlhashtable ht = (**hf).htable;
  	hdloutlinerecord ho = (**hf).houtline;
  
***************
*** 810,819 ****
  		}
  	
- 	/*
  	tableresetrects (tablerect);
  	
! 	x = (tablerect.right - tablerect.left) / ctcols; /*initial column width*/
  	
- 	/*
  	x = (**hf).defaultcolwidth = tablelimitcolwidth (x);
  	
--- 810,817 ----
  		}
  	
  	tableresetrects (tablerect);
  	
! 	x = (tablerect.right - tablerect.left) / ctcols; /%initial column width%/
  	
  	x = (**hf).defaultcolwidth = tablelimitcolwidth (x);
  	

Index: tableexternal.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tableexternal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tableexternal.c	23 Oct 2004 23:00:07 -0000	1.2
--- tableexternal.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 343,347 ****
  
  
! static boolean tableresetformatsrects () {
  	
  	/*
--- 343,347 ----
  
  
! boolean tableresetformatsrects (void) {
  	
  	/*
***************
*** 748,752 ****
  
  
! static boolean finddatabasevisit (WindowPtr w, tyfinddatabaseinfo *pinfo) {
  	
  	if (ccwindowgetdatabase (w) == (*pinfo).hdatabase) { // got it
--- 748,754 ----
  
  
! static boolean finddatabasevisit (WindowPtr w, ptrvoid refcon) {
! 	
! 	tyfinddatabaseinfo *pinfo = (tyfinddatabaseinfo *) refcon;
  	
  	if (ccwindowgetdatabase (w) == (*pinfo).hdatabase) { // got it
***************
*** 824,828 ****
  	if (langexternalvaltotable (val, &htable, hnode)) {
  		
! 		hashtablevisit (htable, &tableupdatewindowtitles, htable); /*daisy chain recursion*/
  		}
  	
--- 826,830 ----
  	if (langexternalvaltotable (val, &htable, hnode)) {
  		
! 		hashtablevisit (htable, (langtablevisitcallback) &tableupdatewindowtitles, htable); /*daisy chain recursion*/
  		}
  	
***************
*** 906,910 ****
  	
  
! static boolean tablesymbolzoomvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) {
  	
  	/*
--- 908,912 ----
  	
  
! static boolean tablesymbolzoomvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 912,915 ****
--- 914,918 ----
  	*/
  	
+ 	ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon;
  	bigstring bs;
  	tybrowserinfo info;
***************
*** 953,958 ****
  
  
! static boolean tablesymbolchangedvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) {
  	
  	bigstring bs;
  	tybrowserinfo info;
--- 956,962 ----
  
  
! static boolean tablesymbolchangedvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
+ 	ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon;
  	bigstring bs;
  	tybrowserinfo info;
***************
*** 1018,1022 ****
  
  
! static boolean tablesymbolinsertedvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) {
  	
  	/*
--- 1022,1026 ----
  
  
! static boolean tablesymbolinsertedvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 1031,1034 ****
--- 1035,1039 ----
  	*/
  	
+ 	ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon;
  	tybrowserspec fs;
  	hdlhashtable htable;
***************
*** 1092,1096 ****
  
  
! static boolean tablesymboldeletedvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) {
  	
  	/*
--- 1097,1101 ----
  
  
! static boolean tablesymboldeletedvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 1099,1102 ****
--- 1104,1108 ----
  	*/
  
+ 	ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon;
  	bigstring bs;
  	tybrowserinfo info;
***************
*** 1154,1159 ****
  
  
! static boolean tablesymbolsresortedvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) {
  	
  	tybrowserspec fs;
  	hdlhashtable htable;
--- 1160,1166 ----
  
  
! static boolean tablesymbolsresortedvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
+ 	ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon;
  	tybrowserspec fs;
  	hdlhashtable htable;
***************
*** 1279,1284 ****
  	saveoutlinedata = outlinedata; // may not be associated with current shellglobals
  	
! 	fl = shellvisittypedwindows (idtableconfig, &tablesymbolchangedwindowvisit, &symbolchangedinfo)
! 		&& shellvisittypedwindows (idcancoonconfig, &tablesymbolchangedwindowvisit, &symbolchangedinfo)
  		&& symbolchangedinfo.flfound;
  	
--- 1286,1291 ----
  	saveoutlinedata = outlinedata; // may not be associated with current shellglobals
  	
! 	fl = shellvisittypedwindows (idtableconfig, (shellwindowvisitcallback) &tablesymbolchangedwindowvisit, &symbolchangedinfo)
! 		&& shellvisittypedwindows (idcancoonconfig, (shellwindowvisitcallback) &tablesymbolchangedwindowvisit, &symbolchangedinfo)
  		&& symbolchangedinfo.flfound;
  	

Index: tabledisplay.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tabledisplay.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tabledisplay.c	23 Oct 2004 22:59:40 -0000	1.2
--- tabledisplay.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 70,95 ****
  
  
- 
- 
- static void darkcolorof (RGBColor *rgb) {
- 	
- 	(*rgb).red -= (*rgb).red / 4;
- 	
- 	(*rgb).green -= (*rgb).green / 4;
- 	
- 	(*rgb).blue -= (*rgb).blue / 4;
- 	} /*darkcolorof*/
- 
- 
- static void lightcolorof (RGBColor *rgb) {
- 	
- 	(*rgb).red += (65535 - (*rgb).red) / 3;
- 	
- 	(*rgb).green += (65535 - (*rgb).green) / 3;
- 	
- 	(*rgb).blue += (65535 - (*rgb).blue) / 3;
- 	} /*lightcolorof*/
- 
- 
  static short opnodeindentpix (hdlheadrecord hnode) {
  
--- 70,73 ----
***************
*** 130,135 ****
  	ploticonresource (&r, align, transform, iconresnum);
  #endif
! 	} /*tabledrawnodeicon*/
! 
  
  static void tableprepfordraw (Rect *r) {
--- 108,113 ----
  	ploticonresource (&r, align, transform, iconresnum);
  #endif
! 	} /%tabledrawnodeicon%/
! */
  
  static void tableprepfordraw (Rect *r) {
***************
*** 204,208 ****
  	
  	if (flbitmap)
! 		flbitmap = openbitmap (r, getport ());
  	
  	#if TARGET_API_MAC_CARBON == 1
--- 182,186 ----
  	
  	if (flbitmap)
! 		flbitmap = openbitmap (r, (WindowPtr) getport ());
  	
  	#if TARGET_API_MAC_CARBON == 1
***************
*** 227,231 ****
  	
  	if (flbitmap)
! 		closebitmap (getport ());
  	
  	popstyle ();
--- 205,209 ----
  	
  	if (flbitmap)
! 		closebitmap ((WindowPtr) getport ());
  	
  	popstyle ();
***************
*** 274,278 ****
  static void tableupdateseparator (void) {
  	
! 	/*
  	we formalized the separator rect so we could easily experiment with different
  	ideas for showing the boundary between the titles of a table display and
--- 252,256 ----
  static void tableupdateseparator (void) {
  	
! 	/%
  	we formalized the separator rect so we could easily experiment with different
  	ideas for showing the boundary between the titles of a table display and
***************
*** 284,288 ****
  	seprect = (**tableformatsdata).seprect;
  	
! 	if (!shellrectneedsupdate (&seprect)) /*no intersection, nothing to do%/
  		return;
  	
--- 262,266 ----
  	seprect = (**tableformatsdata).seprect;
  	
! 	if (!shellrectneedsupdate (&seprect)) /%no intersection, nothing to do%/
  		return;
  	
***************
*** 291,295 ****
  	
  	eraserect (seprect);
! 	} /*tableupdateseparator*/
  
  
--- 269,274 ----
  	
  	eraserect (seprect);
! 	} /%tableupdateseparator%/
! */
  
  
***************
*** 418,422 ****
  	*/
  	
- 	hdltableformats hc = tableformatsdata;
  	short optextindent = opnodeindentpix (hnode) + opiconindentpix ();
  	
--- 397,400 ----
***************
*** 530,534 ****
  	register hdltableformats hf = tableformatsdata;
  	register short h;
- 	hdlheadrecord hnode = (**outlinedata).hline1;
  	Rect rtable, rcell;
  	Point pt;
--- 508,511 ----
***************
*** 662,666 ****
  	hdltableformats hf = tableformatsdata;
  	short col;
- 	short indent = opnodeindentpix (hnode) + opiconindentpix ();
  	
  	if (isclaydisplay (hf))
--- 639,642 ----
***************
*** 965,970 ****
  	
  	Rect rcell;
! 	hdloutlinerecord ho = outlinedata;
! 	boolean fltextmode = (**ho).fltextmode;
  	
  	/*
--- 941,946 ----
  	
  	Rect rcell;
! 	//hdloutlinerecord ho = outlinedata;
! 	//boolean fltextmode = (**ho).fltextmode;
  	
  	/*
***************
*** 1104,1108 ****
  
  
! static void browserdrawnodeicon (const Rect *r, boolean flhighlighted, hdlheadrecord hnode) {
  	
  	tybrowserinfo browserinfo;	
--- 1080,1084 ----
  
  
! void browserdrawnodeicon (const Rect *r, boolean flhighlighted, hdlheadrecord hnode) {
  	
  	tybrowserinfo browserinfo;	
***************
*** 1286,1291 ****
  	getparent
  	return (opinsertheadline (emptystring, dir, flcomment));
! 	} /*tablereturnkey*/
! 
  
  boolean tableinitdisplay (void) {
--- 1262,1267 ----
  	getparent
  	return (opinsertheadline (emptystring, dir, flcomment));
! 	} /%tablereturnkey%/
! */
  
  boolean tableinitdisplay (void) {

Index: tableops.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tableops.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tableops.c	23 Oct 2004 23:01:37 -0000	1.2
--- tableops.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 427,431 ****
  	register short i;
  	tyvaluerecord val;
! 	register hdlexternalvariable hv;
  	
  	for (i = 0; i < ctbuckets; i++) {
--- 427,431 ----
  	register short i;
  	tyvaluerecord val;
! 	register hdlexternalvariable hv = nil;
  	
  	for (i = 0; i < ctbuckets; i++) {
***************
*** 595,601 ****
  static boolean tableupdatesubsdirtyflag (hdlhashtable ht); /*forward declaration*/
  
! static boolean updatesubsdirtyvisit (hdlhashnode hnode, boolean *flsubsdirty) {
  
  	tyvaluerecord val = (**hnode).val;
  	
  	if (val.valuetype == externalvaluetype) {
--- 595,602 ----
  static boolean tableupdatesubsdirtyflag (hdlhashtable ht); /*forward declaration*/
  
! static boolean updatesubsdirtyvisit (hdlhashnode hnode, ptrvoid refcon) {
  
  	tyvaluerecord val = (**hnode).val;
+ 	boolean *flsubsdirty = (boolean *) refcon;
  	
  	if (val.valuetype == externalvaluetype) {
***************
*** 657,661 ****
  
  
! static boolean findtablevisit (hdlhashnode hnode, ptrfindtableinfo info) {
  	
  	/*
--- 658,662 ----
  
  
! static boolean findtablevisit (hdlhashnode hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 663,667 ****
  	one pointed to by info.htablelookfor.
  	*/
! 	
  	hdltablevariable hvariable;
  	register hdlhashtable ht;
--- 664,668 ----
  	one pointed to by info.htablelookfor.
  	*/
! 	ptrfindtableinfo info = (ptrfindtableinfo) refcon;
  	hdltablevariable hvariable;
  	register hdlhashtable ht;
***************
*** 700,704 ****
  	register short i;
  	tyvaluerecord val;
! 	register hdlexternalvariable hv;
  	
  	if (intable == fortable) {	/*special case for root*/
--- 701,705 ----
  	register short i;
  	tyvaluerecord val;
! 	register hdlexternalvariable hv = nil;
  	
  	if (intable == fortable) {	/*special case for root*/
***************
*** 830,834 ****
  	
  	return (tablevisi ((**hf).rowcursor, (**hf).colcursor));
! 	} /*tablevisicursor*/
  
  
--- 831,836 ----
  	
  	return (tablevisi ((**hf).rowcursor, (**hf).colcursor));
! 	} /%tablevisicursor%/
! */
  
  
***************
*** 848,852 ****
  	*/
  	
- 	register hdltableformats hf = tableformatsdata;
  	hdlheadrecord hfound;
  	boolean fl;
--- 850,853 ----
***************
*** 930,937 ****
  
  	return (hashgetnthnode (tablegetlinkedhashtable (), (**hf).rowcursor, hnode));
! 	} /*tablesavebarcursor*/
  	
  	
- /*
  static boolean tablerestorebarcursor (hdlhashnode hnode) {
  	
--- 931,937 ----
  
  	return (hashgetnthnode (tablegetlinkedhashtable (), (**hf).rowcursor, hnode));
! 	} /%tablesavebarcursor%/
  	
  	
  static boolean tablerestorebarcursor (hdlhashnode hnode) {
  	
***************
*** 943,948 ****
  	
  	return (true);
! 	} /*tablerestorebarcursor*/
! 
  
  boolean tableresort (hdlhashtable ht, hdlhashnode hresort) {
--- 943,948 ----
  	
  	return (true);
! 	} /%tablerestorebarcursor%/
! */
  
  boolean tableresort (hdlhashtable ht, hdlhashnode hresort) {

Index: CallMachOFrameWork.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/CallMachOFrameWork.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CallMachOFrameWork.c	31 Oct 2004 17:59:48 -0000	1.3
--- CallMachOFrameWork.c	31 Oct 2004 20:41:10 -0000	1.4
***************
*** 45,48 ****
--- 45,51 ----
  
  
+ static boolean unixshellcallinit (void);	/* forward declaration */
+ 
+ 
  boolean unixshellcall (Handle hcommand, Handle hreturn) {
  

Index: tablevalidate.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablevalidate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tablevalidate.c	23 Oct 2004 23:03:49 -0000	1.2
--- tablevalidate.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 175,180 ****
  		
  		copystring (bs, bslast);
! 		} /*while*/
! 		
  	return (true);
  	} /*validate*/
--- 175,181 ----
  		
  		copystring (bs, bslast);
! 		} /%while%/
! 	*/
! 	
  	return (true);
  	} /*validate*/

Index: tablepack.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablepack.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tablepack.c	23 Oct 2004 23:01:59 -0000	1.2
--- tablepack.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 376,380 ****
  
  
! static boolean tablepacktotextvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, Handle htextscrap) {
  	
  	/*
--- 376,380 ----
  
  
! static boolean tablepacktotextvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
  	
  	/*
***************
*** 382,385 ****
--- 382,386 ----
  	*/
  	
+ 	Handle htextscrap = (Handle) refcon;
  	boolean fl;
  	
***************
*** 429,435 ****
  	//htextscrap = htext; /*set for visit routine*/
  	
! 	/*
! 	fl = !hashinversesearch (ht, &tablepacktotextvisit, bsname); /*false means complete traversal%/
! 	*/
  	
  	fl = !tablesortedinversesearch (ht, &tablepacktotextvisit, htext);
--- 430,434 ----
  	//htextscrap = htext; /*set for visit routine*/
  	
! 	//fl = !hashinversesearch (ht, &tablepacktotextvisit, bsname); /*false means complete traversal%/
  	
  	fl = !tablesortedinversesearch (ht, &tablepacktotextvisit, htext);
***************
*** 478,482 ****
  
  
! static boolean findusedblocksvisit (hdlhashnode hnode, ptrstring bsparent) {
  	
  	/*
--- 477,481 ----
  
  
! static boolean findusedblocksvisit (hdlhashnode hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 484,487 ****
--- 483,487 ----
  	*/
  	
+ 	ptrstring bsparent = (ptrstring) refcon;
  	tyvaluerecord val = (**hnode).val;
  	bigstring bspath;

Index: tablescrap.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablescrap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tablescrap.c	23 Oct 2004 23:03:10 -0000	1.2
--- tablescrap.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 59,62 ****
--- 59,63 ----
  
  
+ #if 0
  
  static boolean tablegetscrapvaluetype (Handle hscrap, tyvaluetype *type) {
***************
*** 78,81 ****
--- 79,84 ----
  	} /*tablegetscrapvaluetype*/
  
+ #endif
+ 
  
  static boolean tableexpandtodotparams (bigstring bspath, hdlhashtable *htable, bigstring bsname) {
***************
*** 371,374 ****
--- 374,379 ----
  
  
+ #ifndef odbbrowser
+ 
  static void tabledisposescrap (hdltablescrap hscrap) {
  	
***************
*** 376,379 ****
--- 381,386 ----
  	} /*tabledisposescrap*/
  
+ #endif
+ 
  
  boolean tablescraphook (Handle hscrap) {
***************
*** 414,418 ****
  				if (getscrap (scraptype, hscrap)) {
  					
! 					shellsetscrap (hscrap, scraptype, &disposehandle, &tableexportvaluescrap);
  					
  					return (false); /*don't call any more hooks*/
--- 421,427 ----
  				if (getscrap (scraptype, hscrap)) {
  					
! 					shellsetscrap (hscrap, scraptype,
! 						(shelldisposescrapcallback) &disposehandle,
! 						(shellexportscrapcallback) &tableexportvaluescrap);
  					
  					return (false); /*don't call any more hooks*/
***************
*** 475,479 ****
  #endif
  
! static boolean tableredoclear (hdlhashnode hnode, boolean flundo) {
  	
  	bigstring bsname;
--- 484,488 ----
  #endif
  
! boolean tableredoclear (hdlhashnode hnode, boolean flundo) {
  	
  	bigstring bsname;
***************
*** 505,509 ****
  
  
! static boolean tableundoclear (hdlhashnode hnode, boolean flundo) {
  	
  	hdlhashtable htable = tablegetlinkedhashtable ();
--- 514,518 ----
  
  
! boolean tableundoclear (hdlhashnode hnode, boolean flundo) {
  	
  	hdlhashtable htable = tablegetlinkedhashtable ();

Index: tablepopup.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablepopup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tablepopup.c	23 Oct 2004 23:02:23 -0000	1.2
--- tablepopup.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 81,85 ****
  typedef struct tykindmenuinfo {
  	
! 	/*byte *bsitem; /*the text of the menu item*/
  	
  	tyvaluetype type; /*the associated value type*/
--- 81,85 ----
  typedef struct tykindmenuinfo {
  	
! 	//byte *bsitem; /*the text of the menu item*/
  	
  	tyvaluetype type; /*the associated value type*/
***************
*** 89,141 ****
  static tykindmenuinfo kindmenuinfo [] = { /*menu contents, in menu order*/
  
! 	/*Boolean*/ booleanvaluetype, 		/*1*/
  	
! 	/*Character*/ charvaluetype, 		/*2*/
  	
! 	/*Number*/ longvaluetype, 			/*3*/
  	
! 	/*Float*/ doublevaluetype,			/*4*/
  	
! 	/*Date*/ datevaluetype, 			/*5*/
  	
! 	/*Direction*/ directionvaluetype,	/*6*/
  	
! 	/*String*/ stringvaluetype, 		/*7*/
  	
! 	/*-*/ novaluetype,					/*8*/
  	
! 	/*String4*/ ostypevaluetype,		/*9*/
  	
! 	/*Enumerator*/ enumvaluetype,		/*10*/
  	
! 	/*File Specifier*/ filespecvaluetype, /*11*/
  	
! 	/*Alias*/ aliasvaluetype,			/*12*/
  	
! 	/*Object Specifier*/ objspecvaluetype, /*13*/
  	
! 	/*Address*/ addressvaluetype, 		/*14*/
  	
! 	/*-*/ novaluetype,					/*15*/
  	
! 	/*Table*/ tablevaluetype, 			/*16*/
  	
! 	/*WP-Text*/ wordvaluetype, 			/*17*/
  	
! 	/*Picture*/ pictvaluetype, 			/*18*/
  	
! 	/*Outline*/ outlinevaluetype, 		/*19*/
  	
! 	/*Script*/ scriptvaluetype, 		/*20*/
  	
! 	/*MenuBar*/ menuvaluetype, 			/*21*/
  	
! 	/*-*/ novaluetype,
  	
! 	/*List*/ listvaluetype,				/*23*/
  	
! 	/*Record*/ recordvaluetype,			/*24*/
  	
! 	/*Binary*/ binaryvaluetype			/*25*/
  	};
  
--- 89,141 ----
  static tykindmenuinfo kindmenuinfo [] = { /*menu contents, in menu order*/
  
! 	 {/*Boolean*/ booleanvaluetype}, 		/*1*/
  	
! 	 {/*Character*/ charvaluetype}, 		/*2*/
  	
! 	 {/*Number*/ longvaluetype}, 			/*3*/
  	
! 	 {/*Float*/ doublevaluetype},			/*4*/
  	
! 	 {/*Date*/ datevaluetype}, 			/*5*/
  	
! 	 {/*Direction*/ directionvaluetype},	/*6*/
  	
! 	 {/*String*/ stringvaluetype}, 		/*7*/
  	
! 	 {/*-*/ novaluetype},					/*8*/
  	
! 	 {/*String4*/ ostypevaluetype},		/*9*/
  	
! 	 {/*Enumerator*/ enumvaluetype},		/*10*/
  	
! 	 {/*File Specifier*/ filespecvaluetype}, /*11*/
  	
! 	 {/*Alias*/ aliasvaluetype},			/*12*/
  	
! 	 {/*Object Specifier*/ objspecvaluetype}, /*13*/
  	
! 	 {/*Address*/ addressvaluetype}, 		/*14*/
  	
! 	 {/*-*/ novaluetype},					/*15*/
  	
! 	 {/*Table*/ tablevaluetype}, 			/*16*/
  	
! 	 {/*WP-Text*/ wordvaluetype}, 			/*17*/
  	
! 	 {/*Picture*/ pictvaluetype}, 			/*18*/
  	
! 	 {/*Outline*/ outlinevaluetype}, 		/*19*/
  	
! 	 {/*Script*/ scriptvaluetype}, 		/*20*/
  	
! 	 {/*MenuBar*/ menuvaluetype}, 			/*21*/
  	
! 	 {/*-*/ novaluetype},
  	
! 	 {/*List*/ listvaluetype},				/*23*/
  	
! 	 {/*Record*/ recordvaluetype},			/*24*/
  	
! 	 {/*Binary*/ binaryvaluetype}			/*25*/
  	};
  
***************
*** 216,224 ****
  
  	if (vt1 == stringvaluetype) { /*special cases for converting from a string*/
! 		switch (vt2) {
! 			case wordvaluetype:
! 			case outlinevaluetype:
! 			case scriptvaluetype:
! 				return (true);
  			}
  		}
--- 216,223 ----
  
  	if (vt1 == stringvaluetype) { /*special cases for converting from a string*/
! 		if (vt2 == wordvaluetype
! 				|| vt2 == outlinevaluetype
! 				|| vt2 == scriptvaluetype) {
! 			return (true);
  			}
  		}
***************
*** 511,515 ****
  	bigstring bs;
  	
! 	register short sortorder;
  	
  	switch (itemselected) {
--- 510,514 ----
  	bigstring bs;
  	
! 	register short sortorder = sortbyname; /*default*/
  	
  	switch (itemselected) {

Index: tablewindow.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablewindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tablewindow.c	23 Oct 2004 23:04:19 -0000	1.2
--- tablewindow.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 377,382 ****
  
  
! static boolean tablegetvariableroutine (hdlexternalvariable *hvariable) {
  	
  	hdlhashtable ht;
  	
--- 377,383 ----
  
  
! static boolean tablegetvariableroutine (ptrvoid refcon) {
  	
+ 	hdlexternalvariable *hvariable = (hdlexternalvariable *) refcon;
  	hdlhashtable ht;
  	
***************
*** 588,595 ****
  
  
- static void tableeditreturnkey () {
- 	} /*tableeditreturnkey*/
- 
- 
  static boolean tableverbkeystroke (void) {
  	
--- 589,592 ----

Index: tablecompare.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablecompare.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tablecompare.c	23 Oct 2004 22:59:23 -0000	1.2
--- tablecompare.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 104,108 ****
  	register hdlhashnode h2 = hnode2;
  	tyvaluerecord val1, val2, vreturned;
! 	register boolean fllessthan;
  	register boolean flequal = false;
  	boolean flcomparable;
--- 104,108 ----
  	register hdlhashnode h2 = hnode2;
  	tyvaluerecord val1, val2, vreturned;
! 	register boolean fllessthan = false;
  	register boolean flequal = false;
  	boolean flcomparable;

Index: tableverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tableverbs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tableverbs.c	23 Oct 2004 23:04:05 -0000	1.2
--- tableverbs.c	31 Oct 2004 20:41:10 -0000	1.3
***************
*** 387,391 ****
  static boolean tablefindverb (hdltreenode hparam1, tyvaluerecord *v) {
  	
! 	/*
  	table.find (adr, bs): boolean; search the (external) value at adr 
  	for the string bs.  if adr is a table, do *not* search subordinate 
--- 387,391 ----
  static boolean tablefindverb (hdltreenode hparam1, tyvaluerecord *v) {
  	
! 	/%
  	table.find (adr, bs): boolean; search the (external) value at adr 
  	for the string bs.  if adr is a table, do *not* search subordinate 
***************
*** 425,429 ****
  	
  	return (true);
! 	} /*tablefindverb*/
  
  
--- 425,430 ----
  	
  	return (true);
! 	} /%tablefindverb%/
! */
  
  
***************
*** 529,534 ****
  
  
! static boolean tablegetselvisit (hdlheadrecord hnode, hdllistrecord hlist) {
  	
  	hdlhashtable ht;
  	bigstring bs;
--- 530,536 ----
  
  
! static boolean tablegetselvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
+ 	hdllistrecord hlist = (hdllistrecord) refcon;
  	hdlhashtable ht;
  	bigstring bs;
***************
*** 596,600 ****
  static boolean tablesetdisplaysettingsverb (hdltreenode hp1, tyvaluerecord *v) {
  	
- 	hdltableformats hf = tableformatsdata;
  	hdlhashtable hsettings;
  	tylinelayout layout;
--- 598,601 ----