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: fencing by sunjd from
([email protected])
2. Linux-HA CVS: cim by panjiam from
([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: lib by zhenh from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 13 Dec 2005 22:46:47 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: fencing by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : fencing
Dir : linux-ha/fencing/stonithd
Modified Files:
stonithd.c
Log Message:
Make the loglevel mapping more obvious
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/fencing/stonithd/stonithd.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- stonithd.c 13 Dec 2005 07:56:29 -0000 1.81
+++ stonithd.c 14 Dec 2005 05:46:45 -0000 1.82
@@ -1,4 +1,4 @@
-/* $Id: stonithd.c,v 1.81 2005/12/13 07:56:29 sunjd Exp $ */
+/* $Id: stonithd.c,v 1.82 2005/12/14 05:46:45 sunjd Exp $ */
/* File: stonithd.c
* Description: STONITH daemon for node fencing
@@ -85,7 +85,10 @@
}
static int pil_loglevel_to_cl_loglevel[] = {
- 0, 1, 2, 4, 6, 7
+ /* Indices: <none>=0, PIL_FATAL=1, PIL_CRIT=2, PIL_WARN=3,
+ PIL_INFO=4, PIL_DEBUG=5
+ */
+ LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_WARNING, LOG_INFO, LOG_DEBUG
};
typedef struct {
@@ -3264,6 +3267,9 @@
/*
* $Log: stonithd.c,v $
+ * Revision 1.82 2005/12/14 05:46:45 sunjd
+ * Make the loglevel mapping more obvious
+ *
* Revision 1.81 2005/12/13 07:56:29 sunjd
* bug918:redirect stonith library messages
*
------------------------------
Message: 2
Date: Tue, 13 Dec 2005 23:08:15 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
Makefile.am
Log Message:
Makefile.am
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.am 13 Dec 2005 13:43:53 -0000 1.11
+++ Makefile.am 14 Dec 2005 06:08:14 -0000 1.12
@@ -133,6 +133,3 @@
libcmpiLinuxHA_IndicationProvider_la_LIBADD = $(COMMONLIBS) liblinuxha_info.la
#--------------------------------------------------------------
-noinst_PROGRAMS = simpledemo
-simpledemo_SOURCES = ha_resource.c cmpi_utils.c simple_demo.c
-simpledemo_LDADD = $(COMMONLIBS) liblinuxha_info.la
------------------------------
Message: 3
Date: Wed, 14 Dec 2005 02:39:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c mgmt_lib.c
Log Message:
some fixs to make BEAM happy:1,replace some strncmp with STRNCMP_CONST;2,remove
some useless return;3,one cast type
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- mgmt_crm.c 8 Dec 2005 15:19:29 -0000 1.3
+++ mgmt_crm.c 14 Dec 2005 09:39:24 -0000 1.4
@@ -495,8 +495,8 @@
}
xml[0]=0;
in_group = (strlen(argv[5]) != 0);
- clone = (strncmp(argv[6], "clone", MAX_STRLEN) == 0);
- master = (strncmp(argv[6], "master", MAX_STRLEN) == 0);
+ clone = (STRNCMP_CONST(argv[6], "clone") == 0);
+ master = (STRNCMP_CONST(argv[6], "master") == 0);
has_param = (argc > 11);
if (in_group) {
snprintf(buf, MAX_STRLEN, "<group id=\"%s\">", argv[5]);
@@ -821,7 +821,7 @@
return ret;
}
for (i = 0; i < attrs->nfields; i++) {
- if (strncmp(attrs->names[i], "nvpair", sizeof("nvpair")) == 0) {
+ if (STRNCMP_CONST(attrs->names[i], "nvpair") == 0) {
nvpair = (struct ha_msg*)attrs->values[i];
ret = mgmt_msg_append(ret, ha_msg_value(nvpair, "id"));
ret = mgmt_msg_append(ret, ha_msg_value(nvpair,
"name"));
@@ -896,7 +896,7 @@
return ret;
}
for (i = 0; i < ops->nfields; i++) {
- if (strncmp(ops->names[i], "op", sizeof("op")) == 0) {
+ if (STRNCMP_CONST(ops->names[i], "op") == 0) {
op = (struct ha_msg*)ops->values[i];
ret = mgmt_msg_append(ret, ha_msg_value(op, "id"));
ret = mgmt_msg_append(ret, ha_msg_value(op, "name"));
@@ -1123,7 +1123,7 @@
while (cur != NULL) {
crm_data_t* constraint = (crm_data_t*)cur->data;
if (strncmp(argv[2],ha_msg_value(constraint, "id"),
MAX_STRLEN)==0) {
- if (strncmp(argv[1],"rsc_location", MAX_STRLEN)==0) {
+ if (STRNCMP_CONST(argv[1],"rsc_location")==0) {
ret = mgmt_msg_append(ret,
ha_msg_value(constraint, "id"));
ret = mgmt_msg_append(ret,
ha_msg_value(constraint, "rsc"));
rule = find_xml_node(constraint,"rule",TRUE);
@@ -1140,13 +1140,13 @@
}
g_list_free(expr_list);
}
- else if (strncmp(argv[1],"rsc_order", MAX_STRLEN)==0) {
+ else if (STRNCMP_CONST(argv[1],"rsc_order")==0) {
ret = mgmt_msg_append(ret,
ha_msg_value(constraint, "id"));
ret = mgmt_msg_append(ret,
ha_msg_value(constraint, "from"));
ret = mgmt_msg_append(ret,
ha_msg_value(constraint, "type"));
ret = mgmt_msg_append(ret,
ha_msg_value(constraint, "to"));
}
- else if (strncmp(argv[1],"rsc_colocation",
MAX_STRLEN)==0) {
+ else if (STRNCMP_CONST(argv[1],"rsc_colocation")==0) {
ret = mgmt_msg_append(ret,
ha_msg_value(constraint, "id"));
ret = mgmt_msg_append(ret,
ha_msg_value(constraint, "from"));
ret = mgmt_msg_append(ret,
ha_msg_value(constraint, "to"));
@@ -1180,7 +1180,7 @@
int i;
char xml[MAX_STRLEN];
- if (strncmp(argv[1],"rsc_location", MAX_STRLEN)==0) {
+ if (STRNCMP_CONST(argv[1],"rsc_location")==0) {
snprintf(xml, MAX_STRLEN,
"<rsc_location id=\"%s\" rsc=\"%s\">" \
"<rule id=\"prefered_%s\" score=\"%s\">",
@@ -1194,12 +1194,12 @@
}
strncat(xml, "</rule></rsc_location>", MAX_STRLEN);
}
- else if (strncmp(argv[1],"rsc_order", MAX_STRLEN)==0) {
+ else if (STRNCMP_CONST(argv[1],"rsc_order")==0) {
snprintf(xml, MAX_STRLEN,
"<rsc_order id=\"%s\" from=\"%s\" type=\"%s\"
to=\"%s\"/>",
argv[2], argv[3], argv[4], argv[5]);
}
- else if (strncmp(argv[1],"rsc_colocation", MAX_STRLEN)==0) {
+ else if (STRNCMP_CONST(argv[1],"rsc_colocation")==0) {
snprintf(xml, MAX_STRLEN,
"<rsc_colocation id=\"%s\" from=\"%s\" to=\"%s\"
score=\"%s\"/>",
argv[2], argv[3], argv[4], argv[5]);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_lib.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- mgmt_lib.c 9 Dec 2005 06:58:41 -0000 1.3
+++ mgmt_lib.c 14 Dec 2005 09:39:24 -0000 1.4
@@ -119,7 +119,7 @@
return -1;
}
- func = g_hash_table_lookup(event_map, args[0]);
+ func = (event_handler)g_hash_table_lookup(event_map, args[0]);
if (func != NULL) {
func(event);
}
------------------------------
Message: 4
Date: Wed, 14 Dec 2005 02:39:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/mgmt
Modified Files:
mgmt_client_lib.c mgmt_common_lib.c mgmt_tls_lib.c
Log Message:
some fixs to make BEAM happy:1,replace some strncmp with STRNCMP_CONST;2,remove
some useless return;3,one cast type
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/mgmt/mgmt_client_lib.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- mgmt_client_lib.c 6 Dec 2005 14:55:58 -0000 1.1
+++ mgmt_client_lib.c 14 Dec 2005 09:39:24 -0000 1.2
@@ -212,6 +212,5 @@
return NULL;
}
}
- return NULL;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/mgmt/mgmt_common_lib.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- mgmt_common_lib.c 6 Dec 2005 14:52:48 -0000 1.1
+++ mgmt_common_lib.c 14 Dec 2005 09:39:24 -0000 1.2
@@ -111,7 +111,7 @@
if (args == NULL || num ==0) {
ret = 0;
}
- else if (strncmp(args[0],MSG_OK,MAX_STRLEN)!=0) {
+ else if (STRNCMP_CONST(args[0], MSG_OK)!=0) {
ret = 0;
}
else {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/mgmt/mgmt_tls_lib.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- mgmt_tls_lib.c 6 Dec 2005 14:51:22 -0000 1.1
+++ mgmt_tls_lib.c 14 Dec 2005 09:39:24 -0000 1.2
@@ -82,7 +82,6 @@
return ret;
}
}
- return 0;
}
ssize_t
tls_recv(void* s, void* buf, size_t len)
@@ -94,7 +93,6 @@
return ret;
}
}
- return 0;
}
int
tls_detach(void* s)
------------------------------
_______________________________________________
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 32
********************************************
