Hi
Here is the patch to change nodeid_get() to return an unsigned int.
-Angus
---
exec/totemmrp.c | 2 +-
exec/totempg.c | 2 +-
exec/totemsrp.c | 4 ++--
exec/totemsrp.h | 2 +-
include/corosync/engine/coroapi.h | 2 +-
include/corosync/totem/totempg.h | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/exec/totemmrp.c b/exec/totemmrp.c
index be94801..ff8e50c 100644
--- a/exec/totemmrp.c
+++ b/exec/totemmrp.c
@@ -192,7 +192,7 @@ int totemmrp_ifaces_get (
return (res);
}
-int totemmrp_my_nodeid_get (void)
+unsigned int totemmrp_my_nodeid_get (void)
{
return (totemsrp_my_nodeid_get (totemsrp_handle_in));
}
diff --git a/exec/totempg.c b/exec/totempg.c
index ece0db6..e1c805b 100644
--- a/exec/totempg.c
+++ b/exec/totempg.c
@@ -1259,7 +1259,7 @@ char *totempg_ifaces_print (unsigned int nodeid)
return (iface_string);
}
-int totempg_my_nodeid_get (void)
+unsigned int totempg_my_nodeid_get (void)
{
return (totemmrp_my_nodeid_get());
}
diff --git a/exec/totemsrp.c b/exec/totemsrp.c
index 3fd4307..ad47b37 100644
--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
@@ -906,11 +906,11 @@ error_exit:
return (res);
}
-int totemsrp_my_nodeid_get (
+unsigned int totemsrp_my_nodeid_get (
totemsrp_handle handle)
{
struct totemsrp_instance *instance;
- int res;
+ unsigned int res;
res = hdb_handle_get (&totemsrp_instance_database, handle,
(void *)&instance);
diff --git a/exec/totemsrp.h b/exec/totemsrp.h
index ce61974..aba8201 100644
--- a/exec/totemsrp.h
+++ b/exec/totemsrp.h
@@ -104,7 +104,7 @@ extern int totemsrp_ifaces_get (
char ***status,
unsigned int *iface_count);
-extern int totemsrp_my_nodeid_get (
+extern unsigned int totemsrp_my_nodeid_get (
totemsrp_handle handle);
extern int totemsrp_my_family_get (
diff --git a/include/corosync/engine/coroapi.h
b/include/corosync/engine/coroapi.h
index 644fd4c..25ee1b6 100644
--- a/include/corosync/engine/coroapi.h
+++ b/include/corosync/engine/coroapi.h
@@ -377,7 +377,7 @@ struct corosync_api_v1 {
/*
* Totem APIs
*/
- int (*totem_nodeid_get) (void);
+ unsigned int (*totem_nodeid_get) (void);
int (*totem_family_get) (void);
diff --git a/include/corosync/totem/totempg.h b/include/corosync/totem/totempg.h
index f188523..78927a6 100644
--- a/include/corosync/totem/totempg.h
+++ b/include/corosync/totem/totempg.h
@@ -139,7 +139,7 @@ extern int totempg_ifaces_get (
extern char *totempg_ifaces_print (unsigned int nodeid);
-extern int totempg_my_nodeid_get (void);
+extern unsigned int totempg_my_nodeid_get (void);
extern int totempg_my_family_get (void);
--
1.5.6
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais