[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-ha-dev
Subject:    Re: [Linux-ha-dev] Problem building head on FreeBSD:
From:       Andrew Beekhof <lists () beekhof ! net>
Date:       2004-10-22 9:34:07
Message-ID: 85796FBD-240D-11D9-B5BB-000A95B71D78 () beekhof ! net
[Download RAW message or body]

Hi Lars,

with the exceptions noted below, I'm happy for you to commit all your 
changes to the CRM code.
any chance the new declarations of xmlNodePtr could be initialized to 
NULL please?

keep up the good work!

Andrew

On Oct 22, 2004, at 3:13 AM, Lars Ellenberg wrote:

> +++ crm/pengine/unpack.c	22 Oct 2004 00:19:03 -0000
> @@ -1187,6 +1187,8 @@ unpack_rsc_location(
>  	xml_child_iter(
>  		xml_obj, rule, "rule",
>
> +		gboolean rule_has_expressions = FALSE;
> +
>  		gboolean first_expr = TRUE;
>  		gboolean can_run    = FALSE;
>  		gboolean do_and     = TRUE;
> @@ -1218,7 +1220,6 @@ unpack_rsc_location(
>  			continue;
>  		}
>  		
> -		gboolean rule_has_expressions = FALSE;

can you re-initialize here instead please.  ie:
+                rule_has_expressions = FALSE;


>  		xml_child_iter(
>  			rule, expr, "expression",



> Index: include/crm/crm.h
> ===================================================================
> RCS file: /home/cvs/linux-ha/linux-ha/include/crm/crm.h,v
> retrieving revision 1.29
> diff -u -p -r1.29 crm.h
> --- include/crm/crm.h	18 Oct 2004 19:03:57 -0000	1.29
> +++ include/crm/crm.h	22 Oct 2004 00:19:15 -0000
> @@ -119,14 +119,14 @@ typedef GList* GListPtr;
>
>  #define slist_iter(w, x, y, z, a)					\
>  	{								\
> -		GListPtr __crm_iter_head = y;				\
>  		x *w = NULL;						\
> +		GListPtr __crm_iter_head = y;				\

what's the change here?

>  		z = 0;							\
>  		while(__crm_iter_head != NULL) {			\
>  			z++;						\
>  			w = __crm_iter_head->data;			\
>  			__crm_iter_head = __crm_iter_head->next;	\
> -			a;						\
> +			{ a; }						\

ok makes sense.

>  		}							\
>  	}								\


--
Andrew Beekhof

"No means no, and no mean yes, and everything in between and all the 
rest" - TISM

_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
[prev in list] [next in list] [prev in thread] [next in thread]