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

programmer_table: replace PROGRAMMER_INVALID with programmer_table_size

Browse Source 
Change-Id: Icaaeefe001de604df9d7fdd06f05a5ed39fdbd84
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55117
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Thomas Heijligen 2021-05-19 14:12:18 +02:00 committed by Nico Huber
parent 4f5169df5f
commit e14b2ec65c
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli_classic.c
View File

@ -406,7 +406,7 @@ int main(int argc, char *argv[])
"with \",\". Please see the man page "
"for details.\n");
}
for (prog = 0; prog < PROGRAMMER_INVALID; prog++) {
for (prog = 0; prog < programmer_table_size; prog++) {
name = programmer_table[prog]->name;
namelen = strlen(name);
if (strncmp(optarg, name, namelen) == 0) {

8
flashrom.c
View File

@ -134,7 +134,7 @@ int programmer_init(enum programmer prog, const char *param)
{
int ret;
if (prog >= PROGRAMMER_INVALID) {
if (prog >= programmer_table_size) {
msg_perr("Invalid programmer specified!\n");
return -1;
}
@ -1585,7 +1585,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren)
enum programmer p;
int i;
for (p = 0; p < PROGRAMMER_INVALID; p++) {
for (p = 0; p < programmer_table_size; p++) {
pname = programmer_table[p]->name;
pnamelen = strlen(pname);
if (remaining - pnamelen - 2 < 0) {
@ -1606,7 +1606,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren)
}
msg_ginfo("%s", pname);
remaining -= pnamelen;
if (p < PROGRAMMER_INVALID - 1) {
if (p < programmer_table_size - 1) {
msg_ginfo(",");
remaining--;
} else {
@ -1715,7 +1715,7 @@ int selfcheck(void)
msg_gerr("Programmer table miscompilation!\n");
ret = 1;
}
for (i = 0; i < PROGRAMMER_INVALID; i++) {
for (i = 0; i < programmer_table_size; i++) {
const struct programmer_entry *const p = programmer_table[i];
if (p == NULL) {
msg_gerr("Programmer with index %d is NULL instead of a valid pointer!\n", i);

8
libflashrom.c
View File

@ -120,10 +120,10 @@ const char *flashrom_version_info(void)
const char **flashrom_supported_programmers(void)
{
enum programmer p = 0;
const char **supported_programmers = malloc((PROGRAMMER_INVALID + 1) * sizeof(char*));
const char **supported_programmers = malloc((programmer_table_size + 1) * sizeof(char*));
if (supported_programmers != NULL) {
for (; p < PROGRAMMER_INVALID; ++p) {
for (; p < programmer_table_size; ++p) {
supported_programmers[p] = programmer_table[p]->name;
}
} else {
@ -278,11 +278,11 @@ int flashrom_programmer_init(struct flashrom_programmer **const flashprog,
{
unsigned prog;
for (prog = 0; prog < PROGRAMMER_INVALID; prog++) {
for (prog = 0; prog < programmer_table_size; prog++) {
if (strcmp(prog_name, programmer_table[prog]->name) == 0)
break;
}
if (prog >= PROGRAMMER_INVALID) {
if (prog >= programmer_table_size) {
msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", prog_name);
list_programmers_linebreak(0, 80, 0);
return 1;

2
print.c
View File

@ -482,7 +482,7 @@ int print_supported(void)
msg_ginfo("\n");
print_supported_boards_helper(laptops_known, "mobile devices");
#endif
for (i = 0; i < PROGRAMMER_INVALID; i++) {
for (i = 0; i < programmer_table_size; i++) {
const struct programmer_entry *const prog = programmer_table[i];
switch (prog->type) {
case USB:

8
print_wiki.c
View File

@ -380,7 +380,7 @@ static void print_supported_devs_wiki()
unsigned int usb_count = 0;
unsigned int i;
for (i = 0; i < PROGRAMMER_INVALID; i++) {
for (i = 0; i < programmer_table_size; i++) {
const struct programmer_entry *const prog = programmer_table[i];
switch (prog->type) {
case USB:
@ -399,7 +399,7 @@ static void print_supported_devs_wiki()
"Total amount of supported PCI devices flashrom can use as a programmer: '''%d'''\n\n"
"{%s%s", pci_count, th_start, programmer_th);
for (i = 0; i < PROGRAMMER_INVALID; i++) {
for (i = 0; i < programmer_table_size; i++) {
const struct programmer_entry *const prog = programmer_table[i];
if (prog->type == PCI) {
print_supported_devs_wiki_helper(prog);
@ -411,7 +411,7 @@ static void print_supported_devs_wiki()
"Total amount of supported USB devices flashrom can use as a programmer: '''%d'''\n\n"
"{%s%s", usb_count, th_start, programmer_th);
for (i = 0; i < PROGRAMMER_INVALID; i++) {
for (i = 0; i < programmer_table_size; i++) {
const struct programmer_entry *const prog = programmer_table[i];
if (prog->type == USB) {
print_supported_devs_wiki_helper(prog);
@ -424,7 +424,7 @@ static void print_supported_devs_wiki()
printf("! align=\"left\" | Programmer\n"
"! align=\"left\" | Note\n\n");
for (i = 0; i < PROGRAMMER_INVALID; i++) {
for (i = 0; i < programmer_table_size; i++) {
static int c = 0;
const struct programmer_entry *const prog = programmer_table[i];
if (prog->type == OTHER && prog->devs.note != NULL) {