[v2] tools/counter: Close fd when exit

Commit Message

zhangjiao2 Sept. 4, 2024, 1:42 a.m. UTC

From: zhang jiao <[e-mail]>

Since fd is not used in the messaging it's better to 
close it before printing anything. Ditto for other cases.

Signed-off-by: zhang jiao <[e-mail]>
---
v1->v2:
	Close fd before fprintf.

 tools/counter/counter_example.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Andy Shevchenko Sept. 4, 2024, 7:35 a.m. UTC | #1

On Wed, Sep 4, 2024 at 4:42 AM zhangjiao2
<[e-mail]> wrote:

> Since fd is not used in the messaging it's better to
> close it before printing anything.

It was my comment which you addressed. Thanks for that.
But it does not explain what the problem is.

Patch

diff --git a/tools/counter/counter_example.c b/tools/counter/counter_example.c
index be55287b950f..37569208c235 100644
--- a/tools/counter/counter_example.c
+++ b/tools/counter/counter_example.c
@@ -57,12 +57,14 @@  int main(void)
 		if (ret == -1) {
+			close(fd);
 			fprintf(stderr, "Error adding watches[%d]: %s\n", i,
 				strerror(errno));
 			return 1;
 		}
 	}
 	ret = ioctl(fd, COUNTER_ENABLE_EVENTS_IOCTL);
 	if (ret == -1) {
+		close(fd);
 		perror("Error enabling events");
 		return 1;
 	}
 
@@ -70,11 +72,13 @@  int main(void)
 		ret = read(fd, event_data, sizeof(event_data));
 		if (ret == -1) {
+			close(fd);
 			perror("Failed to read event data");
 			return 1;
 		}
 
 		if (ret != sizeof(event_data)) {
+			close(fd);
 			fprintf(stderr, "Failed to read event data\n");
 			return -EIO;
 		}
 
@@ -88,5 +92,6 @@  int main(void)
 		       strerror(event_data[1].status));
 	}
 
+	close(fd);
 	return 0;
 }