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

Rename request_shutdown to shutdown_request in coroapi.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2282 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake 16 лет назад
Родитель
Сommit
76bc62a5d9
5 измененных файлов с 7 добавлено и 7 удалено
  1. 1 1
      exec/apidef.c
  2. 3 3
      exec/main.c
  3. 1 1
      exec/main.h
  4. 1 1
      include/corosync/engine/coroapi.h
  5. 1 1
      services/cfg.c

+ 1 - 1
exec/apidef.c

@@ -140,7 +140,7 @@ static struct corosync_api_v1 apidef_corosync_api_v1 = {
 	.plugin_interface_release = lcr_ifact_release,
 	.error_memory_failure = _corosync_out_of_memory_error,
 	.fatal_error = _corosync_public_exit_error,
-	.request_shutdown = corosync_request_shutdown,
+	.shutdown_request = corosync_shutdown_request,
 	.state_dump = corosync_state_dump
 };
 

+ 3 - 3
exec/main.c

@@ -147,7 +147,7 @@ static void sigusr2_handler (int num)
 /*
  * TODO this function needs some love
  */
-void corosync_request_shutdown (void)
+void corosync_shutdown_request (void)
 {
 	if (api) {
 		corosync_service_unlink_all (api);
@@ -162,12 +162,12 @@ void corosync_request_shutdown (void)
 
 static void sigquit_handler (int num)
 {
-	corosync_request_shutdown ();
+	corosync_shutdown_request ();
 }
 
 static void sigintr_handler (int num)
 {
-	corosync_request_shutdown ();
+	corosync_shutdown_request ();
 }
 
 static void sigsegv_handler (int num)

+ 1 - 1
exec/main.h

@@ -64,7 +64,7 @@ extern void message_source_set (mar_message_source_t *source, void *conn);
 
 extern int message_source_is_local (const mar_message_source_t *source);
 
-extern void corosync_request_shutdown (void);
+extern void corosync_shutdown_request (void);
 
 extern void corosync_state_dump (void);
 

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

@@ -575,7 +575,7 @@ struct corosync_api_v1 {
 #define corosync_fatal_error(err) api->fatal_error ((err), __FILE__, __LINE__)
 	void (*fatal_error) (cs_fatal_error_t err, const char *file, unsigned int line);
 
-	void (*request_shutdown) (void);
+	void (*shutdown_request) (void);
 
 	void (*state_dump) (void);
 };

+ 1 - 1
services/cfg.c

@@ -630,7 +630,7 @@ static void message_handler_req_exec_cfg_shutdown (
 
 	log_printf(LOGSYS_LEVEL_NOTICE, "Node %d was shut down by sysadmin\n", nodeid);
 	if (nodeid == api->totem_nodeid_get()) {
-		api->request_shutdown();
+		api->shutdown_request();
 	}
 	LEAVE();
 }