Menu
▾
▴
SF.net SVN: frontierkernel: [1260] Frontier/trunk/Common/source
|
From: <set...@us...> - 2006-04-13 06:13:26
|
Revision: 1260 Author: sethdill Date: 2006-04-12 23:13:10 -0700 (Wed, 12 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1260&view=rev Log Message: ----------- No more pointer signedness issues under GCC 4! This final batch of changes took it down to 0 warnings. Modified Paths: -------------- Frontier/trunk/Common/source/OpenTransportNetEvents.c Frontier/trunk/Common/source/claybrowservalidate.c Frontier/trunk/Common/source/claylinelayout.c Frontier/trunk/Common/source/langdll.c Frontier/trunk/Common/source/langexternal.c Frontier/trunk/Common/source/langhash.c Frontier/trunk/Common/source/langlist.c Frontier/trunk/Common/source/langops.c Frontier/trunk/Common/source/langpack.c Frontier/trunk/Common/source/langquicktime.c Frontier/trunk/Common/source/langregexp.c Frontier/trunk/Common/source/langstartup.c Frontier/trunk/Common/source/langverbs.c Frontier/trunk/Common/source/langwinipc.c Frontier/trunk/Common/source/langxml.c Frontier/trunk/Common/source/menuverbs.c Frontier/trunk/Common/source/oplangtext.c Frontier/trunk/Common/source/oppack.c Frontier/trunk/Common/source/oppopup.c Frontier/trunk/Common/source/opstructure.c Frontier/trunk/Common/source/opvalidate.c Frontier/trunk/Common/source/popup.c Frontier/trunk/Common/source/shellfile.c Frontier/trunk/Common/source/shellprint.c Frontier/trunk/Common/source/shellsysverbs.c Frontier/trunk/Common/source/shellverbs.c Frontier/trunk/Common/source/stringverbs.c Modified: Frontier/trunk/Common/source/OpenTransportNetEvents.c =================================================================== --- Frontier/trunk/Common/source/OpenTransportNetEvents.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/OpenTransportNetEvents.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -682,9 +682,9 @@ if (fllogger) { - convertcstring (TCPmsg); + convertcstring (BIGSTRING (TCPmsg)); - aboutsetmiscstring (TCPmsg); + aboutsetmiscstring ( BIGSTRING (TCPmsg)); } } /*TCPWRITEMSG*/ @@ -2604,9 +2604,9 @@ setstringlength (IPaddr, 0); - OTInetHostToString (addr, stringbaseaddress (IPaddr)); + OTInetHostToString (addr, (char *)(stringbaseaddress (IPaddr))); - setstringlength (IPaddr, strlen (stringbaseaddress (IPaddr))); + setstringlength (IPaddr, strlen (stringbaseaddress ((char *)IPaddr))); return (true); } /*fwsNetEventAddressDecode*/ @@ -2624,7 +2624,7 @@ nullterminate (IPaddr); - err = OTInetStringToHost (stringbaseaddress (IPaddr), &host); + err = OTInetStringToHost (stringbaseaddress ((char *)IPaddr), &host); if (err != kOTNoError) { @@ -2690,7 +2690,7 @@ /*fire off query*/ - err = OTInetAddressToName (inetservice, (InetHost) addr, stringbaseaddress (domainName)); + err = OTInetAddressToName (inetservice, (InetHost) addr, stringbaseaddress ((char *)domainName)); if (err != kOTNoError) goto exit2; @@ -2715,7 +2715,7 @@ return (false); } - setstringlength (domainName, strlen (stringbaseaddress (domainName))); + setstringlength (domainName, strlen (stringbaseaddress ((char *)domainName))); poptrailingchars (domainName, '.'); @@ -3218,9 +3218,9 @@ OSStatus err; #if TARGET_API_MAC_CARBON == 1 - err = NewThread (kCooperativeThread, gThreadEntryCallback, (void *)listenref, 0, kUsePremadeThread + kCreateIfNeeded + kFPUNotNeeded, nil, &listenref->idthread); + err = NewThread (kCooperativeThread, gThreadEntryCallback, (void *)listenref, 0, kUsePremadeThread + kCreateIfNeeded + kFPUNotNeeded, nil, (ThreadID *)(&listenref->idthread)); #else - err = NewThread (kCooperativeThread, fwsacceptingthreadmain, (void *)listenref, 0, kUsePremadeThread + kCreateIfNeeded + kFPUNotNeeded, nil, &listenref->idthread); + err = NewThread (kCooperativeThread, fwsacceptingthreadmain, (void *)listenref, 0, kUsePremadeThread + kCreateIfNeeded + kFPUNotNeeded, nil, (ThreadID *)(&listenref->idthread)); #endif if (kOTNoError != err) { Modified: Frontier/trunk/Common/source/claybrowservalidate.c =================================================================== --- Frontier/trunk/Common/source/claybrowservalidate.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/claybrowservalidate.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -59,8 +59,8 @@ byte * actionstrings [] = { - "\x06" "moving", - "\x07" "pasting" + BIGSTRING ("\x06" "moving"), + BIGSTRING ("\x07" "pasting") }; @@ -75,16 +75,16 @@ byte * dialogstrings [] = { - "\x40" "Some items in this location have the same names as items you're ", - "\x02" "An", - "\x07" "A newer", - "\x08" "An older", + BIGSTRING ("\x40" "Some items in this location have the same names as items you're "), + BIGSTRING ("\x02" "An"), + BIGSTRING ("\x07" "A newer"), + BIGSTRING ("\x08" "An older"), #ifdef MACVERSION - "\x0d" " item named \xD2", - "\x22" "\xD3 already exists in this location." + BIGSTRING ("\x0d" " item named \xD2"), + BIGSTRING ("\x22" "\xD3 already exists in this location.") #else - "\x0d" " item named \"", - "\x22" "\" already exists in this location." + BIGSTRING ("\x0d" " item named \""), + BIGSTRING ("\x22" "\" already exists in this location.") #endif }; Modified: Frontier/trunk/Common/source/claylinelayout.c =================================================================== --- Frontier/trunk/Common/source/claylinelayout.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/claylinelayout.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -1471,9 +1471,9 @@ info.statuscolor = layout.statuscolor; - fontgetname (layout.filenamefont, info.filenamefont); + fontgetname (layout.filenamefont, BIGSTRING (info.filenamefont)); - fontgetname (layout.othertextfont, info.othertextfont); + fontgetname (layout.othertextfont, BIGSTRING (info.othertextfont)); info.filenamefontsize = layout.filenamefontsize; @@ -1560,9 +1560,9 @@ layout.statuscolor = info.statuscolor; - fontgetnumber (info.filenamefont, &layout.filenamefont); + fontgetnumber (BIGSTRING (info.filenamefont), &layout.filenamefont); - fontgetnumber (info.othertextfont, &layout.othertextfont); + fontgetnumber (BIGSTRING (info.othertextfont), &layout.othertextfont); layout.filenamefontsize = info.filenamefontsize; Modified: Frontier/trunk/Common/source/langdll.c =================================================================== --- Frontier/trunk/Common/source/langdll.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langdll.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -376,7 +376,7 @@ grabthreadglobals (); if (((value->valuetype == odb_recordvaluetype) || (value->valuetype == odb_listvaluetype)) && (value->data.listvalue != NULL)) { - res = opdeletelistitem ((hdllistrecord) value->data.listvalue, (short) idx, recordname); + res = opdeletelistitem ((hdllistrecord) value->data.listvalue, (short) idx, (ptrstring)recordname); } releasethreadglobals (); @@ -397,7 +397,7 @@ convertodbtotyval (valueData, &val); - res = setnthlistval ((hdllistrecord) value->data.listvalue, idx, recordname, &val); + res = setnthlistval ((hdllistrecord) value->data.listvalue, idx, (ptrstring) recordname, &val); } releasethreadglobals (); @@ -416,7 +416,7 @@ grabthreadglobals (); if (((value->valuetype == odb_recordvaluetype) || (value->valuetype == odb_listvaluetype)) && (value->data.listvalue != NULL)) { - res = getnthlistval ((hdllistrecord) value->data.listvalue, idx, recordname, &valret); + res = getnthlistval ((hdllistrecord) value->data.listvalue, idx, (ptrstring) recordname, &valret); if (res) res = converttyvaltoodb (&valret, valueReturn); @@ -441,7 +441,7 @@ convertodbtotyval (valueData, &val); - res = langpushlistval ((hdllistrecord) value->data.listvalue, recordname, &val); + res = langpushlistval ((hdllistrecord) value->data.listvalue, (ptrstring) recordname, &val); } releasethreadglobals (); Modified: Frontier/trunk/Common/source/langexternal.c =================================================================== --- Frontier/trunk/Common/source/langexternal.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langexternal.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -1318,7 +1318,7 @@ if (pht != nil) { /*Then lets follow the nodes up...*/ - if (fullpathsearch (ht, pht, "", flonlyinmemory, flquote, flincludeself, bs, hroot)) { + if (fullpathsearch (ht, pht, BIGSTRING (""), flonlyinmemory, flquote, flincludeself, bs, hroot)) { if ((ht != pht) || flincludeself) { Modified: Frontier/trunk/Common/source/langhash.c =================================================================== --- Frontier/trunk/Common/source/langhash.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langhash.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -2219,7 +2219,7 @@ register ptrbyte p; - p = *hget + ix; + p = (ptrbyte)(*hget + ix); moveleft (p, bs, (unsigned long) *p + 1); } /*hashunpackstring*/ @@ -2259,7 +2259,7 @@ static boolean hashunpackbinary (Handle hget, Handle *hbinary, long ix) { - unsigned long ctbytes; + long ctbytes; if (!loadlongfromdiskhandle (hget, &ix, &ctbytes)) return (false); @@ -2395,7 +2395,7 @@ */ - unsigned long ctbytes; + long ctbytes; if (!loadlongfromdiskhandle (hget, &ix, &ctbytes)) return (false); @@ -2452,7 +2452,7 @@ static boolean hashunpackexternal (Handle hget, boolean flmemory, hdlexternalhandle *h, long ix) { - unsigned long ctbytes; + long ctbytes; Handle hpacked; boolean fl; Modified: Frontier/trunk/Common/source/langlist.c =================================================================== --- Frontier/trunk/Common/source/langlist.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langlist.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -341,7 +341,7 @@ goto error; if (i < n) - if (!writehandlestreamstring (&s, "\x02, ")) + if (!writehandlestreamstring (&s, BIGSTRING ("\x02, "))) goto error; } Modified: Frontier/trunk/Common/source/langops.c =================================================================== --- Frontier/trunk/Common/source/langops.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langops.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -155,7 +155,7 @@ {'scpt', STR_script}, - {'mbar', STR_menubar}, + {'mbar', BIGSTRING (STR_menubar)}, {'pict', STR_picture} Modified: Frontier/trunk/Common/source/langpack.c =================================================================== --- Frontier/trunk/Common/source/langpack.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langpack.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -386,7 +386,7 @@ if (hinfo == nil) { - langparamerror (badwindowerror, "\x04" "pack"); + langparamerror (badwindowerror, BIGSTRING ("\x04" "pack")); return (false); } Modified: Frontier/trunk/Common/source/langquicktime.c =================================================================== --- Frontier/trunk/Common/source/langquicktime.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langquicktime.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -98,7 +98,7 @@ if (!playeropenmovieinwindow (&fs)) { - langerrormessage ("\x31" "Can't open the file because of a QuickTime error."); + langerrormessage (BIGSTRING ("\x31" "Can't open the file because of a QuickTime error.")); return (false); } /*if*/ Modified: Frontier/trunk/Common/source/langregexp.c =================================================================== --- Frontier/trunk/Common/source/langregexp.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langregexp.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -2259,14 +2259,14 @@ tyregexpsearchinfo info; - info.p = ptext; + info.p = (char *)ptext; info.hcp = hcp; info.hovector = hovector; openhandlestream (nil, &info.s); disablelangerror (); - fl = regexpscanreplacement (stringbaseaddress (searchparams.bsorigreplace), + fl = regexpscanreplacement (stringbaseaddress ((char *) searchparams.bsorigreplace), stringlength (searchparams.bsorigreplace), bsdummy, ®exptextsearchwriteliteral, Modified: Frontier/trunk/Common/source/langstartup.c =================================================================== --- Frontier/trunk/Common/source/langstartup.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langstartup.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -184,7 +184,7 @@ while (--ctefps >= 0) { - copyrezstring (*hefps + ix, bsname); + copyrezstring (BIGSTRING (*hefps + ix), bsname); ix += stringsize (bsname); @@ -201,7 +201,7 @@ while (--ctverbs >= 0 && fl) { - copyrezstring (*hefps + ix, bsname); + copyrezstring (BIGSTRING (*hefps + ix), bsname); ix += stringsize (bsname); @@ -235,7 +235,7 @@ #endif - gestalt (gestaltSystemVersion, &x); + gestalt (gestaltSystemVersion, (long *)(&x)); langassignbooleanvalue (ht, str_isMac, true); @@ -278,7 +278,7 @@ /* get os full display name */ - copystring ("sw_vers -productName", bs); + copystring ((unsigned char *)"sw_vers -productName", bs); sethandlecontents (bs, stringsize (bs), hcommand); @@ -294,7 +294,7 @@ /* 2004-11-19 creedon - is mac os classic */ /* This needs to be checked on Mac OS Classic as well as Mac OS 9 proper. */ - err = gestalt (gestaltMacOSCompatibilityBoxAttr, &response); + err = gestalt (gestaltMacOSCompatibilityBoxAttr, (long *)(&response)); if ((err == noErr) && ((response & (1 << gestaltMacOSCompatibilityBoxPresent)) != 0)) isMacOsClassic = true; Modified: Frontier/trunk/Common/source/langverbs.c =================================================================== --- Frontier/trunk/Common/source/langverbs.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langverbs.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -565,7 +565,7 @@ hv = (hdlexternalvariable) v.data.externalvalue; - if (!langexternalgettimes (hv, &timecreated, &timemodified, hnode)) + if (!langexternalgettimes (hv, (long *)(&timecreated), (long *)(&timemodified), hnode)) return (false); if (token == settimecreatedfunc) @@ -3294,7 +3294,7 @@ if (!getstringvalue (hparam1, 1, bs)) return (false); - if (fwsNetEventAddressEncode(bs, &addr)) + if (fwsNetEventAddressEncode(bs, (unsigned long *)(&addr))) return (setlongvalue (addr, v)); return (false); @@ -3324,7 +3324,7 @@ if (!getstringvalue (hparam1, 1, bs)) return (false); - if (fwsNetEventNameToAddress(bs, &addr)) + if (fwsNetEventNameToAddress(bs, (unsigned long *)(&addr))) return (setlongvalue (addr, v)); return (false); @@ -3334,7 +3334,7 @@ { long addr; - if (fwsNetEventMyAddress(&addr)) + if (fwsNetEventMyAddress((unsigned long *)(&addr))) return (setlongvalue (addr, v)); return (false); @@ -3399,7 +3399,7 @@ if (!getlongvalue (hparam1, 2, &port)) return (false); - if (fwsNetEventOpenAddrStream (addr, port, &stream)) + if (fwsNetEventOpenAddrStream (addr, port, (unsigned long *)(&stream))) return (setlongvalue (stream, v)); return (false); @@ -3418,7 +3418,7 @@ if (!getlongvalue (hparam1, 2, &port)) return (false); - if (fwsNetEventOpenNameStream (bs, port, &stream)) + if (fwsNetEventOpenNameStream (bs, port, (unsigned long *)(&stream))) return (setlongvalue (stream, v)); return (false); @@ -3446,7 +3446,7 @@ charbuffer = *buf; - if (fwsNetEventReadStream (stream, &len, charbuffer)) { + if (fwsNetEventReadStream (stream, (unsigned long *)(&len), charbuffer)) { unlockhandle (buf); SetHandleSize (buf, len); return (setbinaryvalue (buf, '\?\?\?\?', v)); @@ -3518,10 +3518,10 @@ flnextparamislast = true; - if (!getlongvalue (hparam1, 5, &ipaddr)) + if (!getlongvalue (hparam1, 5, (long *)(&ipaddr))) return (false); - if (fwsNetEventListenStream (port, depth, bsFullName, refcon, &stream, ipaddr, (long)(**((hdlexternalvariable)(**ht).hashtablerefcon)).hdatabase)) + if (fwsNetEventListenStream (port, depth, bsFullName, refcon, (unsigned long *)(&stream), ipaddr, (long)(**((hdlexternalvariable)(**ht).hashtablerefcon)).hdatabase)) return (setlongvalue (stream, v)); return (false); Modified: Frontier/trunk/Common/source/langwinipc.c =================================================================== --- Frontier/trunk/Common/source/langwinipc.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langwinipc.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -1071,7 +1071,7 @@ if (!fl) { - setstringvalue ("0x31" "Can't complete call because of a parameter error.", vreturned); + setstringvalue (BIGSTRING ("0x31" "Can't complete call because of a parameter error."), vreturned); langdisposetree (hfunctioncall); Modified: Frontier/trunk/Common/source/langxml.c =================================================================== --- Frontier/trunk/Common/source/langxml.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/langxml.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -178,7 +178,7 @@ if (ct < ctcompare) return (false); - return (strncmp (stringbaseaddress (bs), ((char *) *h), ctcompare) == 0); + return (strncmp (stringbaseaddress ((char *) bs), ((char *) *h), ctcompare) == 0); } /*handleendswith*/ @@ -200,7 +200,7 @@ static boolean handlecontains (Handle h, bigstring bs) { - return (textpatternmatch (*h, gethandlesize (h), bs, false) >= 0); + return (textpatternmatch ((byte *)(*h), gethandlesize (h), bs, false) >= 0); } /*handlecontains*/ @@ -1543,7 +1543,7 @@ static boolean findinhandlestream (handlestream *s, bigstring bsfind, boolean flunicase) { - byte *p = *(*s).data; + byte *p = (byte *) (*(*s).data); long ix; ix = textpatternmatch (p + (*s).pos, (*s).eof - (*s).pos, bsfind, flunicase); @@ -1872,7 +1872,7 @@ long ctbytes = gethandlesize ((*adrtoken).tokenstring); long ixword, lenword; - if (!textnthword (*h, ctbytes, 2, ':', true, &ixword, &lenword)) + if (!textnthword ((ptrbyte)(*h), ctbytes, 2, ':', true, &ixword, &lenword)) sethandlesize (h, 0); else { @@ -3153,7 +3153,7 @@ if ((*h)[0] == '/') /*handle leading slash*/ ctwd++; - while (textnthword (*h, len, ctwd++, '/', true, &ix, &lenwd)) { + while (textnthword ((ptrbyte)(*h), len, ctwd++, '/', true, &ix, &lenwd)) { disablelangerror (); Modified: Frontier/trunk/Common/source/menuverbs.c =================================================================== --- Frontier/trunk/Common/source/menuverbs.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/menuverbs.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -501,7 +501,7 @@ pushchar (']', bspath); - insertstring ("\x02" " [", bspath); + insertstring (BIGSTRING ("\x02" " ["), bspath); insertstring (bsparent, bspath); Modified: Frontier/trunk/Common/source/oplangtext.c =================================================================== --- Frontier/trunk/Common/source/oplangtext.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/oplangtext.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -225,7 +225,7 @@ if (len1 > 0) { - len2 = langcommentdelete (chcomment, *bshead, len1); + len2 = langcommentdelete (chcomment, (byte *) (*bshead), len1); if (len2 >= 0) { /* line is partly a comment */ @@ -261,11 +261,11 @@ if ((level < langtextlastlevel) || !fllastwascomment) { if (bshead) - textfirstword (*bshead, gethandlesize (bshead), chspace, bsfirst); + textfirstword ((ptrbyte) (*bshead), gethandlesize (bshead), chspace, bsfirst); else setemptystring (bsfirst); - if (!equalidentifiers (bsfirst, STR_else)) { /*never want a semicolon before else*/ + if (!equalidentifiers (bsfirst, BIGSTRING (STR_else))) { /*never want a semicolon before else*/ if (!flmakeitpretty || !flcomment || !remainingsubheadsarecomments (h)) /* no semicolon before the closing braces */ pushchar (';', bs); Modified: Frontier/trunk/Common/source/oppack.c =================================================================== --- Frontier/trunk/Common/source/oppack.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/oppack.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -599,7 +599,7 @@ register ptrbyte p; - p = *h; + p = BIGSTRING (*h); p += ixheader; @@ -835,7 +835,7 @@ while ((*textstream).pos < (*textstream).eof) { /*copy the text chars into the string*/ - p = *(*textstream).data + (*textstream).pos; + p = (ptrbyte) (*(*textstream).data + (*textstream).pos); if (*p == chreturn) { @@ -1108,7 +1108,7 @@ if (!readhandlestream (&packstream, &versionnumber, sizeof (versionnumber))) { - shellerrormessage ("\x3d" "Can't unpack outline because unexpected data was encountered."); + shellerrormessage (BIGSTRING ("\x3d" "Can't unpack outline because unexpected data was encountered.")); opdisposeoutline (ho, false); Modified: Frontier/trunk/Common/source/oppopup.c =================================================================== --- Frontier/trunk/Common/source/oppopup.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/oppopup.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -176,7 +176,7 @@ hdlmenu hsubmenu; short idsubmenu = currmenuid; - hsubmenu = Newmenu (idsubmenu, ""); + hsubmenu = Newmenu (idsubmenu, BIGSTRING ("")); #if MACVERSION InsertMenu (hsubmenu, -1); Modified: Frontier/trunk/Common/source/opstructure.c =================================================================== --- Frontier/trunk/Common/source/opstructure.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/opstructure.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -2497,7 +2497,7 @@ setstringwithchar (chreturn, bsreturn); - return (textpatternmatch (*htext, gethandlesize (htext), bsreturn, false) >= 0); + return (textpatternmatch ((byte *) (*htext), gethandlesize (htext), bsreturn, false) >= 0); /* bigstring bs; Modified: Frontier/trunk/Common/source/opvalidate.c =================================================================== --- Frontier/trunk/Common/source/opvalidate.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/opvalidate.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -150,7 +150,7 @@ if (ctexpanded != (**ho).ctexpanded) { - shellinternalerror(idinvalidoutline, "\x15" "expansion count error"); + shellinternalerror(idinvalidoutline, BIGSTRING ("\x15" "expansion count error")); (**ho).ctexpanded = ctexpanded; /*once is enough for this message*/ Modified: Frontier/trunk/Common/source/popup.c =================================================================== --- Frontier/trunk/Common/source/popup.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/popup.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -127,7 +127,7 @@ hchosenmenu = GetMenuHandle (idmenu); if (hchosenmenu != nil) /* 2002-10-12 AR */ - if (GetMenuItemCommandID (hchosenmenu, iditem, &commandid) == noErr) + if (GetMenuItemCommandID (hchosenmenu, iditem, (MenuCommand *)(&commandid)) == noErr) if (commandid > 0) return (commandid); /* Modified: Frontier/trunk/Common/source/shellfile.c =================================================================== --- Frontier/trunk/Common/source/shellfile.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/shellfile.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -58,8 +58,8 @@ #include "FrontierWinMain.h" #endif -#define str_desktopscript "\x04" "ftds" -#define str_normalscript "\x04" "ftsc" +#define str_desktopscript BIGSTRING ("\x04" "ftds") +#define str_normalscript BIGSTRING ("\x04" "ftsc") #define type_desktopscript 'FTds' #define type_normalscript 'FTsc' #define type_wptext 'FTwp' @@ -262,7 +262,7 @@ gethashkey (hnode, bs); - if (patternmatch ("\x04type", bs) == 1) { + if (patternmatch (BIGSTRING ("\x04type"), bs) == 1) { midstring (bs, 5, 4, bstype); Modified: Frontier/trunk/Common/source/shellprint.c =================================================================== --- Frontier/trunk/Common/source/shellprint.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/shellprint.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -892,10 +892,10 @@ //limit this to the number of pages the user asked for. - theErr = PMGetFirstPage(shellprintinfo.printsettings, &firstPage); + theErr = PMGetFirstPage(shellprintinfo.printsettings, (UInt32 *) (&firstPage)); if (theErr == noErr) { - theErr = PMGetLastPage(shellprintinfo.printsettings, &lastPage); + theErr = PMGetLastPage(shellprintinfo.printsettings, (UInt32 *) (&lastPage)); } //sanity checks Modified: Frontier/trunk/Common/source/shellsysverbs.c =================================================================== --- Frontier/trunk/Common/source/shellsysverbs.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/shellsysverbs.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -1590,7 +1590,7 @@ case settimeslicefunc: flnextparamislast = true; - if (!getlongvalue (hparam1, 1, &ticks)) + if (!getlongvalue (hparam1, 1, (long *) (&ticks))) return (false); return (setbooleanvalue (setprocesstimeslice (ticks), v)); @@ -1606,7 +1606,7 @@ case setdefaulttimeslicefunc: flnextparamislast = true; - if (!getlongvalue (hparam1, 1, &ticks)) + if (!getlongvalue (hparam1, 1, (long *) (&ticks))) return (false); return (setbooleanvalue (setdefaulttimeslice (ticks), v)); Modified: Frontier/trunk/Common/source/shellverbs.c =================================================================== --- Frontier/trunk/Common/source/shellverbs.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/shellverbs.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -521,14 +521,14 @@ options = PCRE_DOTALL | PCRE_MULTILINE | PCRE_NOTEMPTY | (searchparams.flunicase ? PCRE_CASELESS : 0L); - if (!regexpcompile (stringbaseaddress (searchparams.bsorigfind), options, bsmsg, &searchparams.hcompiledpattern)) { + if (!regexpcompile (stringbaseaddress ((char *) (searchparams.bsorigfind)), options, bsmsg, &searchparams.hcompiledpattern)) { if (!isemptystring (bsmsg)) langerrormessage (bsmsg); goto exit; } if (!regexpcheckreplacement (searchparams.hcompiledpattern, - stringbaseaddress (searchparams.bsorigreplace), + stringbaseaddress ((char *) (searchparams.bsorigreplace)), stringlength (searchparams.bsorigreplace))) { goto exit; } Modified: Frontier/trunk/Common/source/stringverbs.c =================================================================== --- Frontier/trunk/Common/source/stringverbs.c 2006-04-13 04:56:46 UTC (rev 1259) +++ Frontier/trunk/Common/source/stringverbs.c 2006-04-13 06:13:10 UTC (rev 1260) @@ -1148,7 +1148,7 @@ lockhandle (h); #if MACVERSION - maclowertext ((Ptr) *h, gethandlesize (h)); + maclowertext ((byte *) (*h), gethandlesize (h)); #else lowertext ((ptrbyte) *h, gethandlesize (h)); #endif @@ -1767,7 +1767,7 @@ lockhandle (x); #if MACVERSION - macuppertext ((Ptr) *x, gethandlesize (x)); + macuppertext ((byte *) (*x), gethandlesize (x)); #else uppertext ((ptrbyte) *x, gethandlesize (x)); #endif @@ -1791,7 +1791,7 @@ lockhandle (x); #if MACVERSION - maclowertext ((Ptr) *x, gethandlesize (x)); + maclowertext ((byte *) (*x), gethandlesize (x)); #else lowertext ((ptrbyte) *x, gethandlesize (x)); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
