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: resources by xunsun from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 19 Dec 2005 08:11:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by xunsun from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : xunsun
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
IPaddr.in
Log Message:
minor changes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- IPaddr.in 19 Dec 2005 13:06:57 -0000 1.33
+++ IPaddr.in 19 Dec 2005 15:11:25 -0000 1.34
@@ -400,7 +400,7 @@
;;
*)
j=0
- TRYADRCNT=`ls "${NICBASE}:"* | wc -l | tr -d ' ' 2>/dev/null`
+ TRYADRCNT=`ls "${NICBASE}:"* 2>/dev/null | wc -w | tr -d ' '`
if
[ -f "${NICBASE}:${TRYADRCNT}" ]
then
@@ -499,8 +499,7 @@
rc=$?
if [ $? -eq 0 ]; then
- netmask=`echo "$NICINFO" | cut -f2 | cut -d ' ' -f2`
- netmask_text="netmask $netmask"
+ netmask_text=`echo "$NICINFO" | cut -f2`
else
echo "ERROR: $IFCMD failed (rc=$rc)"
fi
------------------------------
Message: 2
Date: Mon, 19 Dec 2005 09:54:43 -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/admin
Modified Files:
crmadmin.c
Log Message:
BEAM Fixes: Use of constant expressions in macros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crmadmin.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- crmadmin.c 14 Oct 2005 06:24:03 -0000 1.60
+++ crmadmin.c 19 Dec 2005 16:54:43 -0000 1.61
@@ -1,4 +1,4 @@
-/* $Id: crmadmin.c,v 1.60 2005/10/14 06:24:03 andrew Exp $ */
+/* $Id: crmadmin.c,v 1.61 2005/12/19 16:54:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -662,7 +662,7 @@
int found = 0;
crm_data_t *nodes = get_object_root(XML_CIB_TAG_NODES, xml_node);
- xml_child_iter(
+ xml_child_iter_filter(
nodes, node, XML_CIB_TAG_NODE,
if(BASH_EXPORT) {
printf("export %s=%s\n",
------------------------------
Message: 3
Date: Mon, 19 Dec 2005 09:54:43 -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/cib
Modified Files:
messages.c primatives.c
Log Message:
BEAM Fixes: Use of constant expressions in macros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- messages.c 25 Oct 2005 13:56:54 -0000 1.59
+++ messages.c 19 Dec 2005 16:54:43 -0000 1.60
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.59 2005/10/25 13:56:54 andrew Exp $ */
+/* $Id: messages.c,v 1.60 2005/12/19 16:54:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -196,7 +196,7 @@
crm_xml_add(cib, "origin", cib_our_uname);
xml_child_iter(
- obj_root, an_obj, NULL,
+ obj_root, an_obj,
add_node_copy(query_obj_root, an_obj);
);
@@ -739,14 +739,14 @@
}
xml_child_iter(
- old_section, a_child, NULL,
+ old_section, a_child,
free_xml_from_parent(old_section, a_child);
);
copy_in_properties(old_section, new_section);
xml_child_iter(
- new_section, a_child, NULL,
+ new_section, a_child,
add_node_copy(old_section, a_child);
);
@@ -777,7 +777,7 @@
set_node_tstamp(this_section);
xml_child_iter(
- xml_section, a_child, NULL,
+ xml_section, a_child,
rc = cib_ok;
if(operation == CIB_UPDATE_OP_DELETE) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/primatives.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- primatives.c 12 Sep 2005 11:00:19 -0000 1.27
+++ primatives.c 19 Dec 2005 16:54:43 -0000 1.28
@@ -1,4 +1,4 @@
-/* $Id: primatives.c,v 1.27 2005/09/12 11:00:19 andrew Exp $ */
+/* $Id: primatives.c,v 1.28 2005/12/19 16:54:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -350,12 +350,12 @@
} else {
xml_child_iter(
- delete_spec, child, NULL,
+ delete_spec, child,
int tmp_result = delete_cib_object(equiv_node, child);
/* only the first error is likely to be interesting */
- if(result == cib_ok) {
+ if(tmp_result != cib_ok && result == cib_ok) {
result = tmp_result;
}
);
@@ -479,7 +479,7 @@
crm_str(object_name), crm_str(object_id));
xml_child_iter(
- update, a_child, NULL,
+ update, a_child,
int tmp_result = 0;
crm_debug_3("Updating child <%s id=%s>",
crm_element_name(a_child), ID(a_child));
------------------------------
Message: 4
Date: Mon, 19 Dec 2005 09:54:44 -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/common
Modified Files:
xml.c
Log Message:
BEAM Fixes: Use of constant expressions in macros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- xml.c 22 Nov 2005 02:53:24 -0000 1.47
+++ xml.c 19 Dec 2005 16:54:44 -0000 1.48
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.47 2005/11/22 02:53:24 andrew Exp $ */
+/* $Id: xml.c,v 1.48 2005/12/19 16:54:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -75,7 +75,7 @@
return NULL;
}
- xml_child_iter(
+ xml_child_iter_filter(
root, a_child, search_path,
/* crm_debug_5("returning node (%s).", xmlGetNodePath(a_child)); */
crm_log_xml_debug_5(a_child, "contents\t%s");
@@ -201,7 +201,7 @@
find_entity(crm_data_t *parent, const char *node_name, const char *id)
{
crm_validate_data(parent);
- xml_child_iter(
+ xml_child_iter_filter(
parent, a_child, node_name,
if(id == NULL || safe_str_eq(id, ID(a_child))) {
crm_debug_4("returning node (%s).",
@@ -661,6 +661,7 @@
{
crm_validate_data(xml);
crm_validate_data(msg);
+ CRM_DEV_ASSERT(field != NULL);
ha_msg_addstruct_compress(msg, field, xml);
crm_update_parents(msg);
return TRUE;
@@ -746,7 +747,7 @@
} else if(name == NULL && depth == 0) {
xml_child_iter(
- data, a_child, NULL,
+ data, a_child,
child_result = log_data_element(
function, prefix, log_level, depth, a_child,
formatted);
if(child_result < 0) {
@@ -784,7 +785,7 @@
);
xml_child_iter(
- data, child, NULL,
+ data, child,
if(child != NULL) {
has_children++;
break;
@@ -802,7 +803,7 @@
}
xml_child_iter(
- data, a_child, NULL,
+ data, a_child,
child_result = log_data_element(
function, prefix, log_level, depth+1, a_child,
formatted);
@@ -843,7 +844,7 @@
} else if(name == NULL && depth == 0) {
xml_child_iter(
- data, a_child, NULL,
+ data, a_child,
child_result = dump_data_element(
depth, buffer, a_child, formatted);
if(child_result < 0) {
@@ -878,7 +879,7 @@
);
xml_child_iter(
- data, child, NULL,
+ data, child,
if(child != NULL) {
has_children++;
break;
@@ -894,7 +895,7 @@
}
xml_child_iter(
- data, child, NULL,
+ data, child,
child_result = dump_data_element(
depth+1, buffer, child, formatted);
@@ -918,7 +919,7 @@
crm_validate_data(xml_root);
xml_child_iter(
- xml_root, a_child, NULL,
+ xml_root, a_child,
return TRUE;
);
return FALSE;
@@ -1017,7 +1018,7 @@
{
crm_validate_data(xml_root);
xml_child_iter(
- xml_root, a_child, NULL,
+ xml_root, a_child,
crm_set_element_parent(a_child, xml_root);
crm_update_parents(a_child);
);
@@ -1502,7 +1503,7 @@
gboolean is_first = TRUE;
xml_child_iter(
- removed, child, NULL,
+ removed, child,
log_data_element(function, "-", log_level, 0, child, TRUE);
if(is_first) {
is_first = FALSE;
@@ -1515,7 +1516,7 @@
is_first = TRUE;
xml_child_iter(
- added, child, NULL,
+ added, child,
log_data_element(function, "+", log_level, 0, child, TRUE);
if(is_first) {
is_first = FALSE;
@@ -1541,7 +1542,7 @@
if(crm_assert_failed) { return FALSE; }
crm_debug_2("Substraction Phase");
- xml_child_iter(removed, child_diff, NULL,
+ xml_child_iter(removed, child_diff,
CRM_DEV_ASSERT(root_nodes_seen == 0);
if(root_nodes_seen == 0) {
*new = subtract_xml_object(old, child_diff,
FALSE);
@@ -1560,7 +1561,7 @@
root_nodes_seen = 0;
crm_debug_2("Addition Phase");
if(result) {
- xml_child_iter(added, child_diff, NULL,
+ xml_child_iter(added, child_diff,
CRM_DEV_ASSERT(root_nodes_seen == 0);
if(root_nodes_seen == 0) {
add_xml_object(NULL, *new, child_diff);
@@ -1663,7 +1664,7 @@
}
can_prune = FALSE;
);
- xml_child_iter(xml_node, child, NULL,
+ xml_child_iter(xml_node, child,
if(can_prune_leaf(child)) {
cl_msg_remove_value(xml_node, child);
__counter--;
@@ -1706,7 +1707,7 @@
}
}
- xml_child_iter(us, child, NULL,
+ xml_child_iter(us, child,
diff_filter_context(
context, upper_bound-1, lower_bound-1,
child, new_parent);
@@ -1730,7 +1731,7 @@
return depth;
} else if(depth < context) {
- xml_child_iter(xml_node, child, NULL,
+ xml_child_iter(xml_node, child,
if(in_upper_context(depth+1, context, child)) {
return depth;
}
@@ -1824,7 +1825,7 @@
/* changes to child objects */
xml_child_iter(
- left, left_child, NULL,
+ left, left_child,
right_child = find_entity(
right, crm_element_name(left_child), ID(left_child));
child_diff = subtract_xml_object(
@@ -1909,7 +1910,7 @@
crm_str(object_name), crm_str(object_id));
xml_child_iter(
- update, a_child, NULL,
+ update, a_child,
int tmp_result = 0;
crm_debug_3("Updating child <%s id=%s>",
crm_element_name(a_child), ID(a_child));
@@ -1955,7 +1956,7 @@
}
xml_child_iter(
- child, child_of_child, NULL,
+ child, child_of_child,
/* only update the first one */
if(can_update) {
break;
@@ -2002,7 +2003,7 @@
xml_child_iter(
- child, child_of_child, NULL,
+ child, child_of_child,
/* only delete the first one */
if(can_delete) {
break;
@@ -2065,7 +2066,7 @@
}
}
- xml_child_iter(
+ xml_child_iter_filter(
nvpair_list, node_iter, XML_CIB_TAG_NVPAIR,
const char *key = crm_element_value(
@@ -2178,7 +2179,7 @@
}
xml_child_iter(
- xml_obj, xml_child, NULL,
+ xml_obj, xml_child,
if(do_id_check(xml_child, id_hash)) {
modified = TRUE;
}
------------------------------
_______________________________________________
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 42
********************************************
