From ebc37f92ba12ad768d192ed1e260e128daa8f3e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= Date: Thu, 17 May 2007 17:12:44 +0000 Subject: [PATCH] fix build on SL44: do not check NULL == NULL --- org.glite.lb.common/src/events_parse.c.T | 4 ++-- org.glite.lb/project/types.T | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/org.glite.lb.common/src/events_parse.c.T b/org.glite.lb.common/src/events_parse.c.T index 6b83e24..5274f0b 100644 --- a/org.glite.lb.common/src/events_parse.c.T +++ b/org.glite.lb.common/src/events_parse.c.T @@ -601,7 +601,7 @@ for (i=0; inum; i++) { edg_wll_ULMDateToTimeval(value,&this->any.arrived); break; case ULM_HOST : - if (!(((this->any.host) == NULL && (NULL) == NULL) || ((this->any.host)&&(NULL)&& !strcmp(this->any.host,NULL)))) DUPLICITY + if (!(((this->any.host) == NULL) || ((this->any.host)&& !strcmp(this->any.host,"")))) DUPLICITY this->any.host = strdup(value); break; case ULM_LVL : @@ -613,7 +613,7 @@ for (i=0; inum; i++) { this->any.source = edg_wll_StringToSource(value); break; case EDG_WLL_COMMON_SRC_INSTANCE : - if (!(((this->any.src_instance) == NULL && (NULL) == NULL) || ((this->any.src_instance)&&(NULL)&& !strcmp(this->any.src_instance,NULL)))) DUPLICITY + if (!(((this->any.src_instance) == NULL) || ((this->any.src_instance)&& !strcmp(this->any.src_instance,"")))) DUPLICITY this->any.src_instance = strdup(value); break; @@@{ diff --git a/org.glite.lb/project/types.T b/org.glite.lb/project/types.T index 5fa6056..888b45c 100644 --- a/org.glite.lb/project/types.T +++ b/org.glite.lb/project/types.T @@ -120,8 +120,12 @@ port=>'"($a == $b)"', # level=>'"($a == $b)"', bool=>'"(($a || !$b) && ($b || !$a))"', - string=>'"(($a) == NULL && ($b) == NULL) || (($a)&&($b)&& !strcmp($a,$b))"', - jobid=>'"(($a) == NULL && ($b) == NULL) || (($a)&&($b)&& !strcmp(edg_wlc_JobIdUnparse($a),edg_wlc_JobIdUnparse($b)))"', +# string=>'"(($a) == NULL && ($b) == NULL) || (($a)&&($b)&& !strcmp($a,$b))"', + string=>'if ($b =~ m/^NULL/) { qq{(($a) == NULL) || (($a)&& !strcmp($a,""))}; } + else { qq{(($a) == NULL && ($b) == NULL) || (($a)&&($b)&& !strcmp($a,$b))}; } ', +# jobid=>'"(($a) == NULL && ($b) == NULL) || (($a)&&($b)&& !strcmp(edg_wlc_JobIdUnparse($a),edg_wlc_JobIdUnparse($b)))"', + jobid=>'if ($b =~ m/^NULL/) { qq{(($a) == NULL) || (($a)&& !strcmp(edg_wlc_JobIdUnparse($a),""))}; } + else { qq{(($a) == NULL && ($b) == NULL) || (($a)&&($b)&& !strcmp(edg_wlc_JobIdUnparse($a),edg_wlc_JobIdUnparse($b)))}; }', notifid=>'"($a) == ($b)"', logsrc=>'"($a) == ($b)"', timeval=>'"($a).tv_sec == ($b).tv_sec && ($a).tv_usec == ($b).tv_usec"', -- 1.8.2.3