Quellcode durchsuchen

Fix various typos

occured -> occurred
parantheses -> parentheses
configuraton -> configuration
aquire -> acquire
retrive -> retrieve
prefered -> preferred

Signed-off-by: Ferenc Wágner <wferi@niif.hu>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Ferenc Wágner vor 9 Jahren
Ursprung
Commit
cf10a754e9

+ 6 - 6
exec/main.c

@@ -1067,7 +1067,7 @@ static enum e_corosync_done corosync_flock (const char *lockfile, pid_t pid)
 	lf = open (lockfile, O_WRONLY | O_CREAT, 0640);
 	lf = open (lockfile, O_WRONLY | O_CREAT, 0640);
 	if (lf == -1) {
 	if (lf == -1) {
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't create lock file.");
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't create lock file.");
-		return (COROSYNC_DONE_AQUIRE_LOCK);
+		return (COROSYNC_DONE_ACQUIRE_LOCK);
 	}
 	}
 
 
 retry_fcntl:
 retry_fcntl:
@@ -1089,7 +1089,7 @@ retry_fcntl:
 		default:
 		default:
 			log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't acquire lock. Error was %s",
 			log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't acquire lock. Error was %s",
 			    strerror(errno));
 			    strerror(errno));
-			err = COROSYNC_DONE_AQUIRE_LOCK;
+			err = COROSYNC_DONE_ACQUIRE_LOCK;
 			goto error_close;
 			goto error_close;
 			break;
 			break;
 		}
 		}
@@ -1098,7 +1098,7 @@ retry_fcntl:
 	if (ftruncate (lf, 0) == -1) {
 	if (ftruncate (lf, 0) == -1) {
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't truncate lock file. Error was %s",
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't truncate lock file. Error was %s",
 		    strerror (errno));
 		    strerror (errno));
-		err = COROSYNC_DONE_AQUIRE_LOCK;
+		err = COROSYNC_DONE_ACQUIRE_LOCK;
 		goto error_close_unlink;
 		goto error_close_unlink;
 	}
 	}
 
 
@@ -1112,7 +1112,7 @@ retry_write:
 		} else {
 		} else {
 			log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't write pid to lock file. "
 			log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't write pid to lock file. "
 				"Error was %s", strerror (errno));
 				"Error was %s", strerror (errno));
-			err = COROSYNC_DONE_AQUIRE_LOCK;
+			err = COROSYNC_DONE_ACQUIRE_LOCK;
 			goto error_close_unlink;
 			goto error_close_unlink;
 		}
 		}
 	}
 	}
@@ -1120,14 +1120,14 @@ retry_write:
 	if ((fd_flag = fcntl (lf, F_GETFD, 0)) == -1) {
 	if ((fd_flag = fcntl (lf, F_GETFD, 0)) == -1) {
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't get close-on-exec flag from lock file. "
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't get close-on-exec flag from lock file. "
 			"Error was %s", strerror (errno));
 			"Error was %s", strerror (errno));
-		err = COROSYNC_DONE_AQUIRE_LOCK;
+		err = COROSYNC_DONE_ACQUIRE_LOCK;
 		goto error_close_unlink;
 		goto error_close_unlink;
 	}
 	}
 	fd_flag |= FD_CLOEXEC;
 	fd_flag |= FD_CLOEXEC;
 	if (fcntl (lf, F_SETFD, fd_flag) == -1) {
 	if (fcntl (lf, F_SETFD, fd_flag) == -1) {
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't set close-on-exec flag to lock file. "
 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't set close-on-exec flag to lock file. "
 			"Error was %s", strerror (errno));
 			"Error was %s", strerror (errno));
-		err = COROSYNC_DONE_AQUIRE_LOCK;
+		err = COROSYNC_DONE_ACQUIRE_LOCK;
 		goto error_close_unlink;
 		goto error_close_unlink;
 	}
 	}
 
 

+ 1 - 1
exec/util.h

@@ -54,7 +54,7 @@ enum e_corosync_done {
 	COROSYNC_DONE_INIT_SERVICES = 13,
 	COROSYNC_DONE_INIT_SERVICES = 13,
 	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_ACQUIRE_LOCK = 17,
 	COROSYNC_DONE_ALREADY_RUNNING = 18,
 	COROSYNC_DONE_ALREADY_RUNNING = 18,
 	COROSYNC_DONE_STD_TO_NULL_REDIR = 19,
 	COROSYNC_DONE_STD_TO_NULL_REDIR = 19,
 	COROSYNC_DONE_SERVICE_ENGINE_INIT = 20,
 	COROSYNC_DONE_SERVICE_ENGINE_INIT = 20,

+ 1 - 1
man/corosync-qdevice.8

@@ -156,7 +156,7 @@ can be one of
 .I 0|4|6
 .I 0|4|6
 and forces the software to use the given IP version.
 and forces the software to use the given IP version.
 .I 0
 .I 0
-(default value) means IPv6 is prefered and IPv4 should be used as a fallback.
+(default value) means IPv6 is preferred and IPv4 should be used as a fallback.
 
 
 .PP
 .PP
 Logging configuration is within the
 Logging configuration is within the

+ 1 - 1
man/corosync-qnetd.8

@@ -168,7 +168,7 @@ in the proper place.
 .SH ADVANCED SETTINGS
 .SH ADVANCED SETTINGS
 Set by the
 Set by the
 .B -S
 .B -S
-option. The default value is shown in parantheses.
+option. The default value is shown in parentheses.
 .TP
 .TP
 .B listen_backlog
 .B listen_backlog
 Parameter passed to the listen syscall on the network socket. (10)
 Parameter passed to the listen syscall on the network socket. (10)

+ 1 - 1
man/quorum_initialize.3.in

@@ -51,7 +51,7 @@ argument to uniquely identify the connection.  The
 argument is then used in other function calls to identify the connection to be used
 argument is then used in other function calls to identify the connection to be used
 for communication with the quorum service.
 for communication with the quorum service.
 .PP
 .PP
-Every time the voting configuraton changes (eg a node joins or leave the cluster) or the quorum status change,
+Every time the voting configuration changes (eg a node joins or leave the cluster) or the quorum status change,
 the callback is called.
 the callback is called.
 The callback function is described by the following type definitions:
 The callback function is described by the following type definitions:
 
 

+ 1 - 1
man/quorum_trackstart.3.in

@@ -43,7 +43,7 @@ The
 .B quorum_trackstart
 .B quorum_trackstart
 function is used to enable callbacks notification from the quorum API.
 function is used to enable callbacks notification from the quorum API.
 .PP
 .PP
-Every time the voting configuraton changes (eg a node joins or leave the cluster)
+Every time the voting configuration changes (eg a node joins or leave the cluster)
 or the quorum status change, the notification is queued.
 or the quorum status change, the notification is queued.
 .PP
 .PP
 The notification is dispatched via
 The notification is dispatched via

+ 1 - 1
man/votequorum_trackstart.3.in

@@ -43,7 +43,7 @@ The
 .B votequorum_trackstart
 .B votequorum_trackstart
 function is used to enable callbacks notification from the votequorum API.
 function is used to enable callbacks notification from the votequorum API.
 .PP
 .PP
-Every time the voting configuraton changes (eg a node joins or leave the cluster)
+Every time the voting configuration changes (eg a node joins or leave the cluster)
 or the quorum status change or the expected votes changes, the notification is queued.
 or the quorum status change or the expected votes changes, the notification is queued.
 .PP
 .PP
 The notification is dispatched via
 The notification is dispatched via

+ 1 - 1
qdevices/corosync-qdevice.c

@@ -185,7 +185,7 @@ main(int argc, char * const argv[])
 		if (another_instance_running) {
 		if (another_instance_running) {
 			qdevice_log(LOG_ERR, "Another instance is running");
 			qdevice_log(LOG_ERR, "Another instance is running");
 		} else {
 		} else {
-			qdevice_log_err(LOG_ERR, "Can't aquire lock");
+			qdevice_log_err(LOG_ERR, "Can't acquire lock");
 		}
 		}
 
 
 		exit(1);
 		exit(1);

+ 1 - 1
qdevices/qdevice-instance.c

@@ -81,7 +81,7 @@ qdevice_instance_configure_from_cmap(struct qdevice_instance *instance)
 
 
 	if (cmap_get_uint32(instance->cmap_handle, "runtime.votequorum.this_node_id",
 	if (cmap_get_uint32(instance->cmap_handle, "runtime.votequorum.this_node_id",
 	    &instance->node_id) != CS_OK) {
 	    &instance->node_id) != CS_OK) {
-		qdevice_log(LOG_ERR, "Unable to retrive this node nodeid.");
+		qdevice_log(LOG_ERR, "Unable to retrieve this node nodeid.");
 
 
 		return (-1);
 		return (-1);
 	}
 	}

+ 1 - 1
qdevices/qdevice-net-msg-received.c

@@ -100,7 +100,7 @@ qdevice_net_msg_received_log_msg_decode_error(int ret)
 		qdevice_log(LOG_ERR, "Received message with option with invalid value");
 		qdevice_log(LOG_ERR, "Received message with option with invalid value");
 		break;
 		break;
 	default:
 	default:
-		qdevice_log(LOG_ERR, "Unknown error occured when decoding message");
+		qdevice_log(LOG_ERR, "Unknown error occurred when decoding message");
 		break;
 		break;
 	}
 	}
 }
 }

+ 13 - 13
qdevices/qnetd-algo-ffsplit.c

@@ -102,25 +102,25 @@ qnetd_algo_ffsplit_client_init(struct qnetd_client *client)
 }
 }
 
 
 static int
 static int
-qnetd_algo_ffsplit_is_prefered_partition(const struct qnetd_client *client,
+qnetd_algo_ffsplit_is_preferred_partition(const struct qnetd_client *client,
     const struct node_list *config_node_list, const struct node_list *membership_node_list)
     const struct node_list *config_node_list, const struct node_list *membership_node_list)
 {
 {
-	uint32_t prefered_node_id;
+	uint32_t preferred_node_id;
 	struct node_list_entry *node_entry;
 	struct node_list_entry *node_entry;
 	int case_processed;
 	int case_processed;
 
 
-	prefered_node_id = 0;
+	preferred_node_id = 0;
 	case_processed = 0;
 	case_processed = 0;
 
 
 	switch (client->tie_breaker.mode) {
 	switch (client->tie_breaker.mode) {
 	case TLV_TIE_BREAKER_MODE_LOWEST:
 	case TLV_TIE_BREAKER_MODE_LOWEST:
 		node_entry = TAILQ_FIRST(config_node_list);
 		node_entry = TAILQ_FIRST(config_node_list);
 
 
-		prefered_node_id = node_entry->node_id;
+		preferred_node_id = node_entry->node_id;
 
 
 		TAILQ_FOREACH(node_entry, config_node_list, entries) {
 		TAILQ_FOREACH(node_entry, config_node_list, entries) {
-			if (node_entry->node_id < prefered_node_id) {
-				prefered_node_id = node_entry->node_id;
+			if (node_entry->node_id < preferred_node_id) {
+				preferred_node_id = node_entry->node_id;
 			}
 			}
 		}
 		}
 		case_processed = 1;
 		case_processed = 1;
@@ -128,28 +128,28 @@ qnetd_algo_ffsplit_is_prefered_partition(const struct qnetd_client *client,
 	case TLV_TIE_BREAKER_MODE_HIGHEST:
 	case TLV_TIE_BREAKER_MODE_HIGHEST:
 		node_entry = TAILQ_FIRST(config_node_list);
 		node_entry = TAILQ_FIRST(config_node_list);
 
 
-		prefered_node_id = node_entry->node_id;
+		preferred_node_id = node_entry->node_id;
 
 
 		TAILQ_FOREACH(node_entry, config_node_list, entries) {
 		TAILQ_FOREACH(node_entry, config_node_list, entries) {
-			if (node_entry->node_id > prefered_node_id) {
-				prefered_node_id = node_entry->node_id;
+			if (node_entry->node_id > preferred_node_id) {
+				preferred_node_id = node_entry->node_id;
 			}
 			}
 		}
 		}
 		case_processed = 1;
 		case_processed = 1;
 		break;
 		break;
 	case TLV_TIE_BREAKER_MODE_NODE_ID:
 	case TLV_TIE_BREAKER_MODE_NODE_ID:
-		prefered_node_id = client->tie_breaker.node_id;
+		preferred_node_id = client->tie_breaker.node_id;
 		case_processed = 1;
 		case_processed = 1;
 		break;
 		break;
 	}
 	}
 
 
 	if (!case_processed) {
 	if (!case_processed) {
-		qnetd_log(LOG_CRIT, "qnetd_algo_ffsplit_is_prefered_partition unprocessed "
+		qnetd_log(LOG_CRIT, "qnetd_algo_ffsplit_is_preferred_partition unprocessed "
 		    "tie_breaker.mode");
 		    "tie_breaker.mode");
 		exit(1);
 		exit(1);
 	}
 	}
 
 
-	return (node_list_find_node_id(membership_node_list, prefered_node_id) != NULL);
+	return (node_list_find_node_id(membership_node_list, preferred_node_id) != NULL);
 }
 }
 
 
 static int
 static int
@@ -366,7 +366,7 @@ qnetd_algo_ffsplit_partition_cmp(const struct qnetd_client *client1,
 		 * Number of active clients in both partitions equals. Use tie-breaker.
 		 * Number of active clients in both partitions equals. Use tie-breaker.
 		 */
 		 */
 
 
-		if (qnetd_algo_ffsplit_is_prefered_partition(client1, config_node_list1,
+		if (qnetd_algo_ffsplit_is_preferred_partition(client1, config_node_list1,
 		    membership_node_list1)) {
 		    membership_node_list1)) {
 			res = 1; goto exit_res;
 			res = 1; goto exit_res;
 		} else {
 		} else {

+ 1 - 1
qdevices/qnetd-log.c

@@ -177,7 +177,7 @@ qnetd_log_msg_decode_error(int ret)
 		qnetd_log(LOG_WARNING, "Received message with option with invalid value");
 		qnetd_log(LOG_WARNING, "Received message with option with invalid value");
 		break;
 		break;
 	default:
 	default:
-		qnetd_log(LOG_ERR, "Unknown error occured when decoding message");
+		qnetd_log(LOG_ERR, "Unknown error occurred when decoding message");
 		break;
 		break;
 	}
 	}
 }
 }