summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRhys Kidd <rhyskidd@gmail.com>2016-12-27 20:45:59 -0500
committerPeter Hutterer <peter.hutterer@who-t.net>2017-01-09 10:47:05 +1000
commitea595bb1250b6f8e42d5eacd2b0cb0d20e3161b5 (patch)
tree77158ef319c82b2c438bcbba214a35c459bbf72e
parent6f2e907daed44da42f94b869c817fb63c2eafd1c (diff)
xts5: Fix clang error - non-void function 'tet_main' should return a value
Amongst examples: XDisplayString/Test1.c:151:3: error: non-void function 'tet_main' should return a value [-Wreturn-type] return; ^ Signed-off-by: Rhys Kidd <rhyskidd@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--xts5/Xlib12/XDisplayName/Test1.c3
-rw-r--r--xts5/Xlib15/XSetWMProperties/Test1.c6
-rw-r--r--xts5/Xlib15/XSetWMProperties/Test2.c6
-rw-r--r--xts5/Xlib17/XGetDefault/Test3.c3
-rw-r--r--xts5/Xlib17/XGetDefault/Test4.c3
-rw-r--r--xts5/Xlib17/XGetDefault/Test5.c6
-rw-r--r--xts5/Xlib3/XDisplayString/Test1.c8
-rw-r--r--xts5/Xlib3/XOpenDisplay/Test1.c6
8 files changed, 27 insertions, 14 deletions
diff --git a/xts5/Xlib12/XDisplayName/Test1.c b/xts5/Xlib12/XDisplayName/Test1.c
index a1bb8512..e54d926e 100644
--- a/xts5/Xlib12/XDisplayName/Test1.c
+++ b/xts5/Xlib12/XDisplayName/Test1.c
@@ -156,7 +156,8 @@ char *str;
if((dispstr = getenv("DISPLAY")) == NULL) {
delete("Environment variable DISPLAY is not set.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
diff --git a/xts5/Xlib15/XSetWMProperties/Test1.c b/xts5/Xlib15/XSetWMProperties/Test1.c
index 7c2cf282..6825f2ce 100644
--- a/xts5/Xlib15/XSetWMProperties/Test1.c
+++ b/xts5/Xlib15/XSetWMProperties/Test1.c
@@ -156,7 +156,8 @@ XClassHint rclass_hints;
if( (res_name = getenv("RESOURCE_NAME")) == NULL) {
delete("RESOURCE_NAME environment variable is not set.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
@@ -172,7 +173,8 @@ XClassHint rclass_hints;
if( XGetClassHint(Dsp, win, &rclass_hints) == 0 ) {
delete("XGetClassHints returned zero.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
diff --git a/xts5/Xlib15/XSetWMProperties/Test2.c b/xts5/Xlib15/XSetWMProperties/Test2.c
index d52cef36..f94f2393 100644
--- a/xts5/Xlib15/XSetWMProperties/Test2.c
+++ b/xts5/Xlib15/XSetWMProperties/Test2.c
@@ -156,7 +156,8 @@ XClassHint rclass_hints;
if( getenv("RESOURCE_NAME") != (char *)NULL) {
delete("RESOURCE_NAME environment variable was set to \"%s\" instead of being undefined.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
@@ -172,7 +173,8 @@ XClassHint rclass_hints;
if( XGetClassHint(Dsp, win, &rclass_hints) == 0 ) {
delete("XGetClassHints returned zero.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
diff --git a/xts5/Xlib17/XGetDefault/Test3.c b/xts5/Xlib17/XGetDefault/Test3.c
index 05ba1285..14542b6a 100644
--- a/xts5/Xlib17/XGetDefault/Test3.c
+++ b/xts5/Xlib17/XGetDefault/Test3.c
@@ -151,7 +151,8 @@ char *pval="XTest.testval31:pval_a\nXTest.testval32:pval_b\nXTest.testval33:pva
if(getenv("HOME") == NULL) {
delete("Environment variable \"HOME\" is not set.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
diff --git a/xts5/Xlib17/XGetDefault/Test4.c b/xts5/Xlib17/XGetDefault/Test4.c
index 958fa914..5c53dd76 100644
--- a/xts5/Xlib17/XGetDefault/Test4.c
+++ b/xts5/Xlib17/XGetDefault/Test4.c
@@ -154,7 +154,8 @@ static char *result[] = { "pVAL_1", "eVAL_5", "eVAL_6" };
if(getenv("XENVIRONMENT") == NULL) {
delete("XENVIRONMENT environment variable not set.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
diff --git a/xts5/Xlib17/XGetDefault/Test5.c b/xts5/Xlib17/XGetDefault/Test5.c
index 628ba7d9..5e506aef 100644
--- a/xts5/Xlib17/XGetDefault/Test5.c
+++ b/xts5/Xlib17/XGetDefault/Test5.c
@@ -157,13 +157,15 @@ static char *result[] = { "pVAL_1", "hVAL_5", "hVAL_6" , "hVAL_7"};
if(getenv("XENVIRONMENT") != NULL) {
delete("XENVIRONMENT environment variable was set.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
if(getenv("HOME") == NULL) {
delete("HOME environment variable was not set.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
diff --git a/xts5/Xlib3/XDisplayString/Test1.c b/xts5/Xlib3/XDisplayString/Test1.c
index 119d7907..d6bce990 100644
--- a/xts5/Xlib3/XDisplayString/Test1.c
+++ b/xts5/Xlib3/XDisplayString/Test1.c
@@ -148,13 +148,15 @@ Display *display;
if((dispstr = getenv("DISPLAY")) == NULL) {
delete("Environment variable DISPLAY is not set.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
if((display = XOpenDisplay("")) == (Display *) NULL) {
- delete("XOpenDisplay() returned NULL.");
- return;
+ delete("XOpenDisplay() returned NULL.");
+ UNRESOLVED;
+ return(False);
} else
CHECK;
diff --git a/xts5/Xlib3/XOpenDisplay/Test1.c b/xts5/Xlib3/XOpenDisplay/Test1.c
index e0838659..3453b934 100644
--- a/xts5/Xlib3/XOpenDisplay/Test1.c
+++ b/xts5/Xlib3/XOpenDisplay/Test1.c
@@ -149,7 +149,8 @@ Display *display;
if((dispstr = getenv("DISPLAY")) == NULL) {
delete("Environment variable DISPLAY is not set.");
- return;
+ UNRESOLVED;
+ return(False);
} else
CHECK;
@@ -163,7 +164,8 @@ Display *display;
if(rdispstr == (char *) NULL) {
delete("%s() returned NULL.", TestName);
- return;
+ UNRESOLVED;
+ return(False);
} else {
CHECK;
if(strcmp(rdispstr, dispstr) != 0) {