summaryrefslogtreecommitdiff
path: root/test cases/windows
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-12-01 00:19:44 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2019-12-04 10:59:40 +0200
commitacee448fb9b49817cadf6de9c0e09f279515bf9d (patch)
tree0e6c32e4d6ef53e7e478cf54f1d18292023798b9 /test cases/windows
parent7d162487e37e5bf51c94bdbd753a2f928287e655 (diff)
downloadmeson-acee448fb9b49817cadf6de9c0e09f279515bf9d.tar.gz
ci/test: unused args for Windows
Diffstat (limited to 'test cases/windows')
-rw-r--r--test cases/windows/10 vs module defs generated custom target/prog.c2
-rw-r--r--test cases/windows/10 vs module defs generated custom target/subdir/somedll.c2
-rw-r--r--test cases/windows/11 exe implib/prog.c2
-rw-r--r--test cases/windows/12 resources with custom targets/prog.c5
-rw-r--r--test cases/windows/13 test argument extra paths/exe/main.c2
-rw-r--r--test cases/windows/14 resources with custom target depend_files/prog.c5
-rw-r--r--test cases/windows/15 resource scripts with duplicate filenames/exe3/src_dll/main.c4
-rw-r--r--test cases/windows/15 resource scripts with duplicate filenames/exe3/src_exe/main.c2
-rw-r--r--test cases/windows/15 resource scripts with duplicate filenames/exe4/src_dll/main.c4
-rw-r--r--test cases/windows/15 resource scripts with duplicate filenames/exe4/src_exe/main.c2
-rw-r--r--test cases/windows/15 resource scripts with duplicate filenames/verify.c4
-rw-r--r--test cases/windows/16 gui app/gui_prog.c5
-rw-r--r--test cases/windows/2 winmain/prog.c5
-rw-r--r--test cases/windows/3 cpp/prog.cpp2
-rw-r--r--test cases/windows/4 winmaincpp/prog.cpp5
-rw-r--r--test cases/windows/5 resources/prog.c5
-rw-r--r--test cases/windows/6 vs module defs/prog.c2
-rw-r--r--test cases/windows/6 vs module defs/subdir/somedll.c2
-rw-r--r--test cases/windows/7 dll versioning/lib.c2
-rw-r--r--test cases/windows/9 vs module defs generated/prog.c2
-rw-r--r--test cases/windows/9 vs module defs generated/subdir/somedll.c2
21 files changed, 53 insertions, 13 deletions
diff --git a/test cases/windows/10 vs module defs generated custom target/prog.c b/test cases/windows/10 vs module defs generated custom target/prog.c
index 51f780587..066ac227a 100644
--- a/test cases/windows/10 vs module defs generated custom target/prog.c
+++ b/test cases/windows/10 vs module defs generated custom target/prog.c
@@ -1,4 +1,4 @@
-int somedllfunc();
+int somedllfunc(void);
int main(void) {
return somedllfunc() == 42 ? 0 : 1;
diff --git a/test cases/windows/10 vs module defs generated custom target/subdir/somedll.c b/test cases/windows/10 vs module defs generated custom target/subdir/somedll.c
index b23d8fed5..f095b1839 100644
--- a/test cases/windows/10 vs module defs generated custom target/subdir/somedll.c
+++ b/test cases/windows/10 vs module defs generated custom target/subdir/somedll.c
@@ -1,3 +1,3 @@
-int somedllfunc() {
+int somedllfunc(void) {
return 42;
}
diff --git a/test cases/windows/11 exe implib/prog.c b/test cases/windows/11 exe implib/prog.c
index 2192019d2..aa3bc5c57 100644
--- a/test cases/windows/11 exe implib/prog.c
+++ b/test cases/windows/11 exe implib/prog.c
@@ -1,6 +1,6 @@
#include <windows.h>
int __declspec(dllexport)
-main() {
+main(void) {
return 0;
}
diff --git a/test cases/windows/12 resources with custom targets/prog.c b/test cases/windows/12 resources with custom targets/prog.c
index 2bef6a278..cb6892d04 100644
--- a/test cases/windows/12 resources with custom targets/prog.c
+++ b/test cases/windows/12 resources with custom targets/prog.c
@@ -10,5 +10,10 @@ WinMain(
int nCmdShow) {
HICON hIcon;
hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(MY_ICON));
+ // avoid unused argument error while matching template
+ ((void)hInstance);
+ ((void)hPrevInstance);
+ ((void)lpszCmdLine);
+ ((void)nCmdShow);
return hIcon ? 0 : 1;
}
diff --git a/test cases/windows/13 test argument extra paths/exe/main.c b/test cases/windows/13 test argument extra paths/exe/main.c
index 0ac9e3892..1032ae20d 100644
--- a/test cases/windows/13 test argument extra paths/exe/main.c
+++ b/test cases/windows/13 test argument extra paths/exe/main.c
@@ -1,5 +1,5 @@
#include <foo.h>
-int main(int ac, char **av) {
+int main(void) {
return foo_process();
}
diff --git a/test cases/windows/14 resources with custom target depend_files/prog.c b/test cases/windows/14 resources with custom target depend_files/prog.c
index 2bef6a278..cb6892d04 100644
--- a/test cases/windows/14 resources with custom target depend_files/prog.c
+++ b/test cases/windows/14 resources with custom target depend_files/prog.c
@@ -10,5 +10,10 @@ WinMain(
int nCmdShow) {
HICON hIcon;
hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(MY_ICON));
+ // avoid unused argument error while matching template
+ ((void)hInstance);
+ ((void)hPrevInstance);
+ ((void)lpszCmdLine);
+ ((void)nCmdShow);
return hIcon ? 0 : 1;
}
diff --git a/test cases/windows/15 resource scripts with duplicate filenames/exe3/src_dll/main.c b/test cases/windows/15 resource scripts with duplicate filenames/exe3/src_dll/main.c
index 673b5e4f9..2bd8cd297 100644
--- a/test cases/windows/15 resource scripts with duplicate filenames/exe3/src_dll/main.c
+++ b/test cases/windows/15 resource scripts with duplicate filenames/exe3/src_dll/main.c
@@ -2,5 +2,9 @@
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
+ // avoid unused argument error while matching template
+ ((void)hinstDLL);
+ ((void)fdwReason);
+ ((void)lpvReserved);
return TRUE;
}
diff --git a/test cases/windows/15 resource scripts with duplicate filenames/exe3/src_exe/main.c b/test cases/windows/15 resource scripts with duplicate filenames/exe3/src_exe/main.c
index 11b7fad8e..9b6bdc2ec 100644
--- a/test cases/windows/15 resource scripts with duplicate filenames/exe3/src_exe/main.c
+++ b/test cases/windows/15 resource scripts with duplicate filenames/exe3/src_exe/main.c
@@ -1,3 +1,3 @@
-int main(int argc, char **argv) {
+int main(void) {
return 0;
}
diff --git a/test cases/windows/15 resource scripts with duplicate filenames/exe4/src_dll/main.c b/test cases/windows/15 resource scripts with duplicate filenames/exe4/src_dll/main.c
index 673b5e4f9..2bd8cd297 100644
--- a/test cases/windows/15 resource scripts with duplicate filenames/exe4/src_dll/main.c
+++ b/test cases/windows/15 resource scripts with duplicate filenames/exe4/src_dll/main.c
@@ -2,5 +2,9 @@
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
+ // avoid unused argument error while matching template
+ ((void)hinstDLL);
+ ((void)fdwReason);
+ ((void)lpvReserved);
return TRUE;
}
diff --git a/test cases/windows/15 resource scripts with duplicate filenames/exe4/src_exe/main.c b/test cases/windows/15 resource scripts with duplicate filenames/exe4/src_exe/main.c
index 11b7fad8e..9b6bdc2ec 100644
--- a/test cases/windows/15 resource scripts with duplicate filenames/exe4/src_exe/main.c
+++ b/test cases/windows/15 resource scripts with duplicate filenames/exe4/src_exe/main.c
@@ -1,3 +1,3 @@
-int main(int argc, char **argv) {
+int main(void) {
return 0;
}
diff --git a/test cases/windows/15 resource scripts with duplicate filenames/verify.c b/test cases/windows/15 resource scripts with duplicate filenames/verify.c
index 4d2ccf028..8f5b88e94 100644
--- a/test cases/windows/15 resource scripts with duplicate filenames/verify.c
+++ b/test cases/windows/15 resource scripts with duplicate filenames/verify.c
@@ -1,7 +1,7 @@
#include <assert.h>
#include <windows.h>
-int main(int arc, char *argv[])
+int main(int argc, char *argv[])
{
// verify that the expected resource exists and has the expected contents
HRSRC hRsrc;
@@ -9,6 +9,8 @@ int main(int arc, char *argv[])
HGLOBAL hGlobal;
void* data;
+ ((void)argc);
+
hRsrc = FindResource(NULL, argv[1], RT_RCDATA);
assert(hRsrc);
diff --git a/test cases/windows/16 gui app/gui_prog.c b/test cases/windows/16 gui app/gui_prog.c
index 4bc688a35..9cdf17023 100644
--- a/test cases/windows/16 gui app/gui_prog.c
+++ b/test cases/windows/16 gui app/gui_prog.c
@@ -2,5 +2,10 @@
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPSTR lpCmdLine, int nCmdShow) {
+ // avoid unused argument error while matching template
+ ((void)hInstance);
+ ((void)hPrevInstance);
+ ((void)lpCmdLine);
+ ((void)nCmdShow);
return 0;
}
diff --git a/test cases/windows/2 winmain/prog.c b/test cases/windows/2 winmain/prog.c
index 77d698206..3bd4c9528 100644
--- a/test cases/windows/2 winmain/prog.c
+++ b/test cases/windows/2 winmain/prog.c
@@ -6,5 +6,10 @@ WinMain(
HINSTANCE hPrevInstance,
LPSTR lpszCmdLine,
int nCmdShow) {
+// avoid unused argument error while matching template
+ ((void)hInstance);
+ ((void)hPrevInstance);
+ ((void)lpszCmdLine);
+ ((void)nCmdShow);
return 0;
}
diff --git a/test cases/windows/3 cpp/prog.cpp b/test cases/windows/3 cpp/prog.cpp
index cf6733510..69092f7b7 100644
--- a/test cases/windows/3 cpp/prog.cpp
+++ b/test cases/windows/3 cpp/prog.cpp
@@ -2,6 +2,6 @@
class Foo;
-int main(int argc, char **argv) {
+int main(void) {
return 0;
}
diff --git a/test cases/windows/4 winmaincpp/prog.cpp b/test cases/windows/4 winmaincpp/prog.cpp
index aeecb7b82..618225771 100644
--- a/test cases/windows/4 winmaincpp/prog.cpp
+++ b/test cases/windows/4 winmaincpp/prog.cpp
@@ -8,5 +8,10 @@ WinMain(
HINSTANCE hPrevInstance,
LPSTR lpszCmdLine,
int nCmdShow) {
+// avoid unused argument error while matching template
+ ((void)hInstance);
+ ((void)hPrevInstance);
+ ((void)lpszCmdLine);
+ ((void)nCmdShow);
return 0;
}
diff --git a/test cases/windows/5 resources/prog.c b/test cases/windows/5 resources/prog.c
index afbb6ae70..3409c398c 100644
--- a/test cases/windows/5 resources/prog.c
+++ b/test cases/windows/5 resources/prog.c
@@ -12,5 +12,10 @@ WinMain(
int nCmdShow) {
HICON hIcon;
hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(MY_ICON));
+// avoid unused argument error while matching template
+ ((void)hInstance);
+ ((void)hPrevInstance);
+ ((void)lpszCmdLine);
+ ((void)nCmdShow);
return hIcon ? 0 : 1;
}
diff --git a/test cases/windows/6 vs module defs/prog.c b/test cases/windows/6 vs module defs/prog.c
index 51f780587..066ac227a 100644
--- a/test cases/windows/6 vs module defs/prog.c
+++ b/test cases/windows/6 vs module defs/prog.c
@@ -1,4 +1,4 @@
-int somedllfunc();
+int somedllfunc(void);
int main(void) {
return somedllfunc() == 42 ? 0 : 1;
diff --git a/test cases/windows/6 vs module defs/subdir/somedll.c b/test cases/windows/6 vs module defs/subdir/somedll.c
index b23d8fed5..f095b1839 100644
--- a/test cases/windows/6 vs module defs/subdir/somedll.c
+++ b/test cases/windows/6 vs module defs/subdir/somedll.c
@@ -1,3 +1,3 @@
-int somedllfunc() {
+int somedllfunc(void) {
return 42;
}
diff --git a/test cases/windows/7 dll versioning/lib.c b/test cases/windows/7 dll versioning/lib.c
index cf7dfdd07..37e0d1d7e 100644
--- a/test cases/windows/7 dll versioning/lib.c
+++ b/test cases/windows/7 dll versioning/lib.c
@@ -1,6 +1,6 @@
#ifdef _WIN32
__declspec(dllexport)
#endif
-int myFunc() {
+int myFunc(void) {
return 55;
}
diff --git a/test cases/windows/9 vs module defs generated/prog.c b/test cases/windows/9 vs module defs generated/prog.c
index 51f780587..066ac227a 100644
--- a/test cases/windows/9 vs module defs generated/prog.c
+++ b/test cases/windows/9 vs module defs generated/prog.c
@@ -1,4 +1,4 @@
-int somedllfunc();
+int somedllfunc(void);
int main(void) {
return somedllfunc() == 42 ? 0 : 1;
diff --git a/test cases/windows/9 vs module defs generated/subdir/somedll.c b/test cases/windows/9 vs module defs generated/subdir/somedll.c
index b23d8fed5..f095b1839 100644
--- a/test cases/windows/9 vs module defs generated/subdir/somedll.c
+++ b/test cases/windows/9 vs module defs generated/subdir/somedll.c
@@ -1,3 +1,3 @@
-int somedllfunc() {
+int somedllfunc(void) {
return 42;
}