diff options
author | Tracey Dent <tdent48227@gmail.com> | 2010-10-11 00:00:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-11 18:02:29 -0400 |
commit | d7cf430c5420883e86adcc94a19f22369e191929 (patch) | |
tree | d7ec09a615ea8b4d38bc9d0655b78b58322b4fe6 /drivers/staging/speakup | |
parent | 801089e68e48ab4ffb6d137ad299c836957ec5f5 (diff) |
Staging: speakup: i18n.c: cleaned up file
Cleaned up file with the use of checkpatch.pl.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/speakup')
-rw-r--r-- | drivers/staging/speakup/i18n.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/speakup/i18n.c b/drivers/staging/speakup/i18n.c index 4d12d0ae3bc..fc02b66a997 100644 --- a/drivers/staging/speakup/i18n.c +++ b/drivers/staging/speakup/i18n.c | |||
@@ -9,7 +9,7 @@ | |||
9 | #include "spk_priv.h" | 9 | #include "spk_priv.h" |
10 | 10 | ||
11 | static char *speakup_msgs[MSG_LAST_INDEX]; | 11 | static char *speakup_msgs[MSG_LAST_INDEX]; |
12 | static char *speakup_default_msgs [MSG_LAST_INDEX] = { | 12 | static char *speakup_default_msgs[MSG_LAST_INDEX] = { |
13 | [MSG_BLANK] = "blank", | 13 | [MSG_BLANK] = "blank", |
14 | [MSG_IAM_ALIVE] = "I'm aLive!", | 14 | [MSG_IAM_ALIVE] = "I'm aLive!", |
15 | [MSG_YOU_KILLED_SPEAKUP] = "You killed speakup!", | 15 | [MSG_YOU_KILLED_SPEAKUP] = "You killed speakup!", |
@@ -349,7 +349,7 @@ static char *speakup_default_msgs [MSG_LAST_INDEX] = { | |||
349 | [MSG_FUNCNAME_WORD_SAY_PREVIOUS] = "word, say previous", | 349 | [MSG_FUNCNAME_WORD_SAY_PREVIOUS] = "word, say previous", |
350 | }; | 350 | }; |
351 | 351 | ||
352 | static struct msg_group_t all_groups [] = { | 352 | static struct msg_group_t all_groups[] = { |
353 | { | 353 | { |
354 | .name = "ctl_keys", | 354 | .name = "ctl_keys", |
355 | .start = MSG_CTL_START, | 355 | .start = MSG_CTL_START, |
@@ -446,7 +446,7 @@ static char *skip_width(char *input) | |||
446 | } | 446 | } |
447 | 447 | ||
448 | /* | 448 | /* |
449 | * Skip past the end of the conversion part. | 449 | * Skip past the end of the conversion part. |
450 | * Note that this code only accepts a handful of conversion specifiers: | 450 | * Note that this code only accepts a handful of conversion specifiers: |
451 | * c d s x and ld. Not accidental; these are exactly the ones used in | 451 | * c d s x and ld. Not accidental; these are exactly the ones used in |
452 | * the default group of formatted messages. | 452 | * the default group of formatted messages. |
@@ -498,7 +498,7 @@ static int compare_specifiers(char **input1, char **input2) | |||
498 | /* | 498 | /* |
499 | * Function: fmt_validate | 499 | * Function: fmt_validate |
500 | * Check that two format strings contain the same number of format specifiers, | 500 | * Check that two format strings contain the same number of format specifiers, |
501 | * and that the order of specifiers is the same in both strings. | 501 | * and that the order of specifiers is the same in both strings. |
502 | * Return 1 if the condition holds, 0 if it doesn't. | 502 | * Return 1 if the condition holds, 0 if it doesn't. |
503 | */ | 503 | */ |
504 | static int fmt_validate(char *template, char *user) | 504 | static int fmt_validate(char *template, char *user) |
@@ -549,7 +549,7 @@ ssize_t msg_set(enum msg_index_t index, char *text, size_t length) | |||
549 | memcpy(newstr, text, length); | 549 | memcpy(newstr, text, length); |
550 | newstr[length] = '\0'; | 550 | newstr[length] = '\0'; |
551 | if ((index >= MSG_FORMATTED_START && index <= MSG_FORMATTED_END) | 551 | if ((index >= MSG_FORMATTED_START && index <= MSG_FORMATTED_END) |
552 | && ! fmt_validate(speakup_default_msgs[index], newstr)) { | 552 | && !fmt_validate(speakup_default_msgs[index], newstr)) { |
553 | return -EINVAL; | 553 | return -EINVAL; |
554 | } | 554 | } |
555 | spk_lock(flags); | 555 | spk_lock(flags); |