Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18089
Modified Files:
Tag: Nov2009
serialize_pftijah.mx
Log Message:
Back-ported bugfix from the development trunk to the Nov2009 branch:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
propagated changes of Monday Feb 01 2010 - Tuesday Feb 02 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/01 - hrode: modules/pftijah/serialize_pftijah.mx,1.83.2.1
fix for bug PFTIJAH: whitelist in "_param" bat incomplete - ID: 2929885
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: serialize_pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/serialize_pftijah.mx,v
retrieving revision 1.80.2.3
retrieving revision 1.80.2.4
diff -u -d -r1.80.2.3 -r1.80.2.4
--- serialize_pftijah.mx 23 Dec 2009 15:50:08 -0000 1.80.2.3
+++ serialize_pftijah.mx 3 Feb 2010 11:40:23 -0000 1.80.2.4
@@ -659,25 +659,30 @@
/* determine kind of filtering */
if ( strcmp(kind,"whitelist")==0 )
- tjctx->whitelisting = 1;
- else
+ tjctx->whitelisting = 1;
+ else
tjctx->whitelisting = 0;
+ if ( !(l = GDKstrdup(l)) ) {
+ GDKerror("init_tagFiltering: out of memory\n");
+ return 0;
+ }
/* read the tags */
if ( (t = strtok(l,delchars2)) ) do {
- /* not the empty string here */
- if ( cnt++ == 0 ) {
- tjctx->b_filtering = BATmirror(BAThash(BATmirror(
- BATnew(TYPE_void, TYPE_str,32)),0));
- if ( !tjctx->b_filtering ) {
- return 0;
- }
- }
- str v = (str)t;
- oid my_oid_nil = oid_nil;
- if ( !BUNins(tjctx->b_filtering, &my_oid_nil, v, FALSE) )
- return 0;
+ /* not the empty string here */
+ if ( cnt++ == 0 ) {
+ tjctx->b_filtering = BATmirror(BAThash(BATmirror(
+ BATnew(TYPE_void, TYPE_str,32)),0));
+ if ( !tjctx->b_filtering ) {
+ return 0;
+ }
+ }
+ str v = (str)t;
+ oid my_oid_nil = oid_nil;
+ if ( !BUNins(tjctx->b_filtering, &my_oid_nil, v, FALSE) )
+ return 0;
} while ( (t=strtok(NULL,delchars2)) );
+ GDKfree(l);
/* set runtime status variables */
tjctx->filterDepth = 0;
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
