devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Make kbd_input() show a cancel splash to indicate user abort better and for better consistency all over the place. Change checking for its return value (style-wise) at some places too.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22269 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-08-12 14:38:25 +00:00
parent 345920fe7e
commit 18e40e0f4c
11 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/plugins/keybox.c
View file

@ -190,12 +190,12 @@ static void add_entry(int selected_item)
rb->splash(HZ, "Enter title");
pw_list.entries[i].title[0] = '\0';
if (rb->kbd_input(pw_list.entries[i].title, FIELD_LEN))
if (rb->kbd_input(pw_list.entries[i].title, FIELD_LEN) < 0)
return;
rb->splash(HZ, "Enter name");
pw_list.entries[i].name[0] = '\0';
if (rb->kbd_input(pw_list.entries[i].name, FIELD_LEN))
if (rb->kbd_input(pw_list.entries[i].name, FIELD_LEN) < 0)
{
pw_list.entries[i].title[0] = '\0';
return;
@ -203,7 +203,7 @@ static void add_entry(int selected_item)
rb->splash(HZ, "Enter password");
pw_list.entries[i].password[0] = '\0';
if (rb->kbd_input(pw_list.entries[i].password, FIELD_LEN))
if (rb->kbd_input(pw_list.entries[i].password, FIELD_LEN) < 0)
{
pw_list.entries[i].title[0] = '\0';
pw_list.entries[i].name[0] = '\0';
@ -508,11 +508,11 @@ static int enter_pw(char *pw_buf, size_t buflen, bool new_pw)
if (new_pw)
{
rb->splash(HZ, "Enter new master password");
if (rb->kbd_input(buf[0], sizeof(buf[0])))
if (rb->kbd_input(buf[0], sizeof(buf[0])) < 0)
return -1;
rb->splash(HZ, "Confirm master password");
if (rb->kbd_input(buf[1], sizeof(buf[1])))
if (rb->kbd_input(buf[1], sizeof(buf[1])) < 0)
return -1;
if (rb->strcmp(buf[0], buf[1]))
@ -529,7 +529,7 @@ static int enter_pw(char *pw_buf, size_t buflen, bool new_pw)
}
rb->splash(HZ, "Enter master password");
if (rb->kbd_input(pw_buf, buflen))
if (rb->kbd_input(pw_buf, buflen) < 0)
return -1;
hash_pw(&pwhash);
return 0;