aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-10-10 12:56:24 +0100
committerRon Yorston <rmy@pobox.com>2012-10-10 12:56:24 +0100
commit981a6fcd1323a77d5829c7d574bb40fd1b96dc4d (patch)
treea1e3aadf4de65d7a525c7dd6172546ff577777d5 /miscutils
parent19436cc0ee509a5e356c04f0026919abd417bec4 (diff)
parenteab343e7e1e5331df833aa69f14584e4a6c738f1 (diff)
downloadbusybox-w32-981a6fcd1323a77d5829c7d574bb40fd1b96dc4d.tar.gz
busybox-w32-981a6fcd1323a77d5829c7d574bb40fd1b96dc4d.tar.bz2
busybox-w32-981a6fcd1323a77d5829c7d574bb40fd1b96dc4d.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/flashcp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index 790f9c01f..81cde9072 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -50,7 +50,6 @@ int flashcp_main(int argc UNUSED_PARAM, char **argv)
50 int fd_f, fd_d; /* input file and mtd device file descriptors */ 50 int fd_f, fd_d; /* input file and mtd device file descriptors */
51 int i; 51 int i;
52 uoff_t erase_count; 52 uoff_t erase_count;
53 unsigned opts;
54 struct mtd_info_user mtd; 53 struct mtd_info_user mtd;
55 struct erase_info_user e; 54 struct erase_info_user e;
56 struct stat statb; 55 struct stat statb;
@@ -59,7 +58,7 @@ int flashcp_main(int argc UNUSED_PARAM, char **argv)
59 RESERVE_CONFIG_UBUFFER(buf2, BUFSIZE); 58 RESERVE_CONFIG_UBUFFER(buf2, BUFSIZE);
60 59
61 opt_complementary = "=2"; /* exactly 2 non-option args: file, dev */ 60 opt_complementary = "=2"; /* exactly 2 non-option args: file, dev */
62 opts = getopt32(argv, "v"); 61 /*opts =*/ getopt32(argv, "v");
63 argv += optind; 62 argv += optind;
64// filename = *argv++; 63// filename = *argv++;
65// devicename = *argv; 64// devicename = *argv;