Update of /cvsroot/monetdb/MonetDB4/src/modules/plain
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2116/src/modules/plain
Modified Files:
ascii_io.mx
Log Message:
correctly check for null values
Index: ascii_io.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/ascii_io.mx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ascii_io.mx 18 Feb 2008 19:28:48 -0000 1.23
+++ ascii_io.mx 18 Feb 2008 19:57:12 -0000 1.24
@@ -680,9 +680,8 @@
e = s;
if ( s == NULL ||
(s == e && fmt->nullstr[0] == 0) ||
- (!quote && strcasecmp(s,fmt->nullstr) == 0) ||
- (quote && strncasecmp(s+1, fmt->nullstr, e-s) == 0)
- ) {
+ (s != e && !quote && strcasecmp(s,fmt->nullstr) == 0) ||
+ (s != e && quote && strncasecmp(s+1, fmt->nullstr, e-s) == 0)) {
adt = fmt->data;
memcpy(adt, ATOMnilptr(fmt->adt), fmt->nillen);
} else {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
