summaryrefslogtreecommitdiffstats
path: root/apps/language.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-09-24 12:48:23 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-09-24 12:48:23 +0000
commit571e8a26e0360f30ad7dec3a59d96fcf784345ec (patch)
treec6edcfa6dfd6dc5418700bd88d223eeba3789dc5 /apps/language.c
parent869c952ea3f9e58334475a7870f7543b1adc47bf (diff)
downloadrockbox-571e8a26e0360f30ad7dec3a59d96fcf784345ec.tar.gz
rockbox-571e8a26e0360f30ad7dec3a59d96fcf784345ec.tar.bz2
rockbox-571e8a26e0360f30ad7dec3a59d96fcf784345ec.zip
code-policed my own code ;-)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2393 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/language.c')
-rw-r--r--apps/language.c57
1 files changed, 28 insertions, 29 deletions
diff --git a/apps/language.c b/apps/language.c
index a4b2b0dabc..614a4869d5 100644
--- a/apps/language.c
+++ b/apps/language.c
@@ -27,44 +27,43 @@ static unsigned char language_buffer[MAX_LANGUAGE_SIZE];
void lang_load(char *filename)
{
- int filesize;
- int fd = open(filename, O_RDONLY);
- if(fd == -1)
- return;
- filesize = read(fd, language_buffer, MAX_LANGUAGE_SIZE);
- if(filesize != MAX_LANGUAGE_SIZE) {
- if((language_buffer[0] == LANGUAGE_COOKIE) &&
- (language_buffer[1] == LANGUAGE_VERSION)) {
- unsigned char *ptr=&language_buffer[2];
- int id;
- filesize-=2;
+ int filesize;
+ int fd = open(filename, O_RDONLY);
+ if(fd == -1)
+ return;
+ filesize = read(fd, language_buffer, MAX_LANGUAGE_SIZE);
+ if(filesize != MAX_LANGUAGE_SIZE) {
+ if((language_buffer[0] == LANGUAGE_COOKIE) &&
+ (language_buffer[1] == LANGUAGE_VERSION)) {
+ unsigned char *ptr=&language_buffer[2];
+ int id;
+ filesize-=2;
- while(filesize>3) {
- id = (ptr[0]<<8) | ptr[1];
- ptr+=2;
- language_strings[id] = ptr;
- while(*ptr) {
- filesize--;
- ptr++;
+ while(filesize>3) {
+ id = (ptr[0]<<8) | ptr[1];
+ ptr+=2;
+ language_strings[id] = ptr;
+ while(*ptr) {
+ filesize--;
+ ptr++;
+ }
+ filesize-=3;
+ ptr++; /* pass the terminating newline */
+ }
+ }
+ else {
+ DEBUGF("Illegal language file\n");
}
- filesize-=3;
- ptr++; /* pass the terminating newline */
- }
-
}
else {
- DEBUGF("Illegal language file\n");
+ DEBUGF("Language %s too large: %d\n", filename, filesize);
}
- }
- else {
- DEBUGF("Language %s too large: %d\n", filename, filesize);
- }
- close(fd);
+ close(fd);
}
/* -----------------------------------------------------------------
* local variables:
* eval: (load-file "../firmware/rockbox-mode.el")
- * vim: et sw=4 ts=8 sts=4 tw=78
* end:
+ * vim: et sw=4 ts=8 sts=4 tw=78
*/