summaryrefslogtreecommitdiff
path: root/firmware/font_cache.c
diff options
context:
space:
mode:
authorFred Bauer <fred.w.bauer@gmail.com>2011-10-18 17:02:24 +0000
committerFred Bauer <fred.w.bauer@gmail.com>2011-10-18 17:02:24 +0000
commit0ab2c1b4c4455454d0639c8604417f026fbfd895 (patch)
treef0a57b6ec9e765c516031085886b9556f0de46f1 /firmware/font_cache.c
parent03a8325a2d907719c27011472b0a1ee73bec7c8e (diff)
downloadrockbox-0ab2c1b4c4455454d0639c8604417f026fbfd895.zip
rockbox-0ab2c1b4c4455454d0639c8604417f026fbfd895.tar.gz
rockbox-0ab2c1b4c4455454d0639c8604417f026fbfd895.tar.bz2
rockbox-0ab2c1b4c4455454d0639c8604417f026fbfd895.tar.xz
In search(): eliminate an unnecessary test.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30784 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/font_cache.c')
-rw-r--r--firmware/font_cache.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/firmware/font_cache.c b/firmware/font_cache.c
index 72a96bf..24a5faf 100644
--- a/firmware/font_cache.c
+++ b/firmware/font_cache.c
@@ -52,6 +52,8 @@ void font_cache_create(
fcache->_size = 1;
fcache->_capacity = cache_size;
+ fcache->_prev_result = 0;
+ fcache->_prev_char_code = 0;
/* set up index */
fcache->_index = buf;
@@ -84,11 +86,10 @@ int search( struct font_cache* fcache,
right = fcache->_size - 1;
/* go for a lucky guess */
- if ( fcache->_prev_char_code != -1 )
- mid = char_code +
- fcache->_prev_result - fcache->_prev_char_code;
+ mid = char_code +
+ fcache->_prev_result - fcache->_prev_char_code;
- /* check bounds or unset */
+ /* check bounds */
if ( mid < 0 || mid > right )
mid = ( left + right ) / 2;