This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".
The branch, master has been updated
via 6981cb0aba2e6cc819bb2c35c35175e53cf1e38c (commit)
via 5eb004e3b01dbd94c484cec16aff538be0a26df5 (commit)
from 6aad414a94a9aac8d3bc7494d9a36f5383674217 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6981cb0aba2e6cc819bb2c35c35175e53cf1e38c
Author: buccella <buc...@li...>
Date: Fri Apr 1 20:42:48 2011 -0400
bump version number to 1.4.1
commit 5eb004e3b01dbd94c484cec16aff538be0a26df5
Author: buccella <buc...@li...>
Date: Fri Apr 1 20:40:36 2011 -0400
fixing conflict
-----------------------------------------------------------------------
Summary of changes:
diff --git a/configure.ac b/configure.ac
index 890a71a..bc1a173 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(Small Footprint CIM Broker, 1.4.1preview, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.4.1, sbl...@li..., sblim-sfcb)
AC_CONFIG_SRCDIR([providerDrv.c])
#disable "seems to ignore the --datarootdir setting" warnings
diff --git a/queryOperation.c b/queryOperation.c
index 39f3162..2c04139 100644
--- a/queryOperation.c
+++ b/queryOperation.c
@@ -230,6 +230,14 @@ charsCompare(QLOperand * self, QLOperand * op, QLPropertySource * src)
else
ov = op->charsVal;
+ if (sov == NULL || ov == NULL) {
+ if (sov == NULL && ov == NULL)
+ return 0; // both null
+ if (sov == NULL)
+ return -1; // left only null
+ return 1; // right only null
+ }
+
if (type == QL_Chars)
return strcmp(sov, ov);
return -2;
@@ -299,7 +307,19 @@ propCompare(QLOperand * self, QLOperand * op, QLPropertySource * src)
; // what should we do here ?
}
- rc = nop->ft->compare(nop, op, src);
+ if (nop) {
+ rc=nop->ft->compare(nop,op,src);
+ } else {
+ rc=-2;
+ if ((type == QL_Null) && (op->type == QL_PropertyName)) {
+ // both are property names
+ v=getPropValue(op, src, &type);
+ if (type == QL_Null) {
+ rc=0; // both are NULL, a match
+ }
+ }
+ }
+
QL_TRACE(fprintf
(stderr, "propCompare(%s) %d\n", self->propertyName->propName,
rc));
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
