2022-05-04 17:17:36

by Sebin Sebastian

Subject: [PATCH] selftests: mqueue: fix all errors

All errors and styling issues were fixed.

Signed-off-by: Sebin Sebastian <[email protected]>
---
.../testing/selftests/mqueue/mq_open_tests.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/tools/testing/selftests/mqueue/mq_open_tests.c b/tools/testing/selftests/mqueue/mq_open_tests.c
index 9403ac01ba11..c3cb40eae1e9 100644
--- a/tools/testing/selftests/mqueue/mq_open_tests.c
+++ b/tools/testing/selftests/mqueue/mq_open_tests.c
@@ -59,12 +59,12 @@ char *default_queue_path = "/test1";
mqd_t queue = -1;

static inline void __set(FILE *stream, int value, char *err_msg);
-void shutdown(int exit_val, char *err_cause, int line_no);
+ void shutdown(int exit_val, char *err_cause, int line_no);
static inline int get(FILE *stream);
static inline void set(FILE *stream, int value);
static inline void getr(int type, struct rlimit *rlim);
static inline void setr(int type, struct rlimit *rlim);
-void validate_current_settings();
+static void validate_current_settings(void);
static inline void test_queue(struct mq_attr *attr, struct mq_attr *result);
static inline int test_queue_fail(struct mq_attr *attr, struct mq_attr *result);

@@ -78,7 +78,7 @@ static inline void __set(FILE *stream, int value, char *err_msg)

void shutdown(int exit_val, char *err_cause, int line_no)
{
- static int in_shutdown = 0;
+ static int in_shutdown;

/* In case we get called recursively by a set() call below */
if (in_shutdown++)
@@ -118,6 +118,7 @@ void shutdown(int exit_val, char *err_cause, int line_no)
static inline int get(FILE *stream)
{
int value;
+
rewind(stream);
if (fscanf(stream, "%d", &value) != 1)
shutdown(4, "Error reading /proc entry", __LINE__ - 1);
@@ -150,7 +151,7 @@ static inline void setr(int type, struct rlimit *rlim)
shutdown(7, "setrlimit()", __LINE__ - 1);
}

-void validate_current_settings()
+void validate_current_settings(void)
{
int rlim_needed;

@@ -202,7 +203,9 @@ static inline void test_queue(struct mq_attr *attr, struct mq_attr *result)
int flags = O_RDWR | O_EXCL | O_CREAT;
int perms = DEFFILEMODE;

- if ((queue = mq_open(queue_path, flags, perms, attr)) == -1)
+ queue = mq_open(queue_path, flags, perms, attr);
+
+ if ((queue == -1))
shutdown(1, "mq_open()", __LINE__);
if (mq_getattr(queue, result))
shutdown(1, "mq_getattr()", __LINE__);
@@ -224,7 +227,9 @@ static inline int test_queue_fail(struct mq_attr *attr, struct mq_attr *result)
int flags = O_RDWR | O_EXCL | O_CREAT;
int perms = DEFFILEMODE;

- if ((queue = mq_open(queue_path, flags, perms, attr)) == -1)
+ queue = mq_open(queue_path, flags, perms, attr);
+
+ if (queue == -1)
return 0;
if (mq_getattr(queue, result))
shutdown(1, "mq_getattr()", __LINE__);
@@ -498,5 +503,5 @@ int main(int argc, char *argv[])
printf("Queue open with total size > 2GB when euid = 99 "
"failed:\t\t\tPASS\n");

- shutdown(0,"",0);
+ shutdown(0, "", 0);
}
--
2.25.1

2022-05-04 22:43:56

by Shuah Khan

Subject: Re: [PATCH] selftests: mqueue: fix all errors

On 5/4/22 4:17 AM, Sebin Sebastian wrote:
> All errors and styling issues were fixed.
>
> Signed-off-by: Sebin Sebastian <[email protected]>

Please include details on how you found the problems and the log from the tool

> ---
> .../testing/selftests/mqueue/mq_open_tests.c | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/tools/testing/selftests/mqueue/mq_open_tests.c b/tools/testing/selftests/mqueue/mq_open_tests.c
> index 9403ac01ba11..c3cb40eae1e9 100644
> --- a/tools/testing/selftests/mqueue/mq_open_tests.c
> +++ b/tools/testing/selftests/mqueue/mq_open_tests.c
> @@ -59,12 +59,12 @@ char *default_queue_path = "/test1";
> mqd_t queue = -1;
>
> static inline void __set(FILE *stream, int value, char *err_msg);
> -void shutdown(int exit_val, char *err_cause, int line_no);
> + void shutdown(int exit_val, char *err_cause, int line_no);
I don't see any change in this line

Including the log helps me understand why these changes are necessary.

thanks,
-- Shuah