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: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 18 Mar 2006 10:23:49 -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_client.c cib_native.c cib_version.c
Log Message:
Replace calls to CRM_DEV_ASSERT with CRM_CHECK which requires a recovery
action if the condition fails.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_attrs.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- cib_attrs.c 3 Feb 2006 08:29:22 -0000 1.13
+++ cib_attrs.c 18 Mar 2006 17:23:48 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Id: cib_attrs.c,v 1.13 2006/02/03 08:29:22 andrew Exp $ */
+/* $Id: cib_attrs.c,v 1.14 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -169,7 +169,8 @@
}
#else
xml_obj = fragment;
- CRM_DEV_ASSERT(safe_str_eq(crm_element_name(xml_obj), XML_TAG_CIB));
+ CRM_CHECK(safe_str_eq(crm_element_name(xml_obj), XML_TAG_CIB),
+ return cib_output_data);
#endif
CRM_ASSERT(xml_obj != NULL);
crm_log_xml_debug_2(xml_obj, "Result section");
@@ -324,7 +325,8 @@
}
#else
xml_obj = fragment;
- CRM_DEV_ASSERT(safe_str_eq(crm_element_name(xml_obj), XML_TAG_CIB));
+ CRM_CHECK(safe_str_eq(crm_element_name(xml_obj), XML_TAG_CIB),
+ return cib_output_data);
#endif
CRM_ASSERT(xml_obj != NULL);
crm_log_xml_debug(xml_obj, "Result section");
@@ -375,7 +377,8 @@
}
#else
xml_obj = fragment;
- CRM_DEV_ASSERT(safe_str_eq(crm_element_name(xml_obj), XML_TAG_CIB));
+ CRM_CHECK(safe_str_eq(crm_element_name(xml_obj), XML_TAG_CIB),
+ return cib_output_data);
#endif
CRM_ASSERT(xml_obj != NULL);
crm_log_xml_debug_2(xml_obj, "Result section");
@@ -406,8 +409,8 @@
const char *attr_name = "standby"; \
const char *type = XML_CIB_TAG_NODES; \
\
- CRM_DEV_ASSERT(uuid != NULL); \
- CRM_DEV_ASSERT(standby_value != NULL); \
+ CRM_CHECK(uuid != NULL, return cib_missing_data); \
+ CRM_CHECK(standby_value != NULL, return cib_missing_data); \
str_length += strlen(attr_name); \
str_length += strlen(uuid); \
if(safe_str_eq(scope, "reboot") \
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_client.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- cib_client.c 14 Feb 2006 12:11:23 -0000 1.50
+++ cib_client.c 18 Mar 2006 17:23:48 -0000 1.51
@@ -978,8 +978,8 @@
int diff_del_epoch = 0;
int diff_del_admin_epoch = 0;
- CRM_DEV_ASSERT(diff != NULL);
- CRM_DEV_ASSERT(old != NULL);
+ CRM_CHECK(diff != NULL, return FALSE);
+ CRM_CHECK(old != NULL, return FALSE);
value = crm_element_value(old, XML_ATTR_GENERATION_ADMIN);
this_admin_epoch = crm_parse_int(value, "0");
@@ -1027,7 +1027,6 @@
cl_msg_remove(tmp, XML_ATTR_GENERATION_ADMIN);
cl_msg_remove(tmp, XML_ATTR_GENERATION);
cl_msg_remove(tmp, XML_ATTR_NUMUPDATES);
- CRM_DEV_ASSERT(tmp->nfields == len - 3);
}
tmp = find_xml_node(diff_copy, "diff-added", TRUE);
@@ -1036,7 +1035,6 @@
cl_msg_remove(tmp, XML_ATTR_GENERATION_ADMIN);
cl_msg_remove(tmp, XML_ATTR_GENERATION);
cl_msg_remove(tmp, XML_ATTR_NUMUPDATES);
- CRM_DEV_ASSERT(tmp->nfields == len - 3);
}
result = apply_xml_diff(old, diff_copy, new);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_native.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- cib_native.c 20 Feb 2006 12:24:21 -0000 1.55
+++ cib_native.c 18 Mar 2006 17:23:48 -0000 1.56
@@ -398,7 +398,7 @@
}
if(call_options & cib_inhibit_bcast) {
- CRM_DEV_ASSERT((call_options & cib_scope_local));
+ CRM_CHECK((call_options & cib_scope_local), return NULL);
}
return op_msg;
}
@@ -460,7 +460,7 @@
} else if(!(call_options & cib_sync_call)) {
crm_debug_3("Async call, returning");
- CRM_DEV_ASSERT(cib->call_id != 0);
+ CRM_CHECK(cib->call_id != 0, return cib_reply_failed);
return cib->call_id;
}
@@ -474,10 +474,11 @@
if(op_reply == NULL) {
break;
}
- CRM_DEV_ASSERT(HA_OK == ha_msg_value_int(
- op_reply, F_CIB_CALLID, &reply_id));
+ CRM_CHECK(ha_msg_value_int(
+ op_reply, F_CIB_CALLID, &reply_id) == HA_OK,
+ return cib_reply_failed);
- CRM_DEV_ASSERT(reply_id <= msg_id);
+ CRM_CHECK(reply_id <= msg_id, return cib_reply_failed);
if(reply_id == msg_id) {
break;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_version.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- cib_version.c 19 Dec 2005 16:54:43 -0000 1.3
+++ cib_version.c 18 Mar 2006 17:23:48 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: cib_version.c,v 1.3 2005/12/19 16:54:43 andrew Exp $ */
+/* $Id: cib_version.c,v 1.4 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -74,8 +74,9 @@
const char *value = NULL;
int num_sets = DIMOF(feature_sets);
- CRM_DEV_ASSERT(compare_version(CIB_FEATURE_SET,
- feature_sets[num_sets-1]) == 0);
+ CRM_CHECK(compare_version(
+ CIB_FEATURE_SET, feature_sets[num_sets-1]) == 0,
+ return num_sets-1);
for(;lpc < num_sets; lpc++) {
------------------------------
Message: 2
Date: Sat, 18 Mar 2006 10:23:50 -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:
ipc.c iso8601.c utils.c xml.c
Log Message:
Replace calls to CRM_DEV_ASSERT with CRM_CHECK which requires a recovery
action if the condition fails.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/iso8601.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- iso8601.c 9 Nov 2005 16:00:16 -0000 1.12
+++ iso8601.c 18 Mar 2006 17:23:48 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Id: iso8601.c,v 1.12 2005/11/09 16:00:16 davidlee Exp $ */
+/* $Id: iso8601.c,v 1.13 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2005 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -78,7 +78,7 @@
dt = date_time->normalized;
}
- CRM_DEV_ASSERT(dt != NULL); if(crm_assert_failed) { return; }
+ CRM_CHECK(dt != NULL, return);
if(flags & ha_log_date) {
crm_malloc0(date_s, sizeof(char)*(32));
@@ -194,8 +194,8 @@
new_time = new_ha_date(FALSE);
}
- CRM_DEV_ASSERT(new_time != NULL);
- CRM_DEV_ASSERT(new_time->has != NULL);
+ CRM_CHECK(new_time != NULL, return NULL);
+ CRM_CHECK(new_time->has != NULL, return NULL);
crm_debug_4("Get hours...");
if(parse_int(time_str, 2, 24, &new_time->hours)) {
@@ -227,8 +227,8 @@
void
normalize_time(ha_time_t *a_time)
{
- CRM_DEV_ASSERT(a_time != NULL);
- CRM_DEV_ASSERT(a_time->has != NULL);
+ CRM_CHECK(a_time != NULL, return);
+ CRM_CHECK(a_time->has != NULL, return);
if(a_time->normalized == NULL) {
crm_malloc0(a_time->normalized, sizeof(ha_time_t));
@@ -249,7 +249,7 @@
sub_seconds(a_time->normalized,a_time->offset->seconds);
}
}
- CRM_DEV_ASSERT(is_date_sane(a_time));
+ CRM_CHECK(is_date_sane(a_time), return);
}
@@ -263,8 +263,8 @@
crm_malloc0(new_time, sizeof(ha_time_t));
crm_malloc0(new_time->has, sizeof(ha_has_time_t));
- CRM_DEV_ASSERT(date_str != NULL);
- CRM_DEV_ASSERT(strlen(*date_str) > 0);
+ CRM_CHECK(date_str != NULL, return NULL);
+ CRM_CHECK(strlen(*date_str) > 0, return NULL);
while(is_done == FALSE) {
char ch = (*date_str)[0];
@@ -282,7 +282,7 @@
break;
} else if(ch == 'W') {
- CRM_DEV_ASSERT(new_time->has->weeks == FALSE);
+ CRM_CHECK(new_time->has->weeks == FALSE, ;);
(*date_str)++;
if(parse_int(date_str, 2, 53, &new_time->weeks)){
new_time->has->weeks = TRUE;
@@ -377,7 +377,7 @@
log_date(LOG_DEBUG_3, "Unpacked", new_time, ha_log_date|ha_log_time);
- CRM_DEV_ASSERT(is_date_sane(new_time));
+ CRM_CHECK(is_date_sane(new_time), return NULL);
return new_time;
}
@@ -390,10 +390,10 @@
crm_malloc0(diff, sizeof(ha_time_t));
crm_malloc0(diff->has, sizeof(ha_has_time_t));
- CRM_DEV_ASSERT(interval_str != NULL);
- CRM_DEV_ASSERT(strlen(*interval_str) > 0);
+ CRM_CHECK(interval_str != NULL, return NULL);
+ CRM_CHECK(strlen(*interval_str) > 0, return NULL);
- CRM_DEV_ASSERT((*interval_str)[0] == 'P');
+ CRM_CHECK((*interval_str)[0] == 'P', return NULL);
(*interval_str)++;
while(isspace((int) (*interval_str)[0]) == FALSE) {
@@ -461,8 +461,8 @@
ha_time_period_t *period = NULL;
crm_malloc0(period, sizeof(ha_time_period_t));
- CRM_DEV_ASSERT(period_str != NULL);
- CRM_DEV_ASSERT(strlen(*period_str) > 0);
+ CRM_CHECK(period_str != NULL, return NULL);
+ CRM_CHECK(strlen(*period_str) > 0, return NULL);
tzset();
@@ -473,7 +473,7 @@
}
if((*period_str)[0] != 0) {
- CRM_DEV_ASSERT((*period_str)[0] == '/');
+ CRM_CHECK((*period_str)[0] == '/', return NULL);
(*period_str)++;
if((*period_str)[0] == 'P') {
@@ -493,7 +493,7 @@
ha_set_timet_time(period->start, &now);
normalize_time(period->start);
} else {
- CRM_DEV_ASSERT((*period_str)[0] == '/');
+ CRM_CHECK((*period_str)[0] == '/', return NULL);
return NULL;
}
@@ -574,20 +574,20 @@
gboolean
convert_from_gregorian(ha_time_t *a_date)
{
- CRM_DEV_ASSERT(gregorian_to_ordinal(a_date));
- CRM_DEV_ASSERT(ordinal_to_weekdays(a_date));
+ CRM_CHECK(gregorian_to_ordinal(a_date), return FALSE);
+ CRM_CHECK(ordinal_to_weekdays(a_date), return FALSE);
return TRUE;
}
gboolean
gregorian_to_ordinal(ha_time_t *a_date)
{
- CRM_DEV_ASSERT(a_date->has->years);
- CRM_DEV_ASSERT(a_date->has->months);
- CRM_DEV_ASSERT(a_date->has->days);
+ CRM_CHECK(a_date->has->years, return FALSE);
+ CRM_CHECK(a_date->has->months, return FALSE);
+ CRM_CHECK(a_date->has->days, return FALSE);
- CRM_DEV_ASSERT(a_date->months > 0);
- CRM_DEV_ASSERT(a_date->days > 0);
+ CRM_CHECK(a_date->months > 0, return FALSE);
+ CRM_CHECK(a_date->days > 0, return FALSE);
a_date->yeardays = month2days[a_date->months-1];
a_date->yeardays += a_date->days;
@@ -606,18 +606,18 @@
gboolean
convert_from_ordinal(ha_time_t *a_date)
{
- CRM_DEV_ASSERT(ordinal_to_gregorian(a_date));
- CRM_DEV_ASSERT(ordinal_to_weekdays(a_date));
+ CRM_CHECK(ordinal_to_gregorian(a_date), return FALSE);
+ CRM_CHECK(ordinal_to_weekdays(a_date), return FALSE);
return TRUE;
}
gboolean ordinal_to_gregorian(ha_time_t *a_date)
{
- CRM_DEV_ASSERT(a_date->has->years);
- CRM_DEV_ASSERT(a_date->has->yeardays);
+ CRM_CHECK(a_date->has->years, return FALSE);
+ CRM_CHECK(a_date->has->yeardays, return FALSE);
- CRM_DEV_ASSERT(a_date->yeardays > 0);
+ CRM_CHECK(a_date->yeardays > 0, return FALSE);
a_date->days = a_date->yeardays;
a_date->months = 11;
@@ -643,7 +643,7 @@
a_date->days -= month2days[a_date->months];
(a_date->months)++;
- CRM_DEV_ASSERT(a_date->months > 0);
+ CRM_CHECK(a_date->months > 0, return FALSE);
if(is_leap_year(a_date->years) && a_date->months > 2) {
(a_date->days)--;
@@ -673,9 +673,9 @@
int jan1 = january1(a_date->years);
int h = -1;
- CRM_DEV_ASSERT(a_date->has->years);
- CRM_DEV_ASSERT(a_date->has->yeardays);
- CRM_DEV_ASSERT(a_date->yeardays > 0);
+ CRM_CHECK(a_date->has->years, return FALSE);
+ CRM_CHECK(a_date->has->yeardays, return FALSE);
+ CRM_CHECK(a_date->yeardays > 0, return FALSE);
h = a_date->yeardays + jan1 - 1;
a_date->weekdays = 1 + ((h-1) % 7);
@@ -725,13 +725,13 @@
gboolean conversion = FALSE;
int jan1 = january1(a_date->weekyears);
- CRM_DEV_ASSERT(a_date->has->weekyears);
- CRM_DEV_ASSERT(a_date->has->weeks);
- CRM_DEV_ASSERT(a_date->has->weekdays);
-
- CRM_DEV_ASSERT(a_date->weeks > 0);
- CRM_DEV_ASSERT(a_date->weekdays > 0);
- CRM_DEV_ASSERT(a_date->weekdays < 8);
+ CRM_CHECK(a_date->has->weekyears, return FALSE);
+ CRM_CHECK(a_date->has->weeks, return FALSE);
+ CRM_CHECK(a_date->has->weekdays, return FALSE);
+
+ CRM_CHECK(a_date->weeks > 0, return FALSE);
+ CRM_CHECK(a_date->weekdays > 0, return FALSE);
+ CRM_CHECK(a_date->weekdays < 8, return FALSE);
a_date->has->years = TRUE;
a_date->years = a_date->weekyears;
@@ -767,8 +767,8 @@
{
crm_debug_6("lhs=%p, rhs=%p, offset=%d", lhs, rhs, offset);
- CRM_DEV_ASSERT(lhs != NULL && rhs != NULL);
- CRM_DEV_ASSERT(lhs->has != NULL && rhs->has != NULL);
+ CRM_CHECK(lhs != NULL && rhs != NULL, return);
+ CRM_CHECK(lhs->has != NULL && rhs->has != NULL, return);
lhs->years = rhs->years;
lhs->has->years = rhs->has->years;
@@ -846,19 +846,19 @@
convert_from_ordinal(lhs);
/* months since January [0-11] */
- CRM_DEV_ASSERT(rhs->tm_mon < 0 || lhs->months == (1 + rhs->tm_mon));
+ CRM_CHECK(rhs->tm_mon < 0 || lhs->months == (1 + rhs->tm_mon), return);
/* day of the month [1-31] */
- CRM_DEV_ASSERT(rhs->tm_mday < 0 || lhs->days == rhs->tm_mday);
+ CRM_CHECK(rhs->tm_mday < 0 || lhs->days == rhs->tm_mday, return);
/* days since Sunday [0-6] */
if(wday == 0) {
wday= 7;
}
- CRM_DEV_ASSERT(rhs->tm_wday < 0 || lhs->weekdays == wday);
- CRM_DEV_ASSERT(lhs->offset != NULL);
- CRM_DEV_ASSERT(lhs->offset->has != NULL);
+ CRM_CHECK(rhs->tm_wday < 0 || lhs->weekdays == wday, return);
+ CRM_CHECK(lhs->offset != NULL, return);
+ CRM_CHECK(lhs->offset->has != NULL, return);
/* tm_gmtoff == offset from UTC in seconds */
h_offset = GMTOFF(rhs) / (3600);
@@ -886,7 +886,7 @@
add_time(ha_time_t *lhs, ha_time_t *rhs)
{
ha_time_t *answer = NULL;
- CRM_DEV_ASSERT(lhs != NULL && rhs != NULL);
+ CRM_CHECK(lhs != NULL && rhs != NULL, return NULL);
answer = new_ha_date(FALSE);
ha_set_time(answer, lhs, TRUE);
@@ -919,7 +919,7 @@
subtract_time(ha_time_t *lhs, ha_time_t *rhs)
{
ha_time_t *answer = NULL;
- CRM_DEV_ASSERT(lhs != NULL && rhs != NULL);
+ CRM_CHECK(lhs != NULL && rhs != NULL, return NULL);
answer = new_ha_date(FALSE);
ha_set_time(answer, lhs, TRUE);
@@ -977,9 +977,9 @@
gboolean fraction = FALSE;
gboolean negate = FALSE;
- CRM_DEV_ASSERT(str != NULL);
- CRM_DEV_ASSERT(*str != NULL);
- CRM_DEV_ASSERT(result != NULL);
+ CRM_CHECK(str != NULL, return FALSE);
+ CRM_CHECK(*str != NULL, return FALSE);
+ CRM_CHECK(result != NULL, return FALSE);
*result = 0;
@@ -1114,7 +1114,7 @@
int mdays = 0;
int weeks = 0;
- CRM_DEV_ASSERT(a_date != NULL);
+ CRM_CHECK(a_date != NULL, return FALSE);
ydays = is_leap_year(a_date->years)?366:365;
mdays = days_per_month(a_date->months, a_date->years);
@@ -1122,37 +1122,37 @@
crm_debug_5("max ydays: %d, max mdays: %d, max weeks: %d",
ydays, mdays, weeks);
- CRM_DEV_ASSERT(a_date->has->years);
- CRM_DEV_ASSERT(a_date->has->weekyears);
+ CRM_CHECK(a_date->has->years, return FALSE);
+ CRM_CHECK(a_date->has->weekyears, return FALSE);
- CRM_DEV_ASSERT(a_date->has->months);
- CRM_DEV_ASSERT(a_date->months > 0);
- CRM_DEV_ASSERT(a_date->months <= 12);
+ CRM_CHECK(a_date->has->months, return FALSE);
+ CRM_CHECK(a_date->months > 0, return FALSE);
+ CRM_CHECK(a_date->months <= 12, return FALSE);
- CRM_DEV_ASSERT(a_date->has->weeks);
- CRM_DEV_ASSERT(a_date->weeks > 0);
- CRM_DEV_ASSERT(a_date->weeks <= weeks);
+ CRM_CHECK(a_date->has->weeks, return FALSE);
+ CRM_CHECK(a_date->weeks > 0, return FALSE);
+ CRM_CHECK(a_date->weeks <= weeks, return FALSE);
- CRM_DEV_ASSERT(a_date->has->days);
- CRM_DEV_ASSERT(a_date->days > 0);
- CRM_DEV_ASSERT(a_date->days <= mdays);
+ CRM_CHECK(a_date->has->days, return FALSE);
+ CRM_CHECK(a_date->days > 0, return FALSE);
+ CRM_CHECK(a_date->days <= mdays, return FALSE);
- CRM_DEV_ASSERT(a_date->has->weekdays);
- CRM_DEV_ASSERT(a_date->weekdays > 0);
- CRM_DEV_ASSERT(a_date->weekdays <= 7);
+ CRM_CHECK(a_date->has->weekdays, return FALSE);
+ CRM_CHECK(a_date->weekdays > 0, return FALSE);
+ CRM_CHECK(a_date->weekdays <= 7, return FALSE);
- CRM_DEV_ASSERT(a_date->has->yeardays);
- CRM_DEV_ASSERT(a_date->yeardays > 0);
- CRM_DEV_ASSERT(a_date->yeardays <= ydays);
+ CRM_CHECK(a_date->has->yeardays, return FALSE);
+ CRM_CHECK(a_date->yeardays > 0, return FALSE);
+ CRM_CHECK(a_date->yeardays <= ydays, return FALSE);
- CRM_DEV_ASSERT(a_date->hours >= 0);
- CRM_DEV_ASSERT(a_date->hours < 24);
+ CRM_CHECK(a_date->hours >= 0, return FALSE);
+ CRM_CHECK(a_date->hours < 24, return FALSE);
- CRM_DEV_ASSERT(a_date->minutes >= 0);
- CRM_DEV_ASSERT(a_date->minutes < 60);
+ CRM_CHECK(a_date->minutes >= 0, return FALSE);
+ CRM_CHECK(a_date->minutes < 60, return FALSE);
- CRM_DEV_ASSERT(a_date->seconds >= 0);
- CRM_DEV_ASSERT(a_date->seconds <= 60);
+ CRM_CHECK(a_date->seconds >= 0, return FALSE);
+ CRM_CHECK(a_date->seconds <= 60, return FALSE);
return TRUE;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- utils.c 17 Mar 2006 17:59:32 -0000 1.35
+++ utils.c 18 Mar 2006 17:23:48 -0000 1.36
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.35 2006/03/17 17:59:32 andrew Exp $ */
+/* $Id: utils.c,v 1.36 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -483,7 +483,7 @@
atoi_result = (int)strtol(text, &local_end_text, 10);
}
-/* CRM_DEV_ASSERT(errno != EINVAL); */
+/* CRM_CHECK(errno != EINVAL); */
if(errno == EINVAL) {
crm_err("Conversion of %s failed", text);
atoi_result = -1;
@@ -558,7 +558,7 @@
crm_strdup(const char *a)
{
char *ret = NULL;
- CRM_DEV_ASSERT(a != NULL);
+ CRM_CHECK(a != NULL, return NULL);
if(a != NULL) {
ret = cl_strdup(a);
} else {
@@ -591,7 +591,7 @@
g_hash_destroy_str, g_hash_destroy_str);
}
- CRM_DEV_ASSERT(uname != NULL);
+ CRM_CHECK(uname != NULL, return NULL);
/* avoid blocking calls where possible */
uuid_calc = g_hash_table_lookup(crm_uuid_cache, uname);
@@ -638,7 +638,7 @@
g_hash_destroy_str, g_hash_destroy_str);
}
- CRM_DEV_ASSERT(uuid != NULL);
+ CRM_CHECK(uuid != NULL, return NULL);
/* avoid blocking calls where possible */
uname = g_hash_table_lookup(crm_uname_cache, uuid);
@@ -986,8 +986,8 @@
return "Cancelled";
break;
}
- CRM_DEV_ASSERT(status >= LRM_OP_PENDING && status <= LRM_OP_CANCELLED);
- crm_err("Unknown status: %d", status);
+ CRM_CHECK(status >= LRM_OP_PENDING && status <= LRM_OP_CANCELLED,
+ crm_err("Unknown status: %d", status));
return "UNKNOWN!";
}
@@ -997,8 +997,8 @@
int len = 35;
char *op_id = NULL;
- CRM_DEV_ASSERT(rsc_id != NULL); if(crm_assert_failed) { return NULL; }
- CRM_DEV_ASSERT(op_type != NULL); if(crm_assert_failed) { return NULL; }
+ CRM_CHECK(rsc_id != NULL, return NULL);
+ CRM_CHECK(op_type != NULL, return NULL);
len += strlen(op_type);
len += strlen(rsc_id);
@@ -1015,9 +1015,9 @@
int len = 12;
char *op_id = NULL;
- CRM_DEV_ASSERT(rsc_id != NULL); if(crm_assert_failed) { return NULL; }
- CRM_DEV_ASSERT(op_type != NULL); if(crm_assert_failed) { return NULL; }
- CRM_DEV_ASSERT(notify_type != NULL); if(crm_assert_failed) { return
NULL; }
+ CRM_CHECK(rsc_id != NULL, return NULL);
+ CRM_CHECK(op_type != NULL, return NULL);
+ CRM_CHECK(notify_type != NULL, return NULL);
len += strlen(op_type);
len += strlen(rsc_id);
@@ -1035,8 +1035,7 @@
int len = 80;
char *fail_state = NULL;
- CRM_DEV_ASSERT(transition_key != NULL);
- if(crm_assert_failed) { return NULL; }
+ CRM_CHECK(transition_key != NULL, return NULL);
len += strlen(transition_key);
@@ -1053,8 +1052,7 @@
int len = 80;
char *fail_state = NULL;
- CRM_DEV_ASSERT(transition_key != NULL);
- if(crm_assert_failed) { return NULL; }
+ CRM_CHECK(transition_key != NULL, return NULL);
len += strlen(transition_key);
@@ -1087,10 +1085,7 @@
}
- CRM_DEV_ASSERT(decode_transition_key(key, uuid, transition_id));
- if(crm_assert_failed) {
- return FALSE;
- }
+ CRM_CHECK(decode_transition_key(key, uuid, transition_id), return
FALSE);
*op_rc = crm_parse_int(rc, NULL);
*op_status = crm_parse_int(status, NULL);
@@ -1109,7 +1104,7 @@
int len = 40;
char *fail_state = NULL;
- CRM_DEV_ASSERT(node != NULL); if(crm_assert_failed) { return NULL; }
+ CRM_CHECK(node != NULL, return NULL);
len += strlen(node);
@@ -1146,7 +1141,7 @@
if(active_stats == NULL) {
active_stats = cl_malloc_getstats();
}
- CRM_DEV_ASSERT(active_stats != NULL);
+ CRM_CHECK(active_stats != NULL, ;);
#ifndef CRM_USE_MALLOC
if(active_stats->numalloc > active_stats->numfree) {
crm_warn("Potential memory leak detected:"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- xml.c 17 Mar 2006 15:08:52 -0000 1.60
+++ xml.c 18 Mar 2006 17:23:48 -0000 1.61
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.60 2006/03/17 15:08:52 davidlee Exp $ */
+/* $Id: xml.c,v 1.61 2006/03/18 17:23:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -281,8 +281,8 @@
if(xml_node != NULL && new_parent != NULL) {
const char *name = crm_element_name(xml_node);
- CRM_DEV_ASSERT(
- HA_OK == ha_msg_addstruct_compress(new_parent, name,
xml_node));
+ CRM_CHECK(
+ HA_OK == ha_msg_addstruct_compress(new_parent, name,
xml_node), return NULL);
node_copy = find_entity(
new_parent, crm_element_name(xml_node), ID(xml_node));
@@ -372,7 +372,7 @@
} else {
local_name = name;
ret_value = ha_msg_new(1);
- CRM_DEV_ASSERT(ret_value != NULL);
+ CRM_CHECK(ret_value != NULL, return NULL);
crm_xml_add(ret_value, F_XML_TAGNAME, name);
crm_validate_data(ret_value);
@@ -381,8 +381,8 @@
parent_name = crm_element_name(parent);
crm_debug_5("Attaching %s to parent %s",
local_name, parent_name);
- CRM_DEV_ASSERT(HA_OK == ha_msg_addstruct(
- parent, name, ret_value));
+ CRM_CHECK(HA_OK == ha_msg_addstruct(
+ parent, name, ret_value), return
NULL);
crm_msg_del(ret_value);
crm_update_parents(parent);
@@ -401,12 +401,9 @@
void
free_xml_from_parent(crm_data_t *parent, crm_data_t *a_node)
{
- CRM_DEV_ASSERT(parent != NULL);
- if(parent == NULL) {
- return;
- } else if(a_node == NULL) {
- return;
- }
+ CRM_CHECK(parent != NULL, return);
+ CRM_CHECK(a_node != NULL, return);
+
crm_validate_data(parent);
cl_msg_remove_value(parent, a_node);
crm_validate_data(parent);
@@ -426,7 +423,7 @@
/* there is no way in hell we should be deleting anything
* with a parent and without the parent knowning
*/
- CRM_DEV_ASSERT(has_parent == 0);
+ CRM_CHECK(has_parent == 0, return);
if(has_parent == 0) {
crm_validate_data(a_node);
crm_msg_del(a_node);
@@ -465,18 +462,9 @@
{
crm_data_t *new_xml = NULL;
- CRM_DEV_ASSERT(src_node != NULL);
- CRM_DEV_ASSERT(crm_element_name(src_node) != NULL);
+ CRM_CHECK(src_node != NULL, return NULL);
+ CRM_CHECK(crm_element_name(src_node) != NULL, return NULL);
- if(src_node == NULL) {
- crm_warn("Attempt to dup NULL XML");
- return NULL;
-
- } else if(crm_element_name(src_node) == NULL) {
- crm_log_xml_err(src_node, "Attempt to dup XML with no name");
- return NULL;
- }
-
crm_validate_data(src_node);
new_xml = ha_msg_copy(src_node);
crm_set_element_parent(new_xml, NULL);
@@ -618,7 +606,7 @@
char *now_str = NULL;
time_t now;
- CRM_DEV_ASSERT(filename != NULL);
+ CRM_CHECK(filename != NULL, return -1);
crm_debug_3("Writing XML out to %s", filename);
crm_validate_data(xml_node);
if (xml_node == NULL) {
@@ -644,7 +632,7 @@
} else {
char *buffer = dump_xml_formatted(xml_node);
- CRM_DEV_ASSERT(buffer != NULL && strlen(buffer) > 0);
+ CRM_CHECK(buffer != NULL && strlen(buffer) > 0, return
-1);
if(buffer != NULL && strlen(buffer) > 0) {
res = fprintf(file_output_strm, "%s", buffer);
if(res < 0) {
@@ -694,7 +682,7 @@
{
crm_validate_data(xml);
crm_validate_data(msg);
- CRM_DEV_ASSERT(field != NULL);
+ CRM_CHECK(field != NULL, return FALSE);
ha_msg_addstruct_compress(msg, field, xml);
crm_update_parents(msg);
return TRUE;
@@ -713,11 +701,9 @@
mutable_ptr = buffer;
crm_validate_data(an_xml_node);
- CRM_DEV_ASSERT(dump_data_element(
- 0, &mutable_ptr, an_xml_node, TRUE) >= 0);
- if(crm_assert_failed) {
- crm_crit("Could not dump the whole message");
- }
+ CRM_CHECK(dump_data_element(
+ 0, &mutable_ptr, an_xml_node, TRUE) >= 0,
+ crm_crit("Could not dump the whole message"));
crm_debug_4("Dumped: %s", buffer);
return buffer;
}
@@ -731,11 +717,9 @@
mutable_ptr = buffer;
crm_validate_data(an_xml_node);
- CRM_DEV_ASSERT(dump_data_element(
- 0, &mutable_ptr, an_xml_node, TRUE) >= 0);
- if(crm_assert_failed) {
- crm_crit("Could not dump the whole message");
- }
+ CRM_CHECK(dump_data_element(
+ 0, &mutable_ptr, an_xml_node, TRUE) >= 0,
+ crm_crit("Could not dump the whole message"));
crm_debug_4("Dumped: %s", buffer);
return buffer;
@@ -982,7 +966,7 @@
} else if(xml_root->types[lpc] == FT_STRING) {
CRM_ASSERT(cl_is_allocated(child) == 1);
/* } else { */
-/* CRM_DEV_ASSERT(FALSE); */
+/* CRM_CHECK(FALSE); */
}
}
}
@@ -1007,7 +991,7 @@
crm_validate_data(data);
value = cl_get_string(data, name);
#if XML_PARANOIA_CHECKS
- CRM_DEV_ASSERT(value == NULL || cl_is_allocated(value) == 1);
+ CRM_CHECK(value == NULL || cl_is_allocated(value) == 1, return NULL);
#endif
return value;
}
@@ -1020,7 +1004,7 @@
crm_validate_data(data);
value = cl_get_string(data, name);
#if XML_PARANOIA_CHECKS
- CRM_DEV_ASSERT(cl_is_allocated(value) == 1);
+ CRM_CHECK(cl_is_allocated(value) == 1, return NULL);
#endif
if(value != NULL) {
value_copy = crm_strdup(value);
@@ -1181,10 +1165,7 @@
int
is_comment_start(const char *input)
{
- CRM_DEV_ASSERT(input != NULL);
- if(crm_assert_failed) {
- return 0;
- }
+ CRM_CHECK(input != NULL, return 0);
if(strlen(input) > 4
&& input[0] == '<'
@@ -1219,10 +1200,7 @@
int
is_comment_end(const char *input)
{
- CRM_DEV_ASSERT(input != NULL);
- if(crm_assert_failed) {
- return 0;
- }
+ CRM_CHECK(input != NULL, return 0);
if(strlen(input) > 2
&& input[0] == '-'
@@ -1374,10 +1352,7 @@
while(lpc < len && were_comments) {
were_comments = drop_comments(our_input, &lpc);
}
- CRM_DEV_ASSERT(our_input[lpc] == '<');
- if(crm_assert_failed) {
- return NULL;
- }
+ CRM_CHECK(our_input[lpc] == '<', return NULL);
lpc++;
len = get_tag_name(our_input + lpc);
crm_debug_5("Tag length: %d", len);
@@ -1562,12 +1537,11 @@
int root_nodes_seen = 0;
- CRM_DEV_ASSERT(new != NULL);
- if(crm_assert_failed) { return FALSE; }
+ CRM_CHECK(new != NULL, return FALSE);
crm_debug_2("Substraction Phase");
xml_child_iter(removed, child_diff,
- CRM_DEV_ASSERT(root_nodes_seen == 0);
+ CRM_CHECK(root_nodes_seen == 0, result = FALSE);
if(root_nodes_seen == 0) {
*new = subtract_xml_object(old, child_diff,
FALSE);
}
@@ -1586,7 +1560,7 @@
crm_debug_2("Addition Phase");
if(result) {
xml_child_iter(added, child_diff,
- CRM_DEV_ASSERT(root_nodes_seen == 0);
+ CRM_CHECK(root_nodes_seen == 0, result = FALSE);
if(root_nodes_seen == 0) {
add_xml_object(NULL, *new, child_diff);
}
@@ -1624,7 +1598,7 @@
log_xml_diff(LOG_INFO, diff, "diff:input_diff");
log_data_element("diff:input", NULL, LOG_DEBUG_2, 0, old, TRUE);
-/* CRM_DEV_ASSERT(diff_of_diff != NULL); */
+/* CRM_CHECK(diff_of_diff != NULL); */
result = FALSE;
}
@@ -1709,8 +1683,7 @@
crm_data_t *new_parent = parent;
const char *name = crm_element_name(xml_node);
- CRM_DEV_ASSERT(xml_node != NULL && name != NULL);
- if(crm_assert_failed) { return; }
+ CRM_CHECK(xml_node != NULL && name != NULL, return);
us = create_xml_node(parent, name);
xml_prop_iter(xml_node, prop_name, prop_value,
@@ -1797,15 +1770,12 @@
name = crm_element_name(left);
/* sanity check */
- CRM_DEV_ASSERT(name != NULL);
- if(crm_assert_failed) { return NULL; }
+ CRM_CHECK(name != NULL, return NULL);
- CRM_DEV_ASSERT(safe_str_eq(crm_element_name(left),
- crm_element_name(right)));
- if(crm_assert_failed) { return NULL; }
+ CRM_CHECK(safe_str_eq(crm_element_name(left),
+ crm_element_name(right)), return NULL);
- CRM_DEV_ASSERT(safe_str_eq(ID(left), ID(right)));
- if(crm_assert_failed) { return NULL; }
+ CRM_CHECK(safe_str_eq(ID(left), ID(right)), return NULL);
diff = create_xml_node(NULL, name);
@@ -1880,14 +1850,12 @@
int result = 0;
- CRM_DEV_ASSERT(update != NULL);
- if(crm_assert_failed) { return 0; }
+ CRM_CHECK(update != NULL, return 0);
object_name = crm_element_name(update);
object_id = ID(update);
- CRM_DEV_ASSERT(object_name != NULL);
- if(crm_assert_failed) { return 0; }
+ CRM_CHECK(object_name != NULL, return 0);
if(target == NULL && object_id == NULL) {
/* placeholder object */
@@ -1901,9 +1869,7 @@
target = add_node_copy(parent, update);
crm_debug_2("Added <%s id=%s>",
crm_str(object_name), crm_str(object_id));
- CRM_DEV_ASSERT(target != NULL);
- return 0;
-
+ CRM_CHECK(target != NULL, return 0);
}
crm_debug_2("Found node <%s id=%s> to update",
@@ -1958,11 +1924,8 @@
{
gboolean can_update = TRUE;
- CRM_DEV_ASSERT(child != NULL);
- if(crm_assert_failed) { return FALSE; }
-
- CRM_DEV_ASSERT(to_update != NULL);
- if(crm_assert_failed) { return FALSE; }
+ CRM_CHECK(child != NULL, return FALSE);
+ CRM_CHECK(to_update != NULL, return FALSE);
if(safe_str_neq(crm_element_name(to_update), crm_element_name(child))) {
can_update = FALSE;
@@ -1993,8 +1956,7 @@
{
gboolean match_found = TRUE;
- CRM_DEV_ASSERT(child != NULL);
- if(crm_assert_failed) { return FALSE; }
+ CRM_CHECK(child != NULL, return FALSE);
if(safe_str_neq(tag, crm_element_name(child))) {
match_found = FALSE;
@@ -2025,11 +1987,8 @@
gboolean can_delete = FALSE;
const char *right_val = NULL;
- CRM_DEV_ASSERT(child != NULL);
- if(crm_assert_failed) { return FALSE; }
-
- CRM_DEV_ASSERT(to_delete != NULL);
- if(crm_assert_failed) { return FALSE; }
+ CRM_CHECK(child != NULL, return FALSE);
+ CRM_CHECK(to_delete != NULL, return FALSE);
if(safe_str_eq(crm_element_name(to_delete), crm_element_name(child))) {
can_delete = TRUE;
@@ -2108,15 +2067,14 @@
g_str_hash, g_str_equal,
g_hash_destroy_str, g_hash_destroy_str);
- CRM_DEV_ASSERT(parent != NULL);
- if(parent != NULL) {
- nvpair_list = find_xml_node(parent, XML_TAG_ATTRS, FALSE);
- if(nvpair_list == NULL) {
- crm_debug("No attributes in %s",
- crm_element_name(parent));
- crm_log_xml_debug_2(
- parent,"No attributes for resource op");
- }
+ CRM_CHECK(parent != NULL, return nvpair_hash);
+
+ nvpair_list = find_xml_node(parent, XML_TAG_ATTRS, FALSE);
+ if(nvpair_list == NULL) {
+ crm_debug("No attributes in %s",
+ crm_element_name(parent));
+ crm_log_xml_debug_2(
+ parent,"No attributes for resource op");
}
xml_child_iter_filter(
@@ -2145,15 +2103,14 @@
g_str_hash, g_str_equal,
g_hash_destroy_str, g_hash_destroy_str);
- CRM_DEV_ASSERT(parent != NULL);
- if(parent != NULL) {
- nvpair_list = find_xml_node(parent, XML_TAG_ATTRS, FALSE);
- if(nvpair_list == NULL) {
- crm_debug_2("No attributes in %s",
- crm_element_name(parent));
- crm_log_xml_debug_2(
- parent,"No attributes for resource op");
- }
+ CRM_CHECK(parent != NULL, return nvpair_hash);
+
+ nvpair_list = find_xml_node(parent, XML_TAG_ATTRS, FALSE);
+ if(nvpair_list == NULL) {
+ crm_debug_2("No attributes in %s",
+ crm_element_name(parent));
+ crm_log_xml_debug_2(
+ parent,"No attributes for resource op");
}
crm_log_xml_debug_3(nvpair_list, "Unpacking");
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 41
********************************************
