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>
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 @@
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 @@
#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 @@
}
}
-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.
*/