aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-11-06 02:32:31 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-11-06 02:32:31 +0000
commitfc66892abdd0934b6cb81571882f46a21488337a (patch)
tree506c5dbbcf94632dfe7bdc64dd4c97752a6a51ac
parent35a064b67fc1954b95be06499a514a45c9f2e814 (diff)
downloadbusybox-w32-fc66892abdd0934b6cb81571882f46a21488337a.tar.gz
busybox-w32-fc66892abdd0934b6cb81571882f46a21488337a.tar.bz2
busybox-w32-fc66892abdd0934b6cb81571882f46a21488337a.zip
*: remove superfluous casts. no code changes
-rw-r--r--console-tools/loadfont.c4
-rw-r--r--modutils/depmod.c2
-rw-r--r--modutils/modutils.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 8caeb3c4c..c6a3a4cd8 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -197,7 +197,7 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv)
197 * just read the entire file. 197 * just read the entire file.
198 */ 198 */
199 len = 32*1024; // can't be larger 199 len = 32*1024; // can't be larger
200 psfhdr = (struct psf_header *) xmalloc_read(STDIN_FILENO, &len); 200 psfhdr = xmalloc_read(STDIN_FILENO, &len);
201 // xmalloc_open_zipped_read_close(filename, &len); 201 // xmalloc_open_zipped_read_close(filename, &len);
202 if (!psfhdr) 202 if (!psfhdr)
203 bb_perror_msg_and_die("error reading input font"); 203 bb_perror_msg_and_die("error reading input font");
@@ -282,7 +282,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
282 } 282 }
283 // load font 283 // load font
284 len = 32*1024; // can't be larger 284 len = 32*1024; // can't be larger
285 psfhdr = (struct psf_header *) xmalloc_open_zipped_read_close(*argv, &len); 285 psfhdr = xmalloc_open_zipped_read_close(*argv, &len);
286 if (!psfhdr) 286 if (!psfhdr)
287 bb_simple_perror_msg_and_die(*argv); 287 bb_simple_perror_msg_and_die(*argv);
288 do_load(fd, psfhdr, len); 288 do_load(fd, psfhdr, len);
diff --git a/modutils/depmod.c b/modutils/depmod.c
index 5b9e9e864..a4474d5e4 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -50,7 +50,7 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb,
50 if (strrstr(fname, ".ko") == NULL) 50 if (strrstr(fname, ".ko") == NULL)
51 return TRUE; 51 return TRUE;
52 52
53 image = (char *) xmalloc_open_zipped_read_close(fname, &len); 53 image = xmalloc_open_zipped_read_close(fname, &len);
54 info = xzalloc(sizeof(module_info)); 54 info = xzalloc(sizeof(module_info));
55 55
56 info->next = *first; 56 info->next = *first;
diff --git a/modutils/modutils.c b/modutils/modutils.c
index 10b49c901..0d7d72d8b 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -123,7 +123,7 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options)
123#endif 123#endif
124 124
125 /* Use the 2.6 way */ 125 /* Use the 2.6 way */
126 image = (char *) xmalloc_open_zipped_read_close(filename, &len); 126 image = xmalloc_open_zipped_read_close(filename, &len);
127 if (image) { 127 if (image) {
128 if (init_module(image, len, options) != 0) 128 if (init_module(image, len, options) != 0)
129 rc = errno; 129 rc = errno;