diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-03 09:41:44 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-12-03 09:41:44 +0000 |
commit | 059cb71c96d0248b7b4898722b47f289dd15ad2d (patch) | |
tree | 8c5e69447d299060ef920216204ff9c4bb2638e4 /rbutil/chinachippatcher/main.c | |
parent | 07da9ce5ea9ca26436db04a63e281842467ff7fd (diff) | |
download | rockbox-059cb71c96d0248b7b4898722b47f289dd15ad2d.tar.gz rockbox-059cb71c96d0248b7b4898722b47f289dd15ad2d.zip |
Extend return codes for chinachip_patch().
Instead of passing error messages using a callback function (which becomes
awkward when used from a C++ class object) return distinct error codes from
chinachip_patch(). This also removes the kludge to support translations for
Rockbox Utility and moves the strings to translate to the installation class
where they belong.
As a side effect info messages won't be passed to Rockbox Utility anymore, but
the details of the patching progress aren't of that much interest for the user
anyway.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31115 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/chinachippatcher/main.c')
-rw-r--r-- | rbutil/chinachippatcher/main.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/rbutil/chinachippatcher/main.c b/rbutil/chinachippatcher/main.c index 12b3a3543f..0553b7d798 100644 --- a/rbutil/chinachippatcher/main.c +++ b/rbutil/chinachippatcher/main.c | |||
@@ -25,24 +25,6 @@ | |||
25 | #define VERSION "0.1" | 25 | #define VERSION "0.1" |
26 | #define PRINT(fmt, ...) fprintf(stderr, fmt"\n", ##__VA_ARGS__) | 26 | #define PRINT(fmt, ...) fprintf(stderr, fmt"\n", ##__VA_ARGS__) |
27 | 27 | ||
28 | static void info(void* userdata, char* fmt, ...) | ||
29 | { | ||
30 | (void)userdata; | ||
31 | va_list args; | ||
32 | va_start(args, fmt); | ||
33 | vfprintf(stderr, fmt, args); | ||
34 | va_end(args); | ||
35 | } | ||
36 | |||
37 | static void err(void* userdata, char* fmt, ...) | ||
38 | { | ||
39 | (void)userdata; | ||
40 | va_list args; | ||
41 | va_start(args, fmt); | ||
42 | vfprintf(stderr, fmt, args); | ||
43 | va_end(args); | ||
44 | } | ||
45 | |||
46 | void usage(char* name) | 28 | void usage(char* name) |
47 | { | 29 | { |
48 | PRINT("Usage:"); | 30 | PRINT("Usage:"); |
@@ -66,7 +48,6 @@ int main(int argc, char* argv[]) | |||
66 | return 1; | 48 | return 1; |
67 | } | 49 | } |
68 | 50 | ||
69 | return chinachip_patch(argv[1], argv[2], argv[3], argc > 4 ? argv[4] : NULL, | 51 | return chinachip_patch(argv[1], argv[2], argv[3], argc > 4 ? argv[4] : NULL); |
70 | &info, &err, NULL); | ||
71 | } | 52 | } |
72 | 53 | ||