Parcourir la source

Cleaning up and preparing for later patch.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1310 fd59a12c-fef9-0310-b244-a6a79926bd2f
Hans Feldt il y a 19 ans
Parent
commit
97919b8d16
12 fichiers modifiés avec 12 ajouts et 13 suppressions
  1. 1 1
      exec/amf.c
  2. 1 1
      exec/cfg.c
  3. 1 1
      exec/ckpt.c
  4. 1 1
      exec/clm.c
  5. 1 1
      exec/cpg.c
  6. 1 1
      exec/evs.c
  7. 1 2
      exec/evt.c
  8. 1 1
      exec/lck.c
  9. 1 1
      exec/msg.c
  10. 1 1
      exec/service.h
  11. 1 1
      exec/sync.c
  12. 1 1
      exec/sync.h

+ 1 - 1
exec/amf.c

@@ -371,7 +371,7 @@ static struct openais_exec_handler amf_exec_service[] = {
  * Exports the interface for the service
  */
 static struct openais_service_handler amf_service_handler = {
-	.name				= (unsigned char *)"openais availability management framework B.01.01",
+	.name				= "openais availability management framework B.01.01",
 	.id					= AMF_SERVICE,
 	.private_data_size	= sizeof (struct amf_pd),
 	.flow_control		= OPENAIS_FLOW_CONTROL_NOT_REQUIRED,

+ 1 - 1
exec/cfg.c

@@ -164,7 +164,7 @@ static struct openais_exec_handler cfg_exec_service[] =
  * Exports the interface for the service
  */
 struct openais_service_handler cfg_service_handler = {
-	.name					= (unsigned char*)"openais configuration service",
+	.name					= "openais configuration service",
 	.id					= CFG_SERVICE,
 	.private_data_size			= 0,
 	.flow_control				= OPENAIS_FLOW_CONTROL_NOT_REQUIRED, 

+ 1 - 1
exec/ckpt.c

@@ -571,7 +571,7 @@ static struct openais_exec_handler ckpt_exec_service[] = {
 };
 
 struct openais_service_handler ckpt_service_handler = {
-	.name				= (unsigned char *)"openais checkpoint service B.01.01",
+	.name				= "openais checkpoint service B.01.01",
 	.id				= CKPT_SERVICE,
 	.private_data_size		= sizeof (struct ckpt_pd),
 	.flow_control			= OPENAIS_FLOW_CONTROL_NOT_REQUIRED, 

+ 1 - 1
exec/clm.c

@@ -200,7 +200,7 @@ static struct openais_exec_handler clm_exec_service[] =
 };
 	
 struct openais_service_handler clm_service_handler = {
-	.name			= (unsigned char*)"openais cluster membership service B.01.01",
+	.name			= "openais cluster membership service B.01.01",
 	.id			= CLM_SERVICE,
 	.private_data_size	= sizeof (struct clm_pd),
 	.flow_control		= OPENAIS_FLOW_CONTROL_NOT_REQUIRED, 

+ 1 - 1
exec/cpg.c

@@ -236,7 +236,7 @@ static struct openais_exec_handler cpg_exec_service[] =
 };
 
 struct openais_service_handler cpg_service_handler = {
-	.name				        = (unsigned char*)"openais cluster closed process group service v1.01",
+	.name				        = "openais cluster closed process group service v1.01",
 	.id					= CPG_SERVICE,
 	.private_data_size			= sizeof (struct process_info),
 	.flow_control				= OPENAIS_FLOW_CONTROL_REQUIRED,

+ 1 - 1
exec/evs.c

@@ -142,7 +142,7 @@ static struct openais_exec_handler evs_exec_service[] =
 };
 
 struct openais_service_handler evs_service_handler = {
-	.name			= (unsigned char*)"openais extended virtual synchrony service",
+	.name			= "openais extended virtual synchrony service",
 	.id			= EVS_SERVICE,
 	.private_data_size	= sizeof (struct evs_pd),
 	.flow_control		= OPENAIS_FLOW_CONTROL_REQUIRED, 

+ 1 - 2
exec/evt.c

@@ -210,8 +210,7 @@ static struct openais_exec_handler evt_exec_service[] = {
 };
 
 struct openais_service_handler evt_service_handler = {
-	.name						=
-								(unsigned char*)"openais event service B.01.01",
+	.name						= "openais event service B.01.01",
 	.id							= EVT_SERVICE,
 	.private_data_size			= sizeof (struct libevt_pd),
 	.flow_control				= OPENAIS_FLOW_CONTROL_NOT_REQUIRED,

+ 1 - 1
exec/lck.c

@@ -300,7 +300,7 @@ static struct openais_exec_handler lck_exec_service[] = {
 };
 
 struct openais_service_handler lck_service_handler = {
-	.name				= (unsigned char*)"openais distributed locking service B.01.01",
+	.name				= "openais distributed locking service B.01.01",
 	.id				= LCK_SERVICE,
 	.private_data_size		= sizeof (struct lck_pd),
 	.flow_control			= OPENAIS_FLOW_CONTROL_NOT_REQUIRED, 

+ 1 - 1
exec/msg.c

@@ -433,7 +433,7 @@ static struct openais_exec_handler msg_exec_service[] = {
 };
 
 struct openais_service_handler msg_service_handler = {
-	.name				= (unsigned char *)"openais message service B.01.01",
+	.name				= "openais message service B.01.01",
 	.id				= MSG_SERVICE,
 	.private_data_size		= sizeof (struct msg_pd),
 	.flow_control			= OPENAIS_FLOW_CONTROL_NOT_REQUIRED, 

+ 1 - 1
exec/service.h

@@ -62,7 +62,7 @@ struct openais_exec_handler {
 };
 
 struct openais_service_handler {
-	unsigned char *name;
+	char *name;
 	unsigned short id;
 	unsigned int private_data_size;
 	enum openais_flow_control flow_control;

+ 1 - 1
exec/sync.c

@@ -235,7 +235,7 @@ static void sync_callbacks_load (void)
 			break;
 		}
 		if ((service_name != NULL) &&
-			strcmp ((char*)sync_callbacks.name, service_name) != 0) {
+			strcmp (sync_callbacks.name, service_name) != 0) {
 			sync_recovery_index += 1;
 			continue;
 		}

+ 1 - 1
exec/sync.h

@@ -44,7 +44,7 @@ struct sync_callbacks {
 	int (*sync_process) (void);
 	void (*sync_activate) (void);
 	void (*sync_abort) (void);
-	unsigned char *name;
+	char *name;
 };
 
 int sync_register (