From 3ffb151aa75d9751061a89f5a87356e87bf43ff5 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fdinitto@redhat.com>
Date: Mon, 7 Sep 2009 10:41:42 +0000
Subject: [PATCH] Fix missing symbol error when loading plugins without
 executive

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2405 fd59a12c-fef9-0310-b244-a6a79926bd2f
---
 exec/coroparse.c | 11 +++++++++++
 exec/util.c      | 11 -----------
 exec/util.h      |  1 -
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/exec/coroparse.c b/exec/coroparse.c
index 82abe830..5c4b3745 100644
--- a/exec/coroparse.c
+++ b/exec/coroparse.c
@@ -62,6 +62,17 @@ static int read_config_file_into_objdb(
 static char error_string_response[512];
 
 
+static char *strchr_rs (const char *haystack, int byte)
+{
+	const char *end_address = strchr (haystack, byte);
+	if (end_address) {
+		end_address += 1; /* skip past { or = */
+		end_address += strspn (end_address, " \t");
+	}
+
+	return ((char *) end_address);
+}
+
 static int aisparser_readconfig (struct objdb_iface_ver0 *objdb,
 				 const char **error_string)
 {
diff --git a/exec/util.c b/exec/util.c
index aad21e27..c621ec06 100644
--- a/exec/util.c
+++ b/exec/util.c
@@ -112,17 +112,6 @@ char *getcs_name_t (cs_name_t *name)
 	return ((char *)name->value);
 }
 
-char *strchr_rs (const char *haystack, int byte)
-{
-	const char *end_address = strchr (haystack, byte);
-	if (end_address) {
-		end_address += 1; /* skip past { or = */
-		end_address += strspn (end_address, " \t");
-	}
-
-	return ((char *) end_address);
-}
-
 void setcs_name_t (cs_name_t *name, char *str) {
 	strncpy ((char *)name->value, str, CS_MAX_NAME_LENGTH);
 	if (strlen ((char *)name->value) > CS_MAX_NAME_LENGTH) {
diff --git a/exec/util.h b/exec/util.h
index 7612b1b1..da5b1263 100644
--- a/exec/util.h
+++ b/exec/util.h
@@ -73,7 +73,6 @@ extern void _corosync_exit_error (enum e_ais_done err, const char *file,
   __attribute__((__noreturn__));
 void _corosync_out_of_memory_error (void) __attribute__((__noreturn__));
 extern char *getcs_name_t (cs_name_t *name);
-extern char *strchr_rs (const char *haystack, int byte);
 extern void setcs_name_t (cs_name_t *name, char *str);
 extern int cs_name_tisEqual (cs_name_t *str1, char *str2);
 #endif /* UTIL_H_DEFINED */