From 298316d19297eea82869b63235b535e5904fc0dd Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sun, 20 Jun 2010 21:53:47 +0000 Subject: text_viewer: cleanup & bugfix cleanup: - don't use enum in struct / return values - don't use a getter for preferences but a global pointer - explicitely make enums start at 0 - use static tables for header/footer settings - remove unneeded memset before strlcpy - use static buffer allocation, not dynamic - check header/footer preferences before using the callbacks - don't include font filename in archos player preferences (break file format) bugfix: - statically allocate old preferences in tv_set_preferences() Sometimes I can read a file on Clipv2, but it still aborts quite often refs: FS#11399 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26998 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/text_viewer/tv_text_reader.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'apps/plugins/text_viewer/tv_text_reader.c') diff --git a/apps/plugins/text_viewer/tv_text_reader.c b/apps/plugins/text_viewer/tv_text_reader.c index 28cfa565c3..53c8f6738f 100644 --- a/apps/plugins/text_viewer/tv_text_reader.c +++ b/apps/plugins/text_viewer/tv_text_reader.c @@ -29,19 +29,11 @@ static int get_block; static bool get_double_blocks; -bool tv_init_text_reader(unsigned char *buf, size_t bufsize, size_t *used_size) +bool tv_init_text_reader(void) { - size_t size; + tv_init_text_processor(); - if (!tv_init_text_processor(buf, bufsize, used_size)) - return false; - - size = *used_size; - if (!tv_init_pager(buf + size, bufsize - size, used_size)) - return false; - - *used_size += size; - return true; + return tv_init_pager(); } void tv_finalize_text_reader(void) -- cgit v1.2.3