4
0
Эх сурвалжийг харах

utils: cleanup main daemon exit codes

some of them are not in use anymore and can be dropped.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Fabio M. Di Nitto 14 жил өмнө
parent
commit
e0e27e3d12
2 өөрчлөгдсөн 2 нэмэгдсэн , 11 устгасан
  1. 1 1
      exec/main.c
  2. 1 10
      exec/util.h

+ 1 - 1
exec/main.c

@@ -1037,7 +1037,7 @@ int main (int argc, char **argv, char **envp)
 
 
 	if (icmap_init() != CS_OK) {
 	if (icmap_init() != CS_OK) {
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't initialize configuration component.");
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't initialize configuration component.");
-		corosync_exit_error (COROSYNC_DONE_OBJDB);
+		corosync_exit_error (COROSYNC_DONE_ICMAP);
 	}
 	}
 
 
 	/*
 	/*

+ 1 - 10
exec/util.h

@@ -46,20 +46,11 @@ extern cs_time_t clust_time_now(void);
 
 
 enum e_corosync_done {
 enum e_corosync_done {
 	COROSYNC_DONE_EXIT = 0,
 	COROSYNC_DONE_EXIT = 0,
-	COROSYNC_DONE_UID_DETERMINE = 1,
-	COROSYNC_DONE_GID_DETERMINE = 2,
-	COROSYNC_DONE_MEMPOOL_INIT = 3,
 	COROSYNC_DONE_FORK = 4,
 	COROSYNC_DONE_FORK = 4,
-	COROSYNC_DONE_LIBCOROSYNC_SOCKET = 5,
-	COROSYNC_DONE_LIBCOROSYNC_BIND = 6,
-	COROSYNC_DONE_READKEY = 7,
 	COROSYNC_DONE_MAINCONFIGREAD = 8,
 	COROSYNC_DONE_MAINCONFIGREAD = 8,
 	COROSYNC_DONE_LOGSETUP = 9,
 	COROSYNC_DONE_LOGSETUP = 9,
-	COROSYNC_DONE_AMFCONFIGREAD = 10,
-	COROSYNC_DONE_DYNAMICLOAD = 11,
-	COROSYNC_DONE_OBJDB = 12,
+	COROSYNC_DONE_ICMAP = 12,
 	COROSYNC_DONE_INIT_SERVICES = 13,
 	COROSYNC_DONE_INIT_SERVICES = 13,
-	COROSYNC_DONE_OUT_OF_MEMORY = 14,
 	COROSYNC_DONE_FATAL_ERR = 15,
 	COROSYNC_DONE_FATAL_ERR = 15,
 	COROSYNC_DONE_DIR_NOT_PRESENT = 16,
 	COROSYNC_DONE_DIR_NOT_PRESENT = 16,
 	COROSYNC_DONE_AQUIRE_LOCK = 17,
 	COROSYNC_DONE_AQUIRE_LOCK = 17,