From: Jim Meyering <[email protected]>
---
exec/totemconfig.c | 4 ++--
exec/totemip.c | 6 ++----
include/corosync/totem/totemip.h | 5 +++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/exec/totemconfig.c b/exec/totemconfig.c
index f36e922..1a6b710 100644
--- a/exec/totemconfig.c
+++ b/exec/totemconfig.c
@@ -91,7 +91,7 @@ static void add_totem_config_notification(
static inline int objdb_get_string (
struct objdb_iface_ver0 *objdb,
hdb_handle_t object_service_handle,
- const char *key, char **value)
+ const char *key, const char **value)
{
int res;
@@ -226,7 +226,7 @@ extern int totem_config_read (
int res = 0;
hdb_handle_t object_totem_handle;
hdb_handle_t object_interface_handle;
- char *str;
+ const char *str;
unsigned int ringnumber = 0;
hdb_handle_t object_find_interface_handle;
diff --git a/exec/totemip.c b/exec/totemip.c
index 5a58ec1..c514c8a 100644
--- a/exec/totemip.c
+++ b/exec/totemip.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005-2007 Red Hat, Inc.
+ * Copyright (c) 2005-2007, 2009 Red Hat, Inc.
*
* All rights reserved.
*
@@ -256,7 +256,7 @@ int totemip_totemip_to_sockaddr_convert(struct
totem_ip_address *ip_addr,
/* Converts an address string string into a totem_ip_address.
family can be AF_INET, AF_INET6 or 0 ("for "don't care")
*/
-int totemip_parse(struct totem_ip_address *totemip, char *addr, int family)
+int totemip_parse(struct totem_ip_address *totemip, const char *addr, int
family)
{
struct addrinfo *ainfo;
struct addrinfo ahints;
@@ -536,5 +536,3 @@ finished:
return 0;
}
#endif /* COROSYNC_LINUX */
-
-
diff --git a/include/corosync/totem/totemip.h b/include/corosync/totem/totemip.h
index 34a0903..8c36764 100644
--- a/include/corosync/totem/totemip.h
+++ b/include/corosync/totem/totemip.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005-2007 Red Hat, Inc.
+ * Copyright (c) 2005-2007, 2009 Red Hat, Inc.
*
* All rights reserved.
*
@@ -71,7 +71,8 @@ extern const char *totemip_print(struct totem_ip_address
*addr);
extern int totemip_sockaddr_to_totemip_convert(struct sockaddr_storage *saddr,
struct totem_ip_address *ip_addr);
extern int totemip_totemip_to_sockaddr_convert(struct totem_ip_address
*ip_addr,
uint16_t port, struct
sockaddr_storage *saddr, int *addrlen);
-extern int totemip_parse(struct totem_ip_address *totemip, char *addr, int
family);
+extern int totemip_parse(struct totem_ip_address *totemip, const char *addr,
+ int family);
extern int totemip_iface_check(struct totem_ip_address *bindnet, struct
totem_ip_address *boundto, int *interface_up, int *interface_num, int
mask_high_bit);
/* These two simulate a zero in_addr by clearing the family field */
--
1.6.2.rc1.285.gc5f54
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
