Changeset 1417

Timestamp:

08/20/11 16:14:22 (9 months ago)

Author:

uwe

Message:

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.

Signed-off-by: Uwe Hermann <uwe@…>
Acked-by: Stefan Tauner <stefan.tauner@…>

Location:

trunk

Files:

• cli_classic.c (modified) (1 diff)
• flash.h (modified) (1 diff)
• flashrom.c (modified) (1 diff)

trunk/cli_classic.c

@@ -97 +97 @@
 }
 
-int cli_classic(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
         unsigned long size;

trunk/flash.h

@@ -252 +252 @@
 #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);

trunk/flashrom.c

@@ -1797 +1797 @@
 }
 
-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.