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>

diff --git a/exec/main.c b/exec/main.c
index 82fb8087bf10d9b1a390a0dfdc6c66bd3d2e43e8..7dc7724b251db7327c44c9ad6c5341839408d1f6 100644 (file)
--- a/exec/main.c
+++ b/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);
        if (lf == -1) {
                log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't create lock file.");
-               return (COROSYNC_DONE_AQUIRE_LOCK);
+               return (COROSYNC_DONE_ACQUIRE_LOCK);
        }
 
 retry_fcntl:
@@ -1089,7 +1089,7 @@ retry_fcntl:
                default:
                        log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't acquire lock. Error was %s",
                            strerror(errno));
-                       err = COROSYNC_DONE_AQUIRE_LOCK;
+                       err = COROSYNC_DONE_ACQUIRE_LOCK;
                        goto error_close;
                        break;
                }
@@ -1098,7 +1098,7 @@ retry_fcntl:
        if (ftruncate (lf, 0) == -1) {
                log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't truncate lock file. Error was %s",
                    strerror (errno));
-               err = COROSYNC_DONE_AQUIRE_LOCK;
+               err = COROSYNC_DONE_ACQUIRE_LOCK;
                goto error_close_unlink;
        }
 
@@ -1112,7 +1112,7 @@ retry_write:
                } else {
                        log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't write pid to lock file. "
                                "Error was %s", strerror (errno));
-                       err = COROSYNC_DONE_AQUIRE_LOCK;
+                       err = COROSYNC_DONE_ACQUIRE_LOCK;
                        goto error_close_unlink;
                }
        }
@@ -1120,14 +1120,14 @@ retry_write:
        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. "
                        "Error was %s", strerror (errno));
-               err = COROSYNC_DONE_AQUIRE_LOCK;
+               err = COROSYNC_DONE_ACQUIRE_LOCK;
                goto error_close_unlink;
        }
        fd_flag |= FD_CLOEXEC;
        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. "
                        "Error was %s", strerror (errno));
-               err = COROSYNC_DONE_AQUIRE_LOCK;
+               err = COROSYNC_DONE_ACQUIRE_LOCK;
                goto error_close_unlink;
        }
 

diff --git a/exec/util.h b/exec/util.h
index 9efd35e50f7b5e348efcba110ad6896d17ea494e..df5eeb408cf86c373b5000eef8b5ed1b880b24c4 100644 (file)
--- a/exec/util.h
+++ b/exec/util.h
@@ -54,7 +54,7 @@ enum e_corosync_done {
        COROSYNC_DONE_INIT_SERVICES = 13,
        COROSYNC_DONE_FATAL_ERR = 15,
        COROSYNC_DONE_DIR_NOT_PRESENT = 16,
-       COROSYNC_DONE_AQUIRE_LOCK = 17,
+       COROSYNC_DONE_ACQUIRE_LOCK = 17,
        COROSYNC_DONE_ALREADY_RUNNING = 18,
        COROSYNC_DONE_STD_TO_NULL_REDIR = 19,
        COROSYNC_DONE_SERVICE_ENGINE_INIT = 20,

diff --git a/man/corosync-qdevice.8 b/man/corosync-qdevice.8
index fbeb328b78fba1e86d027f247574f0d1ff273dd2..338806eae8b8db8ab5a4d23bdfee38973afee2d2 100644 (file)
--- a/man/corosync-qdevice.8
+++ b/man/corosync-qdevice.8
@@ -156,7 +156,7 @@ can be one of
 .I 0|4|6
 and forces the software to use the given IP version.
 .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
 Logging configuration is within the

diff --git a/man/corosync-qnetd.8 b/man/corosync-qnetd.8
index 856e6e184cc98435a6172bd9e0016e7a41fa4991..fa582243ebb7eb3a1232359cafa27f79b4c71080 100644 (file)
--- a/man/corosync-qnetd.8
+++ b/man/corosync-qnetd.8
@@ -168,7 +168,7 @@ in the proper place.
 .SH ADVANCED SETTINGS
 Set by the
 .B -S
-option. The default value is shown in parantheses.
+option. The default value is shown in parentheses.
 .TP
 .B listen_backlog
 Parameter passed to the listen syscall on the network socket. (10)

diff --git a/man/quorum_initialize.3.in b/man/quorum_initialize.3.in
index e55c284a34753640eaa7548fb1631242ab527b83..227c2c0879831c15512a866d289fa661a522d266 100644 (file)
--- a/man/quorum_initialize.3.in
+++ b/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
 for communication with the quorum service.
 .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 function is described by the following type definitions:
 

diff --git a/man/quorum_trackstart.3.in b/man/quorum_trackstart.3.in
index 044a048045b9880e6b74af4e7b920d16aa5f6397..9e3ff3fcc8b743316b1d0d0ae26a4448497eae7f 100644 (file)
--- a/man/quorum_trackstart.3.in
+++ b/man/quorum_trackstart.3.in
@@ -43,7 +43,7 @@ The
 .B quorum_trackstart
 function is used to enable callbacks notification from the quorum API.
 .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.
 .PP
 The notification is dispatched via

diff --git a/man/votequorum_trackstart.3.in b/man/votequorum_trackstart.3.in
index b440713cc498dec3d7672167b6b2f11b1e56bef5..af3310b060e044a0df8ac233aabe841547413f7b 100644 (file)
--- a/man/votequorum_trackstart.3.in
+++ b/man/votequorum_trackstart.3.in
@@ -43,7 +43,7 @@ The
 .B votequorum_trackstart
 function is used to enable callbacks notification from the votequorum API.
 .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.
 .PP
 The notification is dispatched via

diff --git a/qdevices/corosync-qdevice.c b/qdevices/corosync-qdevice.c
index fd932f10b0760fa09831594b359f20928b382b91..9916c69b90f44a91a4ad63197e9f902c60801cd0 100644 (file)
--- a/qdevices/corosync-qdevice.c
+++ b/qdevices/corosync-qdevice.c
@@ -185,7 +185,7 @@ main(int argc, char * const argv[])
                if (another_instance_running) {
                        qdevice_log(LOG_ERR, "Another instance is running");
                } else {
-                       qdevice_log_err(LOG_ERR, "Can't aquire lock");
+                       qdevice_log_err(LOG_ERR, "Can't acquire lock");
                }
 
                exit(1);

diff --git a/qdevices/qdevice-instance.c b/qdevices/qdevice-instance.c
index 862e0029e5f214139d1ebbbd2ef13ab503d08986..75bd5372a42ce3b97e19bd384d9b6ed3caf1c64a 100644 (file)
--- a/qdevices/qdevice-instance.c
+++ b/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",
            &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);
        }

diff --git a/qdevices/qdevice-net-msg-received.c b/qdevices/qdevice-net-msg-received.c
index b5c2f2193f331c9090448e6d922a9b9a709a73a7..f9148305554878db48a1fde78704f0cfe247fa47 100644 (file)
--- a/qdevices/qdevice-net-msg-received.c
+++ b/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");
                break;
        default:
-               qdevice_log(LOG_ERR, "Unknown error occured when decoding message");
+               qdevice_log(LOG_ERR, "Unknown error occurred when decoding message");
                break;
        }
 }

diff --git a/qdevices/qnetd-algo-ffsplit.c b/qdevices/qnetd-algo-ffsplit.c
index 01e5f0c73bbccb20c3b15dc8a7d52ed956c8df0e..356bdbf8c90a169571de70ce16666e2ff7c920e2 100644 (file)
--- a/qdevices/qnetd-algo-ffsplit.c
+++ b/qdevices/qnetd-algo-ffsplit.c
@@ -102,25 +102,25 @@ qnetd_algo_ffsplit_client_init(struct qnetd_client *client)
 }
 
 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)
 {
-       uint32_t prefered_node_id;
+       uint32_t preferred_node_id;
        struct node_list_entry *node_entry;
        int case_processed;
 
-       prefered_node_id = 0;
+       preferred_node_id = 0;
        case_processed = 0;
 
        switch (client->tie_breaker.mode) {
        case TLV_TIE_BREAKER_MODE_LOWEST:
                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) {
-                       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;
@@ -128,28 +128,28 @@ qnetd_algo_ffsplit_is_prefered_partition(const struct qnetd_client *client,
        case TLV_TIE_BREAKER_MODE_HIGHEST:
                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) {
-                       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;
                break;
        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;
                break;
        }
 
        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");
                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
@@ -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.
                 */
 
-               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)) {
                        res = 1; goto exit_res;
                } else {

diff --git a/qdevices/qnetd-log.c b/qdevices/qnetd-log.c
index 1d046455105e5bb51a5e84a6ccdfc022f65b370e..6f225aea9cd135769319f41a6a714be6eaf0d4f8 100644 (file)
--- a/qdevices/qnetd-log.c
+++ b/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");
                break;
        default:
-               qnetd_log(LOG_ERR, "Unknown error occured when decoding message");
+               qnetd_log(LOG_ERR, "Unknown error occurred when decoding message");
                break;
        }
 }