openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-06-30 21:52:36 +02:00
Code Issues Releases Wiki Activity

Kill global variables, constants and functions if local scope suffices

Browse Source 
Constify variables where possible.
Initialize programmer-related variables explicitly in programmer_init to
allow running programmer_init from a clean state after
programmer_shutdown.
Prohibit registering programmer shutdown functions before init or after
shutdown.
Kill some dead code.
Rename global variables with namespace-polluting names.
Use a previously unused locking helper function in sst49lfxxxc.c.

This is needed for libflashrom.

Effects on the binary size of flashrom are minimal (300 bytes
shrinkage), but the data section shrinks by 4384 bytes, and that's a
good thing if flashrom is operating in constrained envionments.

Corresponding to flashrom svn r1068.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
This commit is contained in:
Carl-Daniel Hailfinger
2010-07-03 11:02:10 +00:00
parent b63b067ae2
commit ad3cc55e13
30 changed files with 206 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cli_classic.c
View File

@ -31,7 +31,7 @@
#include "flash.h"
#include "flashchips.h"
void cli_classic_usage(const char *name)
static void cli_classic_usage(const char *name)
{
const char *pname;
int pnamelen;
@ -118,7 +118,7 @@ void cli_classic_usage(const char *name)
"flash chips.\n\n");
}
void cli_classic_abort_usage(void)
static void cli_classic_abort_usage(void)
{
printf("Please run \"flashrom --help\" for usage info.\n");
exit(1);
@ -166,6 +166,7 @@ int cli_classic(int argc, char *argv[])
char *filename = NULL;
char *tempstr = NULL;
char *pparam = NULL;
print_version();
print_banner();
@ -287,10 +288,10 @@ int cli_classic(int argc, char *argv[])
if (strncmp(optarg, name, namelen) == 0) {
switch (optarg[namelen]) {
case ':':
programmer_param = strdup(optarg + namelen + 1);
if (!strlen(programmer_param)) {
free(programmer_param);
programmer_param = NULL;
pparam = strdup(optarg + namelen + 1);
if (!strlen(pparam)) {
free(pparam);
pparam = NULL;
}
break;
case '\0':
@ -381,9 +382,7 @@ int cli_classic(int argc, char *argv[])
/* FIXME: Delay calibration should happen in programmer code. */
myusec_calibrate_delay();
msg_pdbg("Initializing %s programmer\n",
programmer_table[programmer].name);
if (programmer_init()) {
if (programmer_init(pparam)) {
fprintf(stderr, "Error: Programmer initialization failed.\n");
exit(1);
}