From 572115f4a2444592d9fd868de14f629a0dfcff00 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Fri, 9 Mar 2018 06:40:30 +0100 Subject: [PATCH] selftests/ipc/msgque: Fix warning implicit declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gcc warns about implicit declaration. gcc -I../../../../usr/include/ msgque.c -o /srv/src/kernel/build_output/x86/next-20180308-4-g10dd1357888a/ipc/msgque msgque.c: In function ‘restore_queue’: msgque.c:52:7: warning: implicit declaration of function ‘msgget’ [-Wimplicit-function-declaration] id = msgget(msgque->key, msgque->mode | IPC_CREAT | IPC_EXCL); ^~~~~~ msgque.c:66:7: warning: implicit declaration of function ‘msgsnd’ [-Wimplicit-function-declaration] if (msgsnd(msgque->msq_id, &msgque->messages[i].mtype, ^~~~~~ msgque.c:76:6: warning: implicit declaration of function ‘msgctl’ [-Wimplicit-function-declaration] if (msgctl(id, IPC_RMID, 0)) ^~~~~~ msgque.c: In function ‘check_and_destroy_queue’: msgque.c:87:9: warning: implicit declaration of function ‘msgrcv’ [-Wimplicit-function-declaration] ret = msgrcv(msgque->msq_id, &message.mtype, MAX_MSG_SIZE, ^~~~~~ msgque.c: In function ‘main’: msgque.c:204:15: warning: implicit declaration of function ‘ftok’ [-Wimplicit-function-declaration] msgque.key = ftok(argv[0], 822155650); ^~~~ In the current code, we include the headers that the functions want according to the man pages, and we define MSG_COPY if its not defined. We also use 'struct msqid_ds' instead of 'struct msqid64_ds'. Fixes: 3a665531a3b7 ("selftests: IPC message queue copy feature test") Signed-off-by: Anders Roxell --- tools/testing/selftests/ipc/msgque.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/ipc/msgque.c b/tools/testing/selftests/ipc/msgque.c index ee9382bdfadc..b13398293c28 100644 --- a/tools/testing/selftests/ipc/msgque.c +++ b/tools/testing/selftests/ipc/msgque.c @@ -3,11 +3,18 @@ #include #include #include -#include #include +#include +#include +#include + #include "../kselftest.h" +#ifndef MSG_COPY + #define MSG_COPY 040000 /* copy (not remove) all queue messages */ +#endif + #define MAX_MSG_SIZE 32 struct msg1 { @@ -129,7 +136,7 @@ int check_and_destroy_queue(struct msgque_data *msgque) int dump_queue(struct msgque_data *msgque) { - struct msqid64_ds ds; + struct msqid_ds ds; int kern_id; int i, ret; -- 2.11.0