style fix in while(!feof()) loop
Subsystems (6)
PATCH 1/1 style fix in while(!feof()) loop
use fgets() as the while loop condition.
Signed-off-by Chang-Hsien Tsai <[email protected]>
--- tools/bpf/bpftool/xlated_dumper.c | 4 +--- tools/testing/selftests/bpf/trace_helpers.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
tools/bpf/bpftool/xlated_dumper.c +1 -3
@@ -31,9 +31,7 @@ void kernel_syms_load(struct dump_data *dd)if (!fp)return ; -while (!feof (fp)) { -if (!fgets (buff,sizeof (buff), fp)) -break ; +while (fgets (buff,sizeof (buff), fp)) { tmp =reallocarray (dd->sym_mapping, dd->sym_count +1 ,sizeof (*dd->sym_mapping));if (!tmp) {
tools/testing/selftests/bpf/trace_helpers.c +1 -3
@@ -30,9 +30,7 @@ int load_kallsyms(void)if (!f)return -ENOENT ; -while (!feof (f)) { -if (!fgets (buf,sizeof (buf), f)) -break ; +while (fgets (buf,sizeof (buf), f)) {if (sscanf (buf,"%p %c %s" , &addr, &symbol, func) !=3 )break ;if (!addr)
Signature · 1 line
2.17.1
Quoted 4 lines · Chang-Hsien Tsai
use
fgets()as the while loop condition.Signed-off-by Chang-Hsien Tsai <[email protected]>
Looks like right now we did not really differentiate error in fgets from EOF, so the change is in this patch is equivalent to its previous behavior.
Acked-by Yonghong Song <[email protected]>
Quoted 38 lines
--- tools/bpf/bpftool/xlated_dumper.c | 4 +--- tools/testing/selftests/bpf/trace_helpers.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)tools/bpf/bpftool/xlated_dumper.c +1
-3@@ -31,9 +31,7 @@ void kernel_syms_load(struct dump_data *dd)if (!fp)return ; -while (!feof (fp)) { -if (!fgets (buff,sizeof (buff), fp)) -break ; +while (fgets (buff,sizeof (buff), fp)) { tmp =reallocarray (dd->sym_mapping, dd->sym_count +1 ,sizeof (*dd->sym_mapping));if (!tmp) {tools/testing/selftests/bpf/trace_helpers.c +1
-4@@ -30,9 +30,7 @@ int load_kallsyms(void)if (!f)return -ENOENT ; -while (!feof (f)) { -if (!fgets (buf,sizeof (buf), f)) -break ; +while (fgets (buf,sizeof (buf), f)) {if (sscanf (buf,"%p %c %s" , &addr, &symbol, func) !=3 )break ;if (!addr) --2.17.1
Quoted 3 lines · Chang-Hsien Tsai
use
fgets()as the while loop condition.Signed-off-by Chang-Hsien Tsai <[email protected]>
Applied, thanks!