Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: lib by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 19 Dec 2005 09:54:47 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/cib
Modified Files:
cib_attrs.c cib_version.c
Log Message:
BEAM Fixes: Use of constant expressions in macros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_attrs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- cib_attrs.c 24 Oct 2005 07:52:27 -0000 1.8
+++ cib_attrs.c 19 Dec 2005 16:54:43 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Id: cib_attrs.c,v 1.8 2005/10/24 07:52:27 andrew Exp $ */
+/* $Id: cib_attrs.c,v 1.9 2005/12/19 16:54:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -68,7 +68,7 @@
} else if(safe_str_eq(section, XML_CIB_TAG_NODES)) {
tag = XML_CIB_TAG_NODE;
- } else if(safe_str_eq(section, XML_CIB_TAG_STATUS)) {
+ } else if(section != NULL && node_uuid != NULL) {
xml_obj = create_xml_node(xml_obj, XML_CIB_TAG_STATE);
crm_xml_add(xml_obj, XML_ATTR_ID, node_uuid);
if(xml_top == NULL) {
@@ -207,7 +207,7 @@
}
xml_next = NULL;
- xml_child_iter(
+ xml_child_iter_filter(
xml_obj, a_child, XML_CIB_TAG_NVPAIR,
const char *name = crm_element_value(
a_child, XML_NVPAIR_ATTR_NAME);
@@ -302,7 +302,7 @@
rc = cib_NOTEXISTS;
*uuid = NULL;
- xml_child_iter(
+ xml_child_iter_filter(
xml_obj, a_child, XML_CIB_TAG_NODE,
child_name = crm_element_value(a_child, XML_ATTR_UNAME);
@@ -344,7 +344,7 @@
rc = cib_NOTEXISTS;
*uname = NULL;
- xml_child_iter(
+ xml_child_iter_filter(
xml_obj, a_child, XML_CIB_TAG_NODE,
child_name = ID(a_child);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_version.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- cib_version.c 27 Sep 2005 13:15:39 -0000 1.2
+++ cib_version.c 19 Dec 2005 16:54:43 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Id: cib_version.c,v 1.2 2005/09/27 13:15:39 andrew Exp $ */
+/* $Id: cib_version.c,v 1.3 2005/12/19 16:54:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -116,7 +116,7 @@
return current;
}
- xml_child_iter(xml_obj, xml_child, NULL,
+ xml_child_iter(xml_obj, xml_child,
current = internal_update_feature_set(xml_child,current);
if(current == (num_sets -1)) {
return current;
------------------------------
Message: 2
Date: Mon, 19 Dec 2005 09:54:48 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
complex.c group.c native.c rules.c unpack.c utils.c
Log Message:
BEAM Fixes: Use of constant expressions in macros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- complex.c 25 Oct 2005 14:02:15 -0000 1.70
+++ complex.c 19 Dec 2005 16:54:44 -0000 1.71
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.70 2005/10/25 14:02:15 andrew Exp $ */
+/* $Id: complex.c,v 1.71 2005/12/19 16:54:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -419,7 +419,7 @@
}
crm_debug_2("Checking for attributes");
- xml_child_iter(
+ xml_child_iter_filter(
xml_obj, attr_set, set_name,
/* check any rules */
@@ -446,7 +446,7 @@
gboolean set_attr = FALSE;
const char *name = NULL;
const char *value = NULL;
- xml_child_iter(
+ xml_child_iter_filter(
nvpair_list, an_attr, XML_CIB_TAG_NVPAIR,
name = crm_element_value(an_attr, XML_NVPAIR_ATTR_NAME);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/group.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- group.c 1 Nov 2005 14:52:38 -0000 1.48
+++ group.c 19 Dec 2005 16:54:44 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.48 2005/11/01 14:52:38 andrew Exp $ */
+/* $Id: group.c,v 1.49 2005/12/19 16:54:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -95,7 +95,7 @@
return;
}
- xml_child_iter(
+ xml_child_iter_filter(
xml_obj, xml_native_rsc, XML_CIB_TAG_RESOURCE,
resource_t *new_rsc = NULL;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- native.c 22 Nov 2005 02:44:41 -0000 1.102
+++ native.c 19 Dec 2005 16:54:44 -0000 1.103
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.102 2005/11/22 02:44:41 andrew Exp $ */
+/* $Id: native.c,v 1.103 2005/12/19 16:54:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -323,7 +323,7 @@
node_uname = node->details->uname;
}
- xml_child_iter(
+ xml_child_iter_filter(
rsc->ops_xml, operation, "op",
name = crm_element_value(operation, "name");
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/rules.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- rules.c 25 Oct 2005 14:02:15 -0000 1.20
+++ rules.c 19 Dec 2005 16:54:44 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Id: rules.c,v 1.20 2005/10/25 14:02:15 andrew Exp $ */
+/* $Id: rules.c,v 1.21 2005/12/19 16:54:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -43,7 +43,7 @@
test_ruleset(crm_data_t *ruleset, node_t *node, pe_working_set_t *data_set)
{
gboolean ruleset_default = TRUE;
- xml_child_iter(
+ xml_child_iter_filter(
ruleset, rule, XML_TAG_RULE,
ruleset_default = FALSE;
@@ -71,7 +71,7 @@
crm_debug_2("Testing rule %s", ID(rule));
xml_child_iter(
- rule, expr, NULL,
+ rule, expr,
test = test_expression(expr, node, rsc, data_set);
if(test && do_and == FALSE) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -3 -r1.148 -r1.149
--- unpack.c 17 Dec 2005 08:56:36 -0000 1.148
+++ unpack.c 19 Dec 2005 16:54:44 -0000 1.149
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.148 2005/12/17 08:56:36 andrew Exp $ */
+/* $Id: unpack.c,v 1.149 2005/12/19 16:54:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -232,7 +232,7 @@
crm_debug("Begining unpack... %s",
xml_nodes?crm_element_name(xml_nodes):"<none>");
- xml_child_iter(
+ xml_child_iter_filter(
xml_nodes, xml_obj, XML_CIB_TAG_NODE,
new_node = NULL;
@@ -325,7 +325,7 @@
crm_debug("Begining unpack... %s",
xml_resources?crm_element_name(xml_resources):"<none>");
xml_child_iter(
- xml_resources, xml_obj, NULL,
+ xml_resources, xml_obj,
resource_t *new_rsc = NULL;
crm_debug_2("Begining unpack... %s",
@@ -356,7 +356,7 @@
crm_debug("Begining unpack... %s",
xml_constraints?crm_element_name(xml_constraints):"<none>");
xml_child_iter(
- xml_constraints, xml_obj, NULL,
+ xml_constraints, xml_obj,
const char *id = crm_element_value(xml_obj, XML_ATTR_ID);
if(id == NULL) {
@@ -413,7 +413,7 @@
node_t *this_node = NULL;
crm_debug_3("Begining unpack");
- xml_child_iter(
+ xml_child_iter_filter(
status, node_state, XML_CIB_TAG_STATE,
id = crm_element_value(node_state, XML_ATTR_ID);
@@ -670,7 +670,7 @@
return FALSE;
}
- xml_child_iter(
+ xml_child_iter_filter(
lrm_rsc_list, rsc_entry, XML_LRM_TAG_RESOURCE,
delete_resource = FALSE;
@@ -789,7 +789,7 @@
op_list = NULL;
sorted_op_list = NULL;
- xml_child_iter(
+ xml_child_iter_filter(
rsc_entry, rsc_op, XML_LRM_TAG_RSC_OP,
op_list = g_list_append(op_list, rsc_op);
);
@@ -1076,7 +1076,7 @@
crm_debug_2("Checking parameters to %s action", task);
- xml_child_iter(
+ xml_child_iter_filter(
rsc->ops_xml, operation, "op",
const char *name = crm_element_value(operation, "name");
@@ -1734,7 +1734,7 @@
return FALSE;
}
- xml_child_iter(
+ xml_child_iter_filter(
xml_obj, rule_xml, XML_TAG_RULE,
crm_debug_2("Unpacking %s/%s", id, ID(rule_xml));
generate_location_rule(rsc_lh, rule_xml, data_set);
@@ -1810,7 +1810,7 @@
}
xml_child_iter(
- rule_xml, expr, NULL,
+ rule_xml, expr,
enum expression_type type = find_expression_type(expr);
if(type == not_expr) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- utils.c 26 Oct 2005 14:17:49 -0000 1.120
+++ utils.c 19 Dec 2005 16:54:44 -0000 1.121
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.120 2005/10/26 14:17:49 andrew Exp $ */
+/* $Id: utils.c,v 1.121 2005/12/19 16:54:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -997,7 +997,7 @@
char *match_key = NULL;
crm_data_t *op = NULL;
- xml_child_iter(
+ xml_child_iter_filter(
rsc->ops_xml, operation, "op",
name = crm_element_value(operation, "name");
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 44
********************************************
