From: Jim Meyering <[email protected]>
---
include/corosync/engine/coroapi.h | 2 +-
include/corosync/engine/objdb.h | 2 +-
lib/sa-confdb.c | 2 +-
services/confdb.c | 7 +------
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/include/corosync/engine/coroapi.h
b/include/corosync/engine/coroapi.h
index 11d2917..049e0ea 100644
--- a/include/corosync/engine/coroapi.h
+++ b/include/corosync/engine/coroapi.h
@@ -342,7 +342,7 @@ struct corosync_api_v1 {
object_reload_notify_fn_t object_reload_notify_fn,
void * priv_data_pt);
- int (*object_write_config) (char **error_string);
+ int (*object_write_config) (const char **error_string);
int (*object_reload_config) (int flush,
const char **error_string);
diff --git a/include/corosync/engine/objdb.h b/include/corosync/engine/objdb.h
index 8800f6e..2b87f23 100644
--- a/include/corosync/engine/objdb.h
+++ b/include/corosync/engine/objdb.h
@@ -217,7 +217,7 @@ struct objdb_iface_ver0 {
object_reload_notify_fn_t object_reload_notify_fn,
void * priv_data_pt);
- int (*object_write_config) (char **error_string);
+ int (*object_write_config) (const char **error_string);
int (*object_reload_config) (
int flush,
diff --git a/lib/sa-confdb.c b/lib/sa-confdb.c
index aef0a02..30a1fc3 100644
--- a/lib/sa-confdb.c
+++ b/lib/sa-confdb.c
@@ -305,7 +305,7 @@ int confdb_sa_key_replace (
int confdb_sa_write (
char *error_text)
{
- char *errtext;
+ const char *errtext;
int ret;
ret = objdb->object_write_config(&errtext);
diff --git a/services/confdb.c b/services/confdb.c
index 3fb9dda..33cafdb 100644
--- a/services/confdb.c
+++ b/services/confdb.c
@@ -576,7 +576,7 @@ static void message_handler_req_lib_confdb_write (void
*conn, void *message)
{
struct res_lib_confdb_write res_lib_confdb_write;
int ret = CS_OK;
- char *error_string = NULL;
+ const char *error_string = NULL;
if (api->object_write_config(&error_string))
ret = CS_ERR_ACCESS;
@@ -714,8 +714,3 @@ static void message_handler_req_lib_confdb_track_stop (void
*conn, void *message
res.error = CS_OK;
api->ipc_response_send(conn, &res, sizeof(res));
}
-
-
-
-
-
--
1.6.2.rc1.285.gc5f54
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
