Skip to contentSkip to conversation

style fix in while(!feof()) loop

PATCH Applied Chang-Hsien Tsai 3 participants 3 messages May 26, 2019 – May 28, 2019

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 style fix in while(!feof()) loop

use fgets() as the while loop condition.

---
 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
index 0bb17bf88b18..494d7ae3614d 100644
@@ -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
index 9a9fc6c9b70b..b47f205f0310 100644
@@ -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
Acked-by Yonghong Song on v1 1/1
#1 lore raw
Quoted 4 lines · Chang-Hsien Tsai

use fgets() as the while loop condition.

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.

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
index 0bb17bf88b18..494d7ae3614d 100644
@@ -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
index 9a9fc6c9b70b..b47f205f0310 100644
@@ -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