mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-06 02:24:14 +08:00
selftests/ipc: Fix msgque compiler warnings
This fixes the various compiler warnings when building the msgque
selftest. The primary change is using sys/msg.h instead of linux/msg.h
directly to gain the API declarations.
Fixes: 3a665531a3
("selftests: IPC message queue copy feature test")
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
parent
dff6d2ae56
commit
a147faa96f
@ -1,9 +1,10 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
#define _GNU_SOURCE
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <linux/msg.h>
|
||||
#include <sys/msg.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "../kselftest.h"
|
||||
@ -73,7 +74,7 @@ int restore_queue(struct msgque_data *msgque)
|
||||
return 0;
|
||||
|
||||
destroy:
|
||||
if (msgctl(id, IPC_RMID, 0))
|
||||
if (msgctl(id, IPC_RMID, NULL))
|
||||
printf("Failed to destroy queue: %d\n", -errno);
|
||||
return ret;
|
||||
}
|
||||
@ -120,7 +121,7 @@ int check_and_destroy_queue(struct msgque_data *msgque)
|
||||
|
||||
ret = 0;
|
||||
err:
|
||||
if (msgctl(msgque->msq_id, IPC_RMID, 0)) {
|
||||
if (msgctl(msgque->msq_id, IPC_RMID, NULL)) {
|
||||
printf("Failed to destroy queue: %d\n", -errno);
|
||||
return -errno;
|
||||
}
|
||||
@ -129,7 +130,7 @@ err:
|
||||
|
||||
int dump_queue(struct msgque_data *msgque)
|
||||
{
|
||||
struct msqid64_ds ds;
|
||||
struct msqid_ds ds;
|
||||
int kern_id;
|
||||
int i, ret;
|
||||
|
||||
@ -245,7 +246,7 @@ int main(int argc, char **argv)
|
||||
return ksft_exit_pass();
|
||||
|
||||
err_destroy:
|
||||
if (msgctl(msgque.msq_id, IPC_RMID, 0)) {
|
||||
if (msgctl(msgque.msq_id, IPC_RMID, NULL)) {
|
||||
printf("Failed to destroy queue: %d\n", -errno);
|
||||
return ksft_exit_fail();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user