summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2011-08-20 14:14:22 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2011-08-20 14:14:22 +0000
commit394ee7832569431352d5f6f70ab345a6b4dd9fa8 (patch)
treeba86f5ee0e7e5a7ae38a836f95925ef0fdbeaae9
parent56787086e3c1f5a33e0d6296818dd36951217db7 (diff)
downloadast2050-flashrom-394ee7832569431352d5f6f70ab345a6b4dd9fa8.zip
ast2050-flashrom-394ee7832569431352d5f6f70ab345a6b4dd9fa8.tar.gz
Move the main() function from flashrom.c to cli_classic.c
The file flashrom.c is part of libflashrom and should thus not contain a main() function, that would break compilation of all frontends using libflashrom. Also, cli_classic.c is the right place anyway, as it's the main() of the CLI tool. Rename the simple wrapper cli_classic() in cli_classic.c to main(), as it's not really needed. Corresponding to flashrom svn r1417. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
-rw-r--r--cli_classic.c2
-rw-r--r--flash.h3
-rw-r--r--flashrom.c5
3 files changed, 1 insertions, 9 deletions
diff --git a/cli_classic.c b/cli_classic.c
index 5d35738..c6fb379 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -96,7 +96,7 @@ static void cli_classic_abort_usage(void)
exit(1);
}
-int cli_classic(int argc, char *argv[])
+int main(int argc, char *argv[])
{
unsigned long size;
/* Probe for up to three flash chips. */
diff --git a/flash.h b/flash.h
index 4b1cca2..3d47a16 100644
--- a/flash.h
+++ b/flash.h
@@ -251,9 +251,6 @@ int print(int type, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
#define msg_pspew(...) print(MSG_BARF, __VA_ARGS__) /* programmer debug barf */
#define msg_cspew(...) print(MSG_BARF, __VA_ARGS__) /* chip debug barf */
-/* cli_classic.c */
-int cli_classic(int argc, char *argv[]);
-
/* layout.c */
int read_romlayout(char *name);
int find_romentry(char *name);
diff --git a/flashrom.c b/flashrom.c
index ad1e042..d897ac7 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1796,11 +1796,6 @@ void check_chip_supported(const struct flashchip *flash)
}
}
-int main(int argc, char *argv[])
-{
- return cli_classic(argc, argv);
-}
-
/* FIXME: This function signature needs to be improved once doit() has a better
* function signature.
*/
OpenPOWER on IntegriCloud