Commit 06f6c8d4 authored by Sreya Mittal's avatar Sreya Mittal Committed by Greg Kroah-Hartman
Browse files

staging: speakup: Clean up if tests 



Put logical continuations on the next line;
remove useless parentheses;
and line up the tests.

Signed-off-by: default avatarSreya Mittal <sreyamittal5@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 58b0de1c

drivers/staging/speakup/i18n.c

+6 −6
Original line number Diff line number Diff line
@@ -411,8 +411,8 @@ static char *next_specifier(char *input) 
		next_percent = strchr(next_percent, '%');

		if (next_percent) {

			/* skip over doubled percent signs */

			while ((next_percent[0] == '%')

			       && (next_percent[1] == '%'))

			while (next_percent[0] == '%' &&

			       next_percent[1] == '%')

				next_percent += 2;

			if (*next_percent == '%')

				found = 1;
@@ -549,9 +549,9 @@ ssize_t spk_msg_set(enum msg_index_t index, char *text, size_t length) 
		if (newstr) {

			memcpy(newstr, text, length);

			newstr[length] = '\0';

			if ((index >= MSG_FORMATTED_START

			&& index <= MSG_FORMATTED_END)

				&& !fmt_validate(speakup_default_msgs[index],

			if (index >= MSG_FORMATTED_START &&

			    index <= MSG_FORMATTED_END &&

			    !fmt_validate(speakup_default_msgs[index],

			                  newstr)) {

				kfree(newstr);

				return -EINVAL;