Send Linux-ha-cvs mailing list submissions to linux-ha-cvs@lists.linux-ha.org
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: crm by andrew from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: lib by andrew from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Mon, 8 May 2006 01:42:19 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org 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: incarnation.c pengine.c rules.c Log Message: The case used for these strings is not interesting to us, use strcasecmp() =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -3 -r1.81 -r1.82 --- incarnation.c 5 May 2006 13:08:49 -0000 1.81 +++ incarnation.c 8 May 2006 07:42:18 -0000 1.82 @@ -1,4 +1,4 @@ -/* $Id: incarnation.c,v 1.81 2006/05/05 13:08:49 andrew Exp $ */ +/* $Id: incarnation.c,v 1.82 2006/05/08 07:42:18 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -986,7 +986,7 @@ if(entry_a->rsc == NULL) { return 1; } if(entry_b->rsc == NULL) { return -1; } - tmp = strcmp(entry_a->rsc->id, entry_b->rsc->id); + tmp = strcasecmp(entry_a->rsc->id, entry_b->rsc->id); if(tmp != 0) { return tmp; } @@ -995,7 +995,7 @@ if(entry_a->node == NULL) { return 1; } if(entry_b->node == NULL) { return -1; } - return strcmp(entry_a->node->details->id, entry_b->node->details->id); + return strcasecmp(entry_a->node->details->id, entry_b->node->details->id); } static void @@ -1385,7 +1385,7 @@ CRM_ASSERT(resource1 != NULL); CRM_ASSERT(resource2 != NULL); - return strcmp(resource1->id, resource2->id); + return strcasecmp(resource1->id, resource2->id); } gboolean =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -3 -r1.111 -r1.112 --- pengine.c 5 May 2006 13:36:49 -0000 1.111 +++ pengine.c 8 May 2006 07:42:18 -0000 1.112 @@ -1,4 +1,4 @@ -/* $Id: pengine.c,v 1.111 2006/05/05 13:36:49 andrew Exp $ */ +/* $Id: pengine.c,v 1.112 2006/05/08 07:42:18 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -76,18 +76,18 @@ if(op == NULL){ /* error */ - } else if(strcmp(op, CRM_OP_HELLO) == 0) { + } else if(strcasecmp(op, CRM_OP_HELLO) == 0) { /* ignore */ } else if(safe_str_eq(cl_get_string(msg, F_CRM_MSG_TYPE), XML_ATTR_RESPONSE)) { /* ignore */ - } else if(sys_to == NULL || strcmp(sys_to, CRM_SYSTEM_PENGINE) != 0) { + } else if(sys_to == NULL || strcasecmp(sys_to, CRM_SYSTEM_PENGINE) != 0) { crm_debug_3("Bad sys-to %s", crm_str(sys_to)); return FALSE; - } else if(strcmp(op, CRM_OP_PECALC) == 0) { + } else if(strcasecmp(op, CRM_OP_PECALC) == 0) { int seq = -1; int series_id = 0; int series_wrap = 0; @@ -181,7 +181,7 @@ free_xml(log_input); crm_free(filename); - } else if(strcmp(op, CRM_OP_QUIT) == 0) { + } else if(strcasecmp(op, CRM_OP_QUIT) == 0) { crm_warn("Received quit message, terminating"); exit(0); } =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/rules.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- rules.c 18 Mar 2006 17:23:48 -0000 1.22 +++ rules.c 8 May 2006 07:42:18 -0000 1.23 @@ -1,4 +1,4 @@ -/* $Id: rules.c,v 1.22 2006/03/18 17:23:48 andrew Exp $ */ +/* $Id: rules.c,v 1.23 2006/05/08 07:42:18 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -231,7 +231,7 @@ if(value != NULL && h_val != NULL) { if(type == NULL || (safe_str_eq(type, "string"))) { - cmp = strcmp(h_val, value); + cmp = strcasecmp(h_val, value); } else if(safe_str_eq(type, "number")) { int h_val_f = crm_parse_int(h_val, NULL); ------------------------------ Message: 2 Date: Mon, 8 May 2006 01:42:21 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org 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_client.c Log Message: The case used for these strings is not interesting to us, use strcasecmp() =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_client.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- cib_client.c 26 Apr 2006 13:36:05 -0000 1.56 +++ cib_client.c 8 May 2006 07:42:19 -0000 1.57 @@ -608,43 +608,43 @@ if (a_section == NULL) { a_section_parent = crm_strdup("all"); - } else if(strcmp(a_section, XML_TAG_CIB) == 0) { + } else if(strcasecmp(a_section, XML_TAG_CIB) == 0) { a_section_parent = crm_strdup("all"); - } else if(strcmp(a_section, XML_CIB_TAG_NODE) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_NODE) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_NODES); - } else if(strcmp(a_section, XML_CIB_TAG_STATE) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_STATE) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_STATUS); - } else if(strcmp(a_section, XML_CIB_TAG_CONSTRAINT) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_CONSTRAINT) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_CONSTRAINTS); - } else if(strcmp(a_section, XML_CONS_TAG_RSC_LOCATION) == 0) { + } else if(strcasecmp(a_section, XML_CONS_TAG_RSC_LOCATION) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_CONSTRAINTS); - } else if(strcmp(a_section, XML_CONS_TAG_RSC_DEPEND) == 0) { + } else if(strcasecmp(a_section, XML_CONS_TAG_RSC_DEPEND) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_CONSTRAINTS); - } else if(strcmp(a_section, XML_CONS_TAG_RSC_ORDER) == 0) { + } else if(strcasecmp(a_section, XML_CONS_TAG_RSC_ORDER) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_CONSTRAINTS); - } else if(strcmp(a_section, "resource") == 0) { + } else if(strcasecmp(a_section, "resource") == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_RESOURCES); - } else if(strcmp(a_section, XML_CIB_TAG_RESOURCE) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_RESOURCE) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_RESOURCES); - } else if(strcmp(a_section, XML_CIB_TAG_GROUP) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_GROUP) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_RESOURCES); - } else if(strcmp(a_section, XML_CIB_TAG_INCARNATION) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_INCARNATION) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_RESOURCES); - } else if(strcmp(a_section, XML_CIB_TAG_NVPAIR) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_NVPAIR) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_CRMCONFIG); - } else if(strcmp(a_section, XML_TAG_ATTR_SETS) == 0) { + } else if(strcasecmp(a_section, XML_TAG_ATTR_SETS) == 0) { a_section_parent = crm_strdup(XML_CIB_TAG_CRMCONFIG); } else { @@ -856,22 +856,22 @@ int cib_section2enum(const char *a_section) { - if(a_section == NULL || strcmp(a_section, "all") == 0) { + if(a_section == NULL || strcasecmp(a_section, "all") == 0) { return cib_section_all; - } else if(strcmp(a_section, XML_CIB_TAG_NODES) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_NODES) == 0) { return cib_section_nodes; - } else if(strcmp(a_section, XML_CIB_TAG_STATUS) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_STATUS) == 0) { return cib_section_status; - } else if(strcmp(a_section, XML_CIB_TAG_CONSTRAINTS) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_CONSTRAINTS) == 0) { return cib_section_constraints; - } else if(strcmp(a_section, XML_CIB_TAG_RESOURCES) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_RESOURCES) == 0) { return cib_section_resources; - } else if(strcmp(a_section, XML_CIB_TAG_CRMCONFIG) == 0) { + } else if(strcasecmp(a_section, XML_CIB_TAG_CRMCONFIG) == 0) { return cib_section_crmconfig; } @@ -1215,7 +1215,7 @@ /* get the whole cib */ return the_root; - } else if(strcmp(object_type, XML_CIB_TAG_STATUS) == 0) { + } else if(strcasecmp(object_type, XML_CIB_TAG_STATUS) == 0) { /* these live in a different place */ tmp_node = find_xml_node(the_root, XML_CIB_TAG_STATUS, FALSE); ------------------------------ _______________________________________________ Linux-ha-cvs mailing list Linux-ha-cvs@lists.linux-ha.org http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs End of Linux-ha-cvs Digest, Vol 30, Issue 16 ********************************************