Attachment 930519 Details for Bug 1108522 – config: Fix typos

[patch] config: Fix typos

tmp.XDzJRZ7EQm (text/plain), 6.87 KB, created by Jan Friesse on 2014-08-25 14:36:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2014-08-25 14:36:50 UTC

Size: 6.87 KB

patch

obsolete

>From 3b8365e80668eea55bdd3f7178693c82884331ae Mon Sep 17 00:00:00 2001
>From: Christine Caulfield <ccaulfie@redhat.com>
>Date: Thu, 24 Jul 2014 10:27:45 +0100
>Subject: [PATCH] config: Fix typos
>
>Fix several places where 'then' is used instead of 'than' in error
>messages and a comment.
>
>Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
>Reviewed-by: Jan Friesse <jfriesse@redhat.com>
>---
> exec/cmap.c        |    2 +-
> exec/coroparse.c   |    2 +-
> exec/totemconfig.c |   28 ++++++++++++++--------------
> 3 files changed, 16 insertions(+), 16 deletions(-)
>
>diff --git a/exec/cmap.c b/exec/cmap.c
>index d222740..6da4875 100644
>--- a/exec/cmap.c
>+++ b/exec/cmap.c
>@@ -411,7 +411,7 @@ static void cmap_sync_activate (void)
> 
> 	if (cmap_highest_config_version_received != cmap_my_config_version) {
> 		log_printf(LOGSYS_LEVEL_ERROR,
>-		    "Received config version (%"PRIu64") is different then my config version (%"PRIu64")! Exiting",
>+		    "Received config version (%"PRIu64") is different than my config version (%"PRIu64")! Exiting",
> 		    cmap_highest_config_version_received, cmap_my_config_version);
> 		api->shutdown_request();
> 		return ;
>diff --git a/exec/coroparse.c b/exec/coroparse.c
>index bf46539..422b586 100644
>--- a/exec/coroparse.c
>+++ b/exec/coroparse.c
>@@ -1169,7 +1169,7 @@ static int uidgid_config_parser_cb(const char *path,
> 		break;
> 	case PARSER_CB_SECTION_START:
> 		if (strcmp(path, "uidgid") != 0) {
>-			*error_string = "uidgid: Can't add subsection different then uidgid";
>+			*error_string = "uidgid: Can't add subsection different than uidgid";
> 			return (0);
> 		};
> 		break;
>diff --git a/exec/totemconfig.c b/exec/totemconfig.c
>index 1d2e4c1..58bb5ef 100644
>--- a/exec/totemconfig.c
>+++ b/exec/totemconfig.c
>@@ -228,83 +228,83 @@ static int totem_volatile_config_validate (
> 
> 	if (totem_config->max_network_delay < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The max_network_delay parameter (%d ms) may not be less then (%d ms).",
>+			"The max_network_delay parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->max_network_delay, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->token_timeout < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The token timeout parameter (%d ms) may not be less then (%d ms).",
>+			"The token timeout parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->token_timeout, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->token_retransmit_timeout < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The token retransmit timeout parameter (%d ms) may not be less then (%d ms).",
>+			"The token retransmit timeout parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->token_retransmit_timeout, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->token_hold_timeout < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The token hold timeout parameter (%d ms) may not be less then (%d ms).",
>+			"The token hold timeout parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->token_hold_timeout, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->join_timeout < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The join timeout parameter (%d ms) may not be less then (%d ms).",
>+			"The join timeout parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->join_timeout, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->consensus_timeout < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The consensus timeout parameter (%d ms) may not be less then (%d ms).",
>+			"The consensus timeout parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->consensus_timeout, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->merge_timeout < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The merge timeout parameter (%d ms) may not be less then (%d ms).",
>+			"The merge timeout parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->merge_timeout, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->downcheck_timeout < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The downcheck timeout parameter (%d ms) may not be less then (%d ms).",
>+			"The downcheck timeout parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->downcheck_timeout, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->rrp_problem_count_timeout < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The RRP problem count timeout parameter (%d ms) may not be less then (%d ms).",
>+			"The RRP problem count timeout parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->rrp_problem_count_timeout, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->rrp_problem_count_threshold < RRP_PROBLEM_COUNT_THRESHOLD_MIN) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The RRP problem count threshold (%d problem count) may not be less then (%d problem count).",
>+			"The RRP problem count threshold (%d problem count) may not be less than (%d problem count).",
> 			totem_config->rrp_problem_count_threshold, RRP_PROBLEM_COUNT_THRESHOLD_MIN);
> 		goto parse_error;
> 	}
> 	if (totem_config->rrp_problem_count_mcast_threshold < RRP_PROBLEM_COUNT_THRESHOLD_MIN) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The RRP multicast problem count threshold (%d problem count) may not be less then (%d problem count).",
>+			"The RRP multicast problem count threshold (%d problem count) may not be less than (%d problem count).",
> 			totem_config->rrp_problem_count_mcast_threshold, RRP_PROBLEM_COUNT_THRESHOLD_MIN);
> 		goto parse_error;
> 	}
> 
> 	if (totem_config->rrp_token_expired_timeout < MINIMUM_TIMEOUT) {
> 		snprintf (local_error_reason, sizeof(local_error_reason),
>-			"The RRP token expired timeout parameter (%d ms) may not be less then (%d ms).",
>+			"The RRP token expired timeout parameter (%d ms) may not be less than (%d ms).",
> 			totem_config->rrp_token_expired_timeout, MINIMUM_TIMEOUT);
> 		goto parse_error;
> 	}
>@@ -810,7 +810,7 @@ extern int totem_config_read (
> 			free(cluster_name);
> 
> 			snprintf (error_string_response, sizeof(error_string_response),
>-			    "parse error in config: interface ring number %u is bigger then allowed maximum %u\n",
>+			    "parse error in config: interface ring number %u is bigger than allowed maximum %u\n",
> 			    ringnumber, INTERFACE_MAX - 1);
> 
> 			*error_string = error_string_response;
>@@ -1272,7 +1272,7 @@ static void totem_change_notify(
> 		return;
> 
> 	/*
>-	 * Values other then UINT32 are not supported, or needed (yet)
>+	 * Values other than UINT32 are not supported, or needed (yet)
> 	 */
> 	switch (event) {
> 	case ICMAP_TRACK_DELETE:
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 1108522: 907995 | 907996 | 907997 | 907998 | 907999 | 908004 | 908111 | 930505 | 930506 | 930507 | 930509 | 930510 | 930511 | 930512 | 930513 | 930514 | 930515 | 930516 | 930517 | 930518 | 930519 | 930527 | 930528 | 930529 | 930530 | 930531 | 930535 | 930536 | 930537 | 930538 | 930539 | 930540 | 931024