diff mbox series

[v2] cleanup: Replace libc function with safe_macros

Message ID 20210322032630.21094-1-zhaogongyi@huawei.com
State Accepted
Headers show
Series [v2] cleanup: Replace libc function with safe_macros | expand

Commit Message

Zhao Gongyi March 22, 2021, 3:26 a.m. UTC 
For those:
	testcases/kernel/syscalls/fanotify/fanotify01.c
	testcases/kernel/syscalls/fanotify/fanotify03.c
	testcases/kernel/syscalls/fanotify/fanotify07.c

Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
---
v1->v2: correct compile error.
 testcases/kernel/syscalls/fanotify/fanotify01.c |  2 +-
 testcases/kernel/syscalls/fanotify/fanotify03.c | 16 +++++++---------
 testcases/kernel/syscalls/fanotify/fanotify07.c | 15 ++++++---------
 3 files changed, 14 insertions(+), 19 deletions(-)

--
2.17.1

Comments

Li Wang March 22, 2021, 5:31 a.m. UTC | #1 
On Mon, Mar 22, 2021 at 11:27 AM Zhao Gongyi <zhaogongyi@huawei.com> wrote:

> For those:
>         testcases/kernel/syscalls/fanotify/fanotify01.c
>         testcases/kernel/syscalls/fanotify/fanotify03.c
>         testcases/kernel/syscalls/fanotify/fanotify07.c
>
> Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
> ---
> v1->v2: correct compile error.
>

Pushed, thanks!
diff mbox series

Patch

diff --git a/testcases/kernel/syscalls/fanotify/fanotify01.c b/testcases/kernel/syscalls/fanotify/fanotify01.c
index 990bda140..2fe4a9457 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify01.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify01.c
@@ -167,7 +167,7 @@  static void test_fanotify(unsigned int n)
 			EVENT_BUF_LEN - len);
 	len += ret;

-	lseek(fd, 0, SEEK_SET);
+	SAFE_LSEEK(fd, 0, SEEK_SET);
 	/* Generate modify event to clear ignore mask */
 	SAFE_WRITE(1, fd, fname, 1);
 	event_set[tst_count] = FAN_MODIFY;
diff --git a/testcases/kernel/syscalls/fanotify/fanotify03.c b/testcases/kernel/syscalls/fanotify/fanotify03.c
index a5a384ee7..a8cf4348a 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify03.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify03.c
@@ -128,17 +128,15 @@  static void generate_events(void)
 	/*
 	 * Generate sequence of events
 	 */
-	if ((fd = open(fname, O_RDWR | O_CREAT, 0700)) == -1)
-		exit(1);
-	if (write(fd, fname, 1) == -1)
-		exit(2);
+	fd = SAFE_OPEN(fname, O_RDWR | O_CREAT, 0700);
+
+	SAFE_WRITE(0, fd, fname, 1);
+	SAFE_LSEEK(fd, 0, SEEK_SET);

-	lseek(fd, 0, SEEK_SET);
 	if (read(fd, buf, BUF_SIZE) != -1)
 		exit(3);

-	if (close(fd) == -1)
-		exit(4);
+	SAFE_CLOSE(fd);

 	if (execve(FILE_EXEC_PATH, argv, environ) != -1)
 		exit(5);
@@ -151,7 +149,7 @@  static void child_handler(int tmp)
 	 * Close notification fd so that we cannot block while reading
 	 * from it
 	 */
-	close(fd_notify);
+	SAFE_CLOSE(fd_notify);
 	fd_notify = -1;
 }

@@ -172,7 +170,7 @@  static void run_child(void)

 	if (child_pid == 0) {
 		/* Child will generate events now */
-		close(fd_notify);
+		SAFE_CLOSE(fd_notify);
 		generate_events();
 		exit(0);
 	}
diff --git a/testcases/kernel/syscalls/fanotify/fanotify07.c b/testcases/kernel/syscalls/fanotify/fanotify07.c
index 830af32b6..631a9a20c 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify07.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify07.c
@@ -53,14 +53,12 @@  static void generate_events(void)
 	/*
 	 * generate sequence of events
 	 */
-	if ((fd = open(fname, O_RDWR | O_CREAT, 0700)) == -1)
-		exit(1);
+	fd = SAFE_OPEN(fname, O_RDWR | O_CREAT, 0700);

 	/* Run until killed... */
 	while (1) {
-		lseek(fd, 0, SEEK_SET);
-		if (read(fd, buf, BUF_SIZE) == -1)
-			exit(3);
+		SAFE_LSEEK(fd, 0, SEEK_SET);
+		SAFE_READ(0, fd, buf, BUF_SIZE);
 	}
 }

@@ -72,7 +70,7 @@  static void run_children(void)
 		child_pid[i] = SAFE_FORK();
 		if (!child_pid[i]) {
 			/* Child will generate events now */
-			close(fd_notify);
+			SAFE_CLOSE(fd_notify);
 			generate_events();
 			exit(0);
 		}
@@ -159,9 +157,8 @@  static void test_fanotify(void)
 	 * unanswered fanotify events block notification subsystem.
 	 */
 	newfd = setup_instance();
-	if (close(newfd)) {
-		tst_brk(TBROK | TERRNO, "close(%d) failed", newfd);
-	}
+
+	SAFE_CLOSE(newfd);

 	tst_res(TPASS, "second instance destroyed successfully");