Просмотр исходного кода

change get node_id() to return an unsigned int


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1701 fd59a12c-fef9-0310-b244-a6a79926bd2f
Angus Salkeld 17 лет назад
Родитель
Сommit
f2f20533fd
6 измененных файлов с 7 добавлено и 7 удалено
  1. 1 1
      exec/totemmrp.c
  2. 1 1
      exec/totempg.c
  3. 2 2
      exec/totemsrp.c
  4. 1 1
      exec/totemsrp.h
  5. 1 1
      include/corosync/engine/coroapi.h
  6. 1 1
      include/corosync/totem/totempg.h

+ 1 - 1
exec/totemmrp.c

@@ -192,7 +192,7 @@ int totemmrp_ifaces_get (
 	return (res);
 	return (res);
 }
 }
 
 
-int totemmrp_my_nodeid_get (void)
+unsigned int totemmrp_my_nodeid_get (void)
 {
 {
 	return (totemsrp_my_nodeid_get (totemsrp_handle_in));
 	return (totemsrp_my_nodeid_get (totemsrp_handle_in));
 }
 }

+ 1 - 1
exec/totempg.c

@@ -1264,7 +1264,7 @@ char *totempg_ifaces_print (unsigned int nodeid)
 	return (iface_string);
 	return (iface_string);
 }
 }
 
 
-int totempg_my_nodeid_get (void)
+unsigned int totempg_my_nodeid_get (void)
 {
 {
 	return (totemmrp_my_nodeid_get());
 	return (totemmrp_my_nodeid_get());
 }
 }

+ 2 - 2
exec/totemsrp.c

@@ -913,11 +913,11 @@ error_exit:
 	return (res);
 	return (res);
 }
 }
 
 
-int totemsrp_my_nodeid_get (
+unsigned int totemsrp_my_nodeid_get (
 	totemsrp_handle handle)
 	totemsrp_handle handle)
 {
 {
 	struct totemsrp_instance *instance;
 	struct totemsrp_instance *instance;
-	int res;
+	unsigned int res;
 
 
 	res = hdb_handle_get (&totemsrp_instance_database, handle,
 	res = hdb_handle_get (&totemsrp_instance_database, handle,
 		(void *)&instance);
 		(void *)&instance);

+ 1 - 1
exec/totemsrp.h

@@ -104,7 +104,7 @@ extern int totemsrp_ifaces_get (
 	char ***status,
 	char ***status,
 	unsigned int *iface_count);
 	unsigned int *iface_count);
 
 
-extern int totemsrp_my_nodeid_get (
+extern unsigned int totemsrp_my_nodeid_get (
 	totemsrp_handle handle);
 	totemsrp_handle handle);
 
 
 extern int totemsrp_my_family_get (
 extern int totemsrp_my_family_get (

+ 1 - 1
include/corosync/engine/coroapi.h

@@ -405,7 +405,7 @@ struct corosync_api_v1 {
 	/*
 	/*
 	 * Totem APIs
 	 * Totem APIs
 	 */
 	 */
-	int (*totem_nodeid_get) (void);
+	unsigned int (*totem_nodeid_get) (void);
 
 
 	int (*totem_family_get) (void);
 	int (*totem_family_get) (void);
 
 

+ 1 - 1
include/corosync/totem/totempg.h

@@ -139,7 +139,7 @@ extern int totempg_ifaces_get (
 
 
 extern char *totempg_ifaces_print (unsigned int nodeid);
 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);
 extern int totempg_my_family_get (void);