openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

Check for duplicate -i arguments

Browse Source 
And a tiny cleanup.

Corresponding to flashrom svn r1523.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Stefan Tauner 2012-04-15 14:09:16 +00:00
parent f5a30f65ad
commit 23bb6d579f
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
layout.c
View File

@ -201,6 +201,17 @@ int read_romlayout(char *name)
} }
#endif #endif
/* returns the index of the entry (or a negative value if it is not found) */
int find_include_arg(const char *const name)
{
unsigned int i;
for (i = 0; i < num_include_args; i++) {
if (!strcmp(include_args[i], name))
return i;
}
return -1;
}
/* register an include argument (-i) for later processing */ /* register an include argument (-i) for later processing */
int register_include_arg(char *name) int register_include_arg(char *name)
{ {
@ -214,6 +225,11 @@ int register_include_arg(char *name)
return 1; return 1;
} }
if (find_include_arg(name) != -1) {
msg_gerr("Duplicate region name: \"%s\".\n", name);
return 1;
}
include_args[num_include_args] = name; include_args[num_include_args] = name;
num_include_args++; num_include_args++;
return 0; return 0;
@ -250,17 +266,17 @@ int process_include_args(void)
if (num_include_args == 0) if (num_include_args == 0)
return 0; return 0;
for (i = 0; i < num_include_args; i++) { /* User has specified an area, but no layout file is loaded. */
/* User has specified an area, but no layout file is loaded. */ if (!romimages) {
if (!romimages) { msg_gerr("Region requested (with -i \"%s\"), "
msg_gerr("Region requested (with -i \"%s\"), " "but no layout data is available.\n",
"but no layout data is available.\n", include_args[0]);
include_args[i]); return 1;
return 1; }
}
for (i = 0; i < num_include_args; i++) {
if (find_romentry(include_args[i]) < 0) { if (find_romentry(include_args[i]) < 0) {
msg_gerr("Invalid region specified: \"%s\"\n", msg_gerr("Invalid region specified: \"%s\".\n",
include_args[i]); include_args[i]);
return 1; return 1;
} }