]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: speakup: Clean up if tests
authorSreya Mittal <sreyamittal5@gmail.com>
Fri, 24 Feb 2017 16:00:14 +0000 (21:30 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Mar 2017 08:17:02 +0000 (09:17 +0100)
Put logical continuations on the next line;
remove useless parentheses;
and line up the tests.

Signed-off-by: Sreya Mittal <sreyamittal5@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/speakup/i18n.c

index 56ce3862a3ea11e5497f73e1739ea594999edba0..1a3e34880ac1a18777010d9c8c4595a1c4312756 100644 (file)
@@ -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,10 +549,10 @@ 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],
-                               newstr)) {
+                       if (index >= MSG_FORMATTED_START &&
+                           index <= MSG_FORMATTED_END &&
+                           !fmt_validate(speakup_default_msgs[index],
+                                         newstr)) {
                                kfree(newstr);
                                return -EINVAL;
                        }