summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-09-24 13:53:41 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-09-24 13:53:41 +0000
commit2d8aef9ab7e747baa1a3e984ebb1855d9aabf6ff (patch)
treef0afbcdefac35457ab70cc23c5479c597fda9116
parent85305da20dec92d3f0d061f7fcfd0b40d76b9cd1 (diff)
downloadrockbox-2d8aef9ab7e747baa1a3e984ebb1855d9aabf6ff.tar.gz
rockbox-2d8aef9ab7e747baa1a3e984ebb1855d9aabf6ff.zip
lang_load() returns an int to signal success
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2396 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/language.c8
-rw-r--r--apps/language.h2
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/language.c b/apps/language.c
index 716ac69020..df8c32a05e 100644
--- a/apps/language.c
+++ b/apps/language.c
@@ -25,12 +25,13 @@
25 25
26static unsigned char language_buffer[MAX_LANGUAGE_SIZE]; 26static unsigned char language_buffer[MAX_LANGUAGE_SIZE];
27 27
28void lang_load(char *filename) 28int lang_load(char *filename)
29{ 29{
30 int filesize; 30 int filesize;
31 int fd = open(filename, O_RDONLY); 31 int fd = open(filename, O_RDONLY);
32 int retcode=0;
32 if(fd == -1) 33 if(fd == -1)
33 return; 34 return 1;
34 filesize = read(fd, language_buffer, MAX_LANGUAGE_SIZE); 35 filesize = read(fd, language_buffer, MAX_LANGUAGE_SIZE);
35 if(filesize != MAX_LANGUAGE_SIZE) { 36 if(filesize != MAX_LANGUAGE_SIZE) {
36 if((language_buffer[0] == LANGUAGE_COOKIE) && 37 if((language_buffer[0] == LANGUAGE_COOKIE) &&
@@ -53,12 +54,15 @@ void lang_load(char *filename)
53 } 54 }
54 else { 55 else {
55 DEBUGF("Illegal language file\n"); 56 DEBUGF("Illegal language file\n");
57 retcode = 2;
56 } 58 }
57 } 59 }
58 else { 60 else {
59 DEBUGF("Language %s too large: %d\n", filename, filesize); 61 DEBUGF("Language %s too large: %d\n", filename, filesize);
62 retcode = 3;
60 } 63 }
61 close(fd); 64 close(fd);
65 return retcode;
62} 66}
63 67
64/* ----------------------------------------------------------------- 68/* -----------------------------------------------------------------
diff --git a/apps/language.h b/apps/language.h
index 92b80ec018..a4c85615c6 100644
--- a/apps/language.h
+++ b/apps/language.h
@@ -25,7 +25,7 @@
25#define LANGUAGE_VERSION 0x01 25#define LANGUAGE_VERSION 0x01
26 26
27/* load a given language file */ 27/* load a given language file */
28void lang_load(char *filename); 28int lang_load(char *filename);
29 29
30/* ----------------------------------------------------------------- 30/* -----------------------------------------------------------------
31 * local variables: 31 * local variables: