smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot: Remove blank lines in pxe_parse

Browse Source 
This file has quite a few more blank lines than is usual in the U-Boot
code base. Remove them.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-07-30 14:17:24 +12:00
parent cd8057dd58
commit 74c9ceb22a
1 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
boot/pxe_parse.c
View File

@@ -103,7 +103,6 @@ static struct pxe_label *label_create(void)
label = malloc(sizeof(struct pxe_label)); label = malloc(sizeof(struct pxe_label));
if (!label) if (!label)
return NULL; return NULL;
memset(label, 0, sizeof(struct pxe_label)); memset(label, 0, sizeof(struct pxe_label));
return label; return label;
@@ -167,7 +166,6 @@ static char *get_string(char **p, struct token *t, char delim, int lower)
break; break;
e++; e++;
} }
len = e - b; len = e - b;
/* /*
@@ -294,7 +292,6 @@ static int parse_sliteral(char **c, char **dst)
char *s = *c; char *s = *c;
get_token(c, &t, L_SLITERAL); get_token(c, &t, L_SLITERAL);
if (t.type != T_STRING) { if (t.type != T_STRING) {
printf("Expected string literal: %.*s\n", (int)(*c - s), s); printf("Expected string literal: %.*s\n", (int)(*c - s), s);
return -EINVAL; return -EINVAL;
@@ -320,7 +317,6 @@ static int parse_integer(char **c, int *dst)
} }
*dst = simple_strtol(t.val, NULL, 10); *dst = simple_strtol(t.val, NULL, 10);
free(t.val); free(t.val);
return 1; return 1;
@@ -384,17 +380,13 @@ static int parse_menu(struct pxe_context *ctx, char **c, struct pxe_menu *cfg,
switch (t.type) { switch (t.type) {
case T_TITLE: case T_TITLE:
err = parse_sliteral(c, &cfg->title); err = parse_sliteral(c, &cfg->title);
break; break;
case T_INCLUDE: case T_INCLUDE:
err = handle_include(ctx, c, base, cfg, nest_level + 1); err = handle_include(ctx, c, base, cfg, nest_level + 1);
break; break;
case T_BACKGROUND: case T_BACKGROUND:
err = parse_sliteral(c, &cfg->bmp); err = parse_sliteral(c, &cfg->bmp);
break; break;
default: default:
printf("Ignoring malformed menu command: %.*s\n", printf("Ignoring malformed menu command: %.*s\n",
(int)(*c - s), s); (int)(*c - s), s);
@@ -417,7 +409,6 @@ static int parse_label_menu(char **c, struct pxe_menu *cfg,
char *s; char *s;
s = *c; s = *c;
get_token(c, &t, L_KEYWORD); get_token(c, &t, L_KEYWORD);
switch (t.type) { switch (t.type) {
@@ -479,7 +470,6 @@ static int parse_label_kernel(char **c, struct pxe_label *label)
* A label ends when we either get to the end of a file, or * A label ends when we either get to the end of a file, or
* get some input we otherwise don't have a handler defined * get some input we otherwise don't have a handler defined
* for. * for.
*
*/ */
static int parse_label(char **c, struct pxe_menu *cfg) static int parse_label(char **c, struct pxe_menu *cfg)
{ {
@@ -499,7 +489,6 @@ static int parse_label(char **c, struct pxe_menu *cfg)
label_destroy(label); label_destroy(label);
return -EINVAL; return -EINVAL;
} }
list_add_tail(&label->list, &cfg->labels); list_add_tail(&label->list, &cfg->labels);
while (1) { while (1) {
@@ -511,12 +500,10 @@ static int parse_label(char **c, struct pxe_menu *cfg)
case T_MENU: case T_MENU:
err = parse_label_menu(c, cfg, label); err = parse_label_menu(c, cfg, label);
break; break;
case T_KERNEL: case T_KERNEL:
case T_LINUX: case T_LINUX:
err = parse_label_kernel(c, label); err = parse_label_kernel(c, label);
break; break;
case T_APPEND: case T_APPEND:
err = parse_sliteral(c, &label->append); err = parse_sliteral(c, &label->append);
if (label->initrd) if (label->initrd)
@@ -531,40 +518,32 @@ static int parse_label(char **c, struct pxe_menu *cfg)
label->initrd[len] = '\0'; label->initrd[len] = '\0';
break; break;
case T_INITRD: case T_INITRD:
if (!label->initrd) if (!label->initrd)
err = parse_sliteral(c, &label->initrd); err = parse_sliteral(c, &label->initrd);
break; break;
case T_FDT: case T_FDT:
if (!label->fdt) if (!label->fdt)
err = parse_sliteral(c, &label->fdt); err = parse_sliteral(c, &label->fdt);
break; break;
case T_FDTDIR: case T_FDTDIR:
if (!label->fdtdir) if (!label->fdtdir)
err = parse_sliteral(c, &label->fdtdir); err = parse_sliteral(c, &label->fdtdir);
break; break;
case T_FDTOVERLAYS: case T_FDTOVERLAYS:
if (!label->fdtoverlays) if (!label->fdtoverlays)
err = parse_sliteral(c, &label->fdtoverlays); err = parse_sliteral(c, &label->fdtoverlays);
break; break;
case T_LOCALBOOT: case T_LOCALBOOT:
label->localboot = 1; label->localboot = 1;
err = parse_integer(c, &label->localboot_val); err = parse_integer(c, &label->localboot_val);
break; break;
case T_IPAPPEND: case T_IPAPPEND:
err = parse_integer(c, &label->ipappend); err = parse_integer(c, &label->ipappend);
break; break;
case T_KASLRSEED: case T_KASLRSEED:
label->kaslrseed = 1; label->kaslrseed = 1;
break; break;
case T_EOL: case T_EOL:
break; break;
case T_SAY: { case T_SAY: {
@@ -608,7 +587,6 @@ int parse_pxefile_top(struct pxe_context *ctx, char *p, ulong base,
int err; int err;
b = p; b = p;
if (nest_level > MAX_NEST_LEVEL) { if (nest_level > MAX_NEST_LEVEL) {
printf("Maximum nesting (%d) exceeded\n", MAX_NEST_LEVEL); printf("Maximum nesting (%d) exceeded\n", MAX_NEST_LEVEL);
return -EMLINK; return -EMLINK;
@@ -616,7 +594,6 @@ int parse_pxefile_top(struct pxe_context *ctx, char *p, ulong base,
while (1) { while (1) {
s = p; s = p;
get_token(&p, &t, L_KEYWORD); get_token(&p, &t, L_KEYWORD);
err = 0; err = 0;
@@ -627,59 +604,46 @@ int parse_pxefile_top(struct pxe_context *ctx, char *p, ulong base,
base + ALIGN(strlen(b) + 1, 4), base + ALIGN(strlen(b) + 1, 4),
nest_level); nest_level);
break; break;
case T_TIMEOUT: case T_TIMEOUT:
err = parse_integer(&p, &cfg->timeout); err = parse_integer(&p, &cfg->timeout);
break; break;
case T_LABEL: case T_LABEL:
err = parse_label(&p, cfg); err = parse_label(&p, cfg);
break; break;
case T_DEFAULT: case T_DEFAULT:
case T_ONTIMEOUT: case T_ONTIMEOUT:
err = parse_sliteral(&p, &label_name); err = parse_sliteral(&p, &label_name);
if (label_name) { if (label_name) {
if (cfg->default_label) if (cfg->default_label)
free(cfg->default_label); free(cfg->default_label);
cfg->default_label = label_name; cfg->default_label = label_name;
} }
break; break;
case T_FALLBACK: case T_FALLBACK:
err = parse_sliteral(&p, &label_name); err = parse_sliteral(&p, &label_name);
if (label_name) { if (label_name) {
if (cfg->fallback_label) if (cfg->fallback_label)
free(cfg->fallback_label); free(cfg->fallback_label);
cfg->fallback_label = label_name; cfg->fallback_label = label_name;
} }
break; break;
case T_INCLUDE: case T_INCLUDE:
err = handle_include(ctx, &p, err = handle_include(ctx, &p,
base + ALIGN(strlen(b), 4), cfg, base + ALIGN(strlen(b), 4), cfg,
nest_level + 1); nest_level + 1);
break; break;
case T_PROMPT: case T_PROMPT:
err = parse_integer(&p, &cfg->prompt); err = parse_integer(&p, &cfg->prompt);
// Do not fail if prompt configuration is undefined // Do not fail if prompt configuration is undefined
if (err < 0) if (err < 0)
eol_or_eof(&p); eol_or_eof(&p);
break; break;
case T_EOL: case T_EOL:
break; break;
case T_EOF: case T_EOF:
return 1; return 1;
default: default:
printf("Ignoring unknown command: %.*s\n", printf("Ignoring unknown command: %.*s\n",
(int)(p - s), s); (int)(p - s), s);