|
From: Karsten W. <kar...@us...> - 2005-12-15 21:43:03
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22823 Modified Files: langvalue.c Log Message: empty binary string fix Index: langvalue.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** langvalue.c 13 Jan 2005 23:58:04 -0000 1.7 --- langvalue.c 15 Dec 2005 21:42:52 -0000 1.8 *************** *** 119,123 **** static boolean gettokenvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { ! if (val.valuetype != tokenvaluetype) return (false); --- 119,123 ---- static boolean gettokenvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { ! #pragma unused(bsname, hnode, refcon) if (val.valuetype != tokenvaluetype) return (false); *************** *** 594,597 **** --- 594,602 ---- memtodisklong (typeid); + // kw - 2005-12-12 filemaker empty string fix + // we need to be able to handle empty strings that arrive as a binary['utxt'] + if (x == nil) + newhandle(0, &x); + if (!insertinhandle (x, 0L, &typeid, sizeof (typeid))) { *************** *** 7654,7658 **** static boolean kernelerrorroutine (long scripterrorrefcon, long lnum, short charnum, hdlhashtable *htable, bigstring bsname) { ! /* display an error for a system script -- a handler, agent or startup script. --- 7659,7663 ---- static boolean kernelerrorroutine (long scripterrorrefcon, long lnum, short charnum, hdlhashtable *htable, bigstring bsname) { ! #pragma unused(lnum, charnum) /* display an error for a system script -- a handler, agent or startup script. *************** *** 8517,8521 **** static boolean langgethandlervisit (hdlhashtable intable, bigstring bs, hdlhashtable *htable) { ! return (langgethandlercode (intable, handlercode.htree, &handlercode.hcode, htable, &handlercode.hnode)); } /*langgethandlervisit*/ --- 8522,8526 ---- static boolean langgethandlervisit (hdlhashtable intable, bigstring bs, hdlhashtable *htable) { ! #pragma unused(bs) return (langgethandlercode (intable, handlercode.htree, &handlercode.hcode, htable, &handlercode.hnode)); } /*langgethandlervisit*/ |