From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/cman/daemon Makefile ais.c
Date: 2 Jan 2008 10:56:22 -0000 [thread overview]
Message-ID: <20080102105622.2457.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: pcaulfield at sourceware.org 2008-01-02 10:56:21
Modified files:
cman/daemon : Makefile ais.c
Log message:
Errorstring fixes from Fabio.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.47.2.1&r2=1.47.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.44.2.3&r2=1.44.2.4
--- cluster/cman/daemon/Makefile 2007/06/26 12:29:17 1.47.2.1
+++ cluster/cman/daemon/Makefile 2008/01/02 10:56:21 1.47.2.2
@@ -15,7 +15,7 @@
include ${top_srcdir}/make/defines.mk
-CFLAGS+= -fPIC -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
+CFLAGS+= -I/home/christine/dev/openais-installed/usr/include -fPIC -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
-DCMAN_RELEASE_NAME=\"${RELEASE}\" -DOPENAIS_EXTERNAL_SERVICE
ifeq ($(DEBUG),y)
--- cluster/cman/daemon/ais.c 2007/05/10 09:05:16 1.44.2.3
+++ cluster/cman/daemon/ais.c 2008/01/02 10:56:21 1.44.2.4
@@ -29,6 +29,7 @@
/* openais headers */
#include <openais/totem/totemip.h>
+//#include <openais/service/objdb.h>
#include <openais/totem/totempg.h>
#include <openais/totem/aispoll.h>
#include <openais/service/service.h>
@@ -60,7 +61,6 @@
int num_ais_nodes;
static int config_run;
-static char errorstring[512];
static int startup_pipe;
static unsigned int debug_mask;
static int first_trans = 1;
@@ -225,7 +225,7 @@
if (error)
{
write_cman_pipe("Error reading config from CCS");
- sprintf(errorstring, "Error reading config from CCS");
+ *error_string = "Error reading config from CCS";
return -1;
}
@@ -234,6 +234,8 @@
config_run = 1;
+ *error_string = "Successfully read configuration from CCS";
+
return 0;
}
reply other threads:[~2008-01-02 10:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080102105622.2457.qmail@sourceware.org \
--to=pcaulfield@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox