[frontierkernel-commits] Frontier/Common/source error.c,1.2,1.3 strings.c,1.2,1.3 aeutils.c,1.2,1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	error.c strings.c aeutils.c 
Log Message:
Removed some warnings.

Index: aeutils.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/aeutils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aeutils.c	23 Oct 2004 22:11:18 -0000	1.2
--- aeutils.c	28 Oct 2004 01:51:26 -0000	1.3
***************
*** 109,113 ****

  	return (AECreateDesc (typeNull, nil, 0, desc) != noErr);
! 	} /*newdescnull*/
  boolean newdescnull (AEDesc *desc, DescType typeCode) {  // MJL 08/12/03: Broken boolean obj spec fix
      AEInitializeDescInline (desc);
--- 109,113 ----

  	return (AECreateDesc (typeNull, nil, 0, desc) != noErr);
! 	} #*newdescnull*/
  boolean newdescnull (AEDesc *desc, DescType typeCode) {  // MJL 08/12/03: Broken boolean obj spec fix
      AEInitializeDescInline (desc);

Index: strings.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/strings.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** strings.c	23 Oct 2004 22:58:38 -0000	1.2
--- strings.c	28 Oct 2004 01:51:26 -0000	1.3
***************
*** 190,194 ****
  short comparestrings (bigstring bs1, bigstring bs2) {

! 	/*
  	return zero if the two strings (pascal type, with length-byte) are
  	equal.  return -1 if bs1 is less than bs2, or +1 if bs1 is greater than
--- 190,194 ----
  short comparestrings (bigstring bs1, bigstring bs2) {

! 	#*
  	return zero if the two strings (pascal type, with length-byte) are
  	equal.  return -1 if bs1 is less than bs2, or +1 if bs1 is greater than
***************
*** 200,204 ****

  	return (IUCompString (bs1, bs2));
! 	} /*comparestrings*/

  #endif
--- 200,204 ----

  	return (IUCompString (bs1, bs2));
! 	} #*comparestrings*/

  #endif
***************
*** 381,385 ****

  	pushstring (bsboo, bsdest);
! 	} /*pushboolean*/

--- 381,385 ----

  	pushstring (bsboo, bsdest);
! 	} #*pushboolean*/

***************
*** 392,396 ****

  	pushstring (bsres, bs);
! 	} /*pushstringresource*/

--- 392,396 ----

  	pushstring (bsres, bs);
! 	} #*pushstringresource*/

***************
*** 956,960 ****
  	long i;

! 	i = (chdelim, stringbaseaddress (bs), stringlength (bs));

  	if (i >= 0)
--- 956,960 ----
  	long i;

! 	i = langcommentdelete (chdelim, stringbaseaddress (bs), stringlength (bs));

  	if (i >= 0)
***************
*** 1179,1183 ****
  	*/

! 	register len;

  	if (bssource == nil) { /*special case, handled at lowest level*/
--- 1179,1183 ----
  	*/

! 	register short len;

  	if (bssource == nil) { /*special case, handled at lowest level*/
***************
*** 1491,1495 ****
  		} /*for*/

! 	/***subtractstrings (bsresult, "\p ÒÓ", bsresult); /*in case there was a missing param*/
  	} /*parsedialogstring*/

--- 1491,1495 ----
  		} /*for*/

! 	/***subtractstrings (bsresult, "\p ÒÓ", bsresult); #*in case there was a missing param*/
  	} /*parsedialogstring*/

***************
*** 1962,1966 ****
  	if ((number < -32768) || (number > 32767))  {

! 		memtodisklong (number);

  		bytestohexstring (&number, sizeof (long), bshex);
--- 1962,1966 ----
  	if ((number < -32768) || (number > 32767))  {

! 		if (memtodisklong (number)) { }; /* hra 10/27/04: bypass 'statement with no effect' warning */

  		bytestohexstring (&number, sizeof (long), bshex);
***************
*** 1971,1975 ****
  		short x = number;

! 		memtodiskshort (x);

  		bytestohexstring (&x, sizeof (short), bshex);
--- 1971,1975 ----
  		short x = number;

! 		if (memtodiskshort (x)) { }; /* hra 10/27/04: bypass 'statement with no effect' warning */

  		bytestohexstring (&x, sizeof (short), bshex);
***************
*** 2427,2431 ****
  		sethandlesize (hresult, ctansibytes);

! 		sethandlesize (hresult, gethandlesize (hresult) - 1); /*pop trailing terminator*/

  	#endif
--- 2427,2431 ----
  		sethandlesize (hresult, ctansibytes);

! 		sethandlesize (hresult, gethandlesize (hresult) - 1); #*pop trailing terminator*/

  	#endif
***************
*** 2441,2448 ****
  	*/

- 	long lentext = gethandlesize (h);
- 	
  	#ifdef WIN95VERSION
! 	
  		Handle htemp;

--- 2441,2448 ----
  	*/

  	#ifdef WIN95VERSION
! 
! 		long lentext = gethandlesize (h);
! 
  		Handle htemp;

***************
*** 2470,2473 ****
--- 2470,2475 ----

  /*		OSErr err = noErr;
+ 
+ 		long lentext = gethandlesize (h);

  		TECObjectRef converter;
***************
*** 2479,2487 ****
  		(*h) [lentext] = '\0';

! 		err = TECCreateConverter (&converter, 0x08000100, kTextEncodingWindowsLatin1); /*0x08000100 is UTF-8*/

  /*		sethandlesize (hresult, lentext * 2);

! 		if (((*h) [0] == '\xFF') || ((*h) [0] == '\xEF')) /*pop byte order mark*/

  /*			pullfromhandle (h, 0, 3, NULL);
--- 2481,2489 ----
  		(*h) [lentext] = '\0';

! 		err = TECCreateConverter (&converter, 0x08000100, kTextEncodingWindowsLatin1); #*0x08000100 is UTF-8*/

  /*		sethandlesize (hresult, lentext * 2);

! 		if (((*h) [0] == '\xFF') || ((*h) [0] == '\xEF')) #*pop byte order mark*/

  /*			pullfromhandle (h, 0, 3, NULL);
***************
*** 2497,2501 ****
  		sethandlesize (hresult, ctansibytes);

! 		sethandlesize (hresult, gethandlesize (hresult) - 1); /*pop trailing terminator*/

  	#endif
--- 2499,2503 ----
  		sethandlesize (hresult, ctansibytes);

! 		sethandlesize (hresult, gethandlesize (hresult) - 1); #*pop trailing terminator*/

  	#endif

Index: error.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/error.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** error.c	23 Oct 2004 22:17:07 -0000	1.2
--- error.c	28 Oct 2004 01:51:26 -0000	1.3
***************
*** 51,55 ****
  	short errornumber; /*an error result passed back by a Mac system routine*/

! 	/***short errorindex; /*index into the STR# resource for the appropriate message*/
  	}

--- 51,55 ----
  	short errornumber; /*an error result passed back by a Mac system routine*/

! 	/***short errorindex; #*index into the STR# resource for the appropriate message*/
  	}

***************
*** 58,154 ****
  systemerrortable [ctsystemerrors] = {

! 	-33,	//dirFulErr
! 	-34,	//dskFulErr
! 	-35,	//nsvErr
! 	-36,	//ioErr
! 	-37,	//bdNamErr
! 	-38,	//fnOpnErr
! 	-39,	//eofErr
! 	-40,	//posErr
! 	-41,	//mFulErr
! 	-42,	//tmfoErr
! 	-43,	//fnfErr
! 	-44,	//wPrErr
! 	-45,	//fLckdErr
! 	-46,	//vLckdErr
! 	-47,	//fBsyErr
! 	-48,	//dupFNErr
! 	-49,	//opWrErr
! 	-50,
! 	-51,	//rfNumErr
! 	-52,	//gfpErr
! 	-53,	//volOffLinErr
! 	-54,	//permErr
! 	-55,	//volOnLinErr
! 	-56,	//nsDrvErr
! 	-57,	//noMacDskErr
! 	-58,	//extFSErr
! 	-59,	//fsRnErr
! 	-60,	//badMDBErr
! 	-61,	//wrPermErr
! 	-64,	//noDriveErr
! 	-65,	//offLinErr
! 	-66,	//noNybErr
! 	-67,	//noAdrMkErr
! 	-68,	//dataVerErr
! 	-69,	//badCksmErr
! 	-70,	//badBtSlpErr
! 	-71,	//noDtaMkErr
! 	-72,	//badDCksum
! 	-73,
! 	-74,
! 	-75,
! 	-76,
! 	-77,
! 	-78,
! 	-79,
! 	-80,
! 	-81,
! 	-120,	//dirNFErr
! 	-121,
! 	-122,	//badMovErr
! 	-123,	//wrgVolTypErr
! 	-192,	//resNotFound
! 	-193,	//resFNotFound
! 	-194,	//addResFailed
! 	-196,	//rmvResFailed
! 	-198,	//resAttrErr
! 	-199,	//mapReadErr
! 	-100,
! 	-102,
! 	-108,	//memFullErr
! 	-109,	//nilHandleErr
! 	-111,
! 	-112,
! 	-117,
! 	-1703,
! 	-1719,
! 	-1704,
! 	-1705,
! 	-1708,
! 	-1712,
! 	-1711,
! 	-906,
! 	-1700,
! 	-1701,
! 	-1723,
! 	-1728,
! 	-5000,
! 	-5016,
! 	-5019,
! 	-5023,
! 	-5063,
! 	-10000,
! 	-10007,
! 	-10011,
! 	-10003,
! 	-10014,

! 	errAENewerVersion,
! 	errOSAScriptError,
! 	errAECantHandleClass,
! 	connectionInvalid,
! 	noUserInteractionAllowed,
! 	errOSASourceNotAvailable
  	}; /*systemerrortable*/

--- 58,155 ----
  systemerrortable [ctsystemerrors] = {

! 	{-33},	//dirFulErr
! 	{-34},	//dskFulErr
! 	{-35},	//nsvErr
! 	{-36},	//ioErr
! 	{-37},	//bdNamErr
! 	{-38},	//fnOpnErr
! 	{-39},	//eofErr
! 	{-40},	//posErr
! 	{-41},	//mFulErr
! 	{-42},	//tmfoErr
! 	{-43},	//fnfErr
! 	{-44},	//wPrErr
! 	{-45},	//fLckdErr
! 	{-46},	//vLckdErr
! 	{-47},	//fBsyErr
! 	{-48},	//dupFNErr
! 	{-49},	//opWrErr
! 	{-50},
! 	{-51},	//rfNumErr
! 	{-52},	//gfpErr
! 	{-53},	//volOffLinErr
! 	{-54},	//permErr
! 	{-55},	//volOnLinErr
! 	{-56},	//nsDrvErr
! 	{-57},	//noMacDskErr
! 	{-58},	//extFSErr
! 	{-59},	//fsRnErr
! 	{-60},	//badMDBErr
! 	{-61},	//wrPermErr
! 	{-64},	//noDriveErr
! 	{-65},	//offLinErr
! 	{-66},	//noNybErr
! 	{-67},	//noAdrMkErr
! 	{-68},	//dataVerErr
! 	{-69},	//badCksmErr
! 	{-70},	//badBtSlpErr
! 	{-71},	//noDtaMkErr
! 	{-72},	//badDCksum
! 	{-73},
! 	{-74},
! 	{-75},
! 	{-76},
! 	{-77},
! 	{-78},
! 	{-79},
! 	{-80},
! 	{-81},
! 	{-120},	//dirNFErr
! 	{-121},
! 	{-122},	//badMovErr
! 	{-123},	//wrgVolTypErr
! 	{-192},	//resNotFound
! 	{-193},	//resFNotFound
! 	{-194},	//addResFailed
! 	{-196},	//rmvResFailed
! 	{-198},	//resAttrErr
! 	{-199},	//mapReadErr
! 	{-100},
! 	{-102},
! 	{-108},	//memFullErr
! 	{-109},	//nilHandleErr
! 	{-111},
! 	{-112},
! 	{-117},
! 	{-1703},
! 	{-1719},
! 	{-1704},
! 	{-1705},
! 	{-1708},
! 	{-1712},
! 	{-1711},
! 	{-906},
! 	{-1700},
! 	{-1701},
! 	{-1723},
! 	{-1728},
! 	{-5000},
! 	{-5016},
! 	{-5019},
! 	{-5023},
! 	{-5063},
! 	{-10000},
! 	{-10007},
! 	{-10011},
! 	{-10003},
! 	{-10014},

! 	{errAENewerVersion},
! 	{errOSAScriptError},
! 	{errAECantHandleClass},
! 	{connectionInvalid},
! 	{noUserInteractionAllowed},
! 	{errOSASourceNotAvailable}
! 	
  	}; /*systemerrortable*/

***************
*** 159,249 ****
  systemerrortable [ctsystemerrors] = {

! 	-33,	//dirFulErr
! 	-34,	//dskFulErr
! 	-35,	//nsvErr
! 	-36,	//ioErr
! 	-37,	//bdNamErr
! 	-38,	//fnOpnErr
! 	-39,	//eofErr
! 	-40,	//posErr
! 	-41,	//mFulErr
! 	ERROR_TOO_MANY_OPEN_FILES,	//tmfoErr
! 	ERROR_FILE_NOT_FOUND,	//fnfErr
! 	-44,	//wPrErr
! 	-45,	//fLckdErr
! 	-46,	//vLckdErr
! 	ERROR_SHARING_VIOLATION,	//fBsyErr
! 	-48,	//dupFNErr
! 	-49,	//opWrErr
! 	-50,
! 	-51,	//rfNumErr
! 	-52,	//gfpErr
! 	-53,	//volOffLinErr
! 	-54,	//permErr
! 	-55,	//volOnLinErr
! 	-56,	//nsDrvErr
! 	-57,	//noMacDskErr
! 	-58,	//extFSErr
! 	-59,	//fsRnErr
! 	-60,	//badMDBErr
! 	-61,	//wrPermErr
! 	-64,	//noDriveErr
! 	-65,	//offLinErr
! 	-66,	//noNybErr
! 	-67,	//noAdrMkErr
! 	-68,	//dataVerErr
! 	-69,	//badCksmErr
! 	-70,	//badBtSlpErr
! 	-71,	//noDtaMkErr
! 	-72,	//badDCksum
! 	-73,
! 	-74,
! 	-75,
! 	-76,
! 	-77,
! 	-78,
! 	-79,
! 	-80,
! 	-81,
! 	ERROR_PATH_NOT_FOUND,	//dirNFErr
! 	-121,
! 	-122,	//badMovErr
! 	-123,	//wrgVolTypErr
! 	-192,	//resNotFound
! 	-193,	//resFNotFound
! 	-194,	//addResFailed
! 	-196,	//rmvResFailed
! 	-198,	//resAttrErr
! 	-199,	//mapReadErr
! 	-100,
! 	-102,
! 	ERROR_OUTOFMEMORY,	//memFullErr
! 	-109,	//nilHandleErr
! 	-111,
! 	-112,
! 	-117,
! 	-1703,
! 	-1719,
! 	-1704,
! 	-1705,
! 	-1708,
! 	-1712,
! 	-1711,
! 	-906,
! 	-1700,
! 	-1701,
! 	-1723,
! 	-1728,
! 	ERROR_ACCESS_DENIED,
! 	-5016,
! 	-5019,
! 	-5023,
! 	-5063,
! 	-10000,
! 	-10007,
! 	-10011,
! 	-10003,
! 	-10014,
! 
  	}; /*systemerrortable*/

--- 160,250 ----
  systemerrortable [ctsystemerrors] = {

! 	{-33},	//dirFulErr
! 	{-34},	//dskFulErr
! 	{-35},	//nsvErr
! 	{-36},	//ioErr
! 	{-37},	//bdNamErr
! 	{-38},	//fnOpnErr
! 	{-39},	//eofErr
! 	{-40},	//posErr
! 	{-41},	//mFulErr
! 	{ERROR_TOO_MANY_OPEN_FILES},	//tmfoErr
! 	{ERROR_FILE_NOT_FOUND},	//fnfErr
! 	{-44},	//wPrErr
! 	{-45},	//fLckdErr
! 	{-46},	//vLckdErr
! 	{ERROR_SHARING_VIOLATION},	//fBsyErr
! 	{-48},	//dupFNErr
! 	{-49},	//opWrErr
! 	{-50},
! 	{-51},	//rfNumErr
! 	{-52},	//gfpErr
! 	{-53},	//volOffLinErr
! 	{-54},	//permErr
! 	{-55},	//volOnLinErr
! 	{-56},	//nsDrvErr
! 	{-57},	//noMacDskErr
! 	{-58},	//extFSErr
! 	{-59},	//fsRnErr
! 	{-60},	//badMDBErr
! 	{-61},	//wrPermErr
! 	{-64},	//noDriveErr
! 	{-65},	//offLinErr
! 	{-66},	//noNybErr
! 	{-67},	//noAdrMkErr
! 	{-68},	//dataVerErr
! 	{-69},	//badCksmErr
! 	{-70},	//badBtSlpErr
! 	{-71},	//noDtaMkErr
! 	{-72},	//badDCksum
! 	{-73},
! 	{-74},
! 	{-75},
! 	{-76},
! 	{-77},
! 	{-78},
! 	{-79},
! 	{-80},
! 	{-81},
! 	{ERROR_PATH_NOT_FOUND},	//dirNFErr
! 	{-121},
! 	{-122},	//badMovErr
! 	{-123},	//wrgVolTypErr
! 	{-192},	//resNotFound
! 	{-193},	//resFNotFound
! 	{-194},	//addResFailed
! 	{-196},	//rmvResFailed
! 	{-198},	//resAttrErr
! 	{-199},	//mapReadErr
! 	{-100},
! 	{-102},
! 	{ERROR_OUTOFMEMORY},	//memFullErr
! 	{-109},	//nilHandleErr
! 	{-111},
! 	{-112},
! 	{-117},
! 	{-1703},
! 	{-1719},
! 	{-1704},
! 	{-1705},
! 	{-1708},
! 	{-1712},
! 	{-1711},
! 	{-906},
! 	{-1700},
! 	{-1701},
! 	{-1723},
! 	{-1728},
! 	{ERROR_ACCESS_DENIED},
! 	{-5016},
! 	{-5019},
! 	{-5023},
! 	{-5063},
! 	{-10000},
! 	{-10007},
! 	{-10011},
! 	{-10003},
! 	{-10014},
! 	
  	}; /*systemerrortable*/

***************
*** 263,267 ****

! setoserrorparam (bigstring bs) {

  	return (setparseparams (bs, nil, nil, nil));
--- 264,268 ----

! boolean setoserrorparam (bigstring bs) {

  	return (setparseparams (bs, nil, nil, nil));
***************
*** 278,282 ****

  	copystring (lasterrormessage, bs);
! 	} /*getoserrormessage*/

--- 279,283 ----

  	copystring (lasterrormessage, bs);
! 	} #*getoserrormessage*/