Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220386
b: refs/heads/master
c: f976520
h: refs/heads/master
v: v3
  • Loading branch information
William Hubbs authored and Greg Kroah-Hartman committed Oct 19, 2010
1 parent 55edeea commit d91eacb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2b6d83d6623dfc4ea036b62b405ce206edfcaa52
refs/heads/master: f976520bee1ca20c5ff73ffc277b71545b698b7a
9 changes: 6 additions & 3 deletions trunk/drivers/staging/speakup/i18n.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ static char *speakup_default_msgs[MSG_LAST_INDEX] = {
[MSG_GOTO] = "go to?",
[MSG_LEAVING_HELP] = "leaving help",
[MSG_IS_UNASSIGNED] = "is unassigned",
[MSG_HELP_INFO] = "press space to leav help, cursor up or down to scroll, or a letter to go to commands in list",
[MSG_HELP_INFO] =
"press space to exit, up or down to scroll, or a letter to go to a command",
[MSG_EDGE_TOP] = "top,",
[MSG_EDGE_BOTTOM] = "bottom,",
[MSG_EDGE_LEFT] = "left,",
Expand Down Expand Up @@ -550,8 +551,10 @@ ssize_t 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)) {
return -EINVAL;
}
spk_lock(flags);
Expand Down

0 comments on commit d91eacb

Please sign in to comment.