From 2500398c3ee14291ad7da34b5ab7aa4198a6f32b Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Tue, 12 Oct 2010 11:39:28 -0500
Subject: [PATCH] --- yaml --- r: 220303 b: refs/heads/master c:
 d09d3e2cddec6d80070dab29e0c80e53e3d8d3dc h: refs/heads/master i:   220301:
 09a20df2bd82a79df562529a2ec22a0d687f59b3   220299:
 160b4235674709967f47051ba1f9df336c532aea   220295:
 ec653418a88fe2b7c5ff08e14996106849968735   220287:
 57703bba4491da7e369f5a6ea549cd793717d566 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/staging/speakup/i18n.c | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 3c695bae68b9..52f44154cfaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29644b22dafe87ffaf61b49496388ec5fde9bdc7
+refs/heads/master: d09d3e2cddec6d80070dab29e0c80e53e3d8d3dc
diff --git a/trunk/drivers/staging/speakup/i18n.c b/trunk/drivers/staging/speakup/i18n.c
index fc02b66a9976..7a0c833c9ac4 100644
--- a/trunk/drivers/staging/speakup/i18n.c
+++ b/trunk/drivers/staging/speakup/i18n.c
@@ -411,9 +411,10 @@ static char *next_specifier(char *input)
 	while ((next_percent != NULL) && !found) {
 		next_percent = strchr(next_percent, '%');
 		if (next_percent != NULL) {
+			/* skip over doubled percent signs */
 			while ((next_percent[0] == '%')
 			       && (next_percent[1] == '%'))
-				next_percent += 2;	/* Advance over doubled percent signs. */
+				next_percent += 2;
 			if (*next_percent == '%')
 				found = 1;
 			else if (*next_percent == '\0')
@@ -487,7 +488,7 @@ static int compare_specifiers(char **input1, char **input2)
 	size_t length1 = end1 - *input1;
 	size_t length2 = end2 - *input2;
 
-	if((length1 == length2) && !memcmp(*input1, *input2, length1))
+	if ((length1 == length2) && !memcmp(*input1, *input2, length1))
 		same = 1;
 
 	*input1 = end1;
@@ -512,13 +513,14 @@ static int fmt_validate(char *template, char *user)
 		template_ptr = next_specifier(template_ptr);
 		user_ptr = next_specifier(user_ptr);
 		if (template_ptr && user_ptr) {
-/* Both have at least one more specifier. */
+			/* Both have at least one more specifier. */
 			valid = compare_specifiers(&template_ptr, &user_ptr);
 		} else {
-/* No more format specifiers in one or both of the strings. */
+			/* No more format specifiers in one or both strings. */
 			still_comparing = 0;
+			/* See if one has more specifiers than the other. */
 			if (template_ptr || user_ptr)
-				valid = 0;	/* One has more specifiers than the other. */
+				valid = 0;
 		}
 	}
 	return valid;
@@ -591,7 +593,7 @@ void reset_msg_group(struct msg_group_t *group)
 
 	spk_lock(flags);
 
-	for(i = group->start; i <= group->end; i++) {
+	for (i = group->start; i <= group->end; i++) {
 		if (speakup_msgs[i] != speakup_default_msgs[i])
 			kfree(speakup_msgs[i]);
 		speakup_msgs[i] = speakup_default_msgs[i];
@@ -602,7 +604,8 @@ void reset_msg_group(struct msg_group_t *group)
 /* Called at initialization time, to establish default messages. */
 void initialize_msgs(void)
 {
-	memcpy(speakup_msgs, speakup_default_msgs, sizeof(speakup_default_msgs));
+	memcpy(speakup_msgs, speakup_default_msgs,
+		sizeof(speakup_default_msgs));
 }
 
 /* Free user-supplied strings when module is unloaded: */
@@ -612,7 +615,7 @@ void free_user_msgs(void)
 	unsigned long flags;
 
 	spk_lock(flags);
-	for(index = MSG_FIRST_INDEX; index < MSG_LAST_INDEX; index++) {
+	for (index = MSG_FIRST_INDEX; index < MSG_LAST_INDEX; index++) {
 		if (speakup_msgs[index] != speakup_default_msgs[index]) {
 			kfree(speakup_msgs[index]);
 			speakup_msgs[index] = speakup_default_msgs[index];