st/xvmc/tests: avoid non portable error.h functions

To improve compatibility with OpenBSD.

Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/src/gallium/state_trackers/xvmc/tests/test_blocks.c b/src/gallium/state_trackers/xvmc/tests/test_blocks.c
index 0baed19a6ef34d0f8a17fc386c39ff77b2bbe74a..a35838f3309fef6961f5a63dfce2fae184e244ad 100644 (file)
--- a/src/gallium/state_trackers/xvmc/tests/test_blocks.c
+++ b/src/gallium/state_trackers/xvmc/tests/test_blocks.c
@@ -26,7 +26,8 @@
  **************************************************************************/
 
 #include <assert.h>
-#include <error.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "testlib.h"
 
 int main(int argc, char **argv)
@@ -62,7 +63,8 @@ int main(int argc, char **argv)
        ))
        {
                XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
+               fprintf(stderr, "Error, unable to find a good port.\n");
+               exit(1);
        }
 
        if (is_overlay)

diff --git a/src/gallium/state_trackers/xvmc/tests/test_context.c b/src/gallium/state_trackers/xvmc/tests/test_context.c
index 1b9b04067902e99765805643cac08b6929bda317..344ac76decc45310f8bd25fb768781c86082ae20 100644 (file)
--- a/src/gallium/state_trackers/xvmc/tests/test_context.c
+++ b/src/gallium/state_trackers/xvmc/tests/test_context.c
@@ -26,7 +26,8 @@
  **************************************************************************/
 
 #include <assert.h>
-#include <error.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "testlib.h"
 
 int main(int argc, char **argv)
@@ -58,7 +59,8 @@ int main(int argc, char **argv)
        ))
        {
                XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
+               fprintf(stderr, "Error, unable to find a good port.\n");
+               exit(1);
        }
 
        if (is_overlay)

diff --git a/src/gallium/state_trackers/xvmc/tests/test_rendering.c b/src/gallium/state_trackers/xvmc/tests/test_rendering.c
index 5bfbea726b71806ae49e073a48fc68accfc2579c..b3b3794810d895691b57e99b5713cb915aee854a 100644 (file)
--- a/src/gallium/state_trackers/xvmc/tests/test_rendering.c
+++ b/src/gallium/state_trackers/xvmc/tests/test_rendering.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <error.h>
+#include <stdlib.h>
 #include "testlib.h"
 
 #define BLOCK_WIDTH                    8
@@ -84,9 +84,9 @@ static void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigne
        }
 
        if (fail)
-               error
-               (
-                       1, 0,
+       {
+               fprintf(
+                       stderr,
                        "Bad argument.\n"
                        "\n"
                        "Usage: %s [options]\n"
@@ -96,6 +96,8 @@ static void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigne
                        "\t-p\tPrompt for quit\n",
                        argv[0]
                );
+               exit(1);
+       }
 }
 
 static void Gradient(short *block, unsigned int start, unsigned int stop, int horizontal, unsigned int intra_unsigned)
@@ -166,7 +168,8 @@ int main(int argc, char **argv)
        ))
        {
                XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
+               fprintf(stderr, "Error, unable to find a good port.\n");
+               exit(1);
        }
 
        if (is_overlay)

diff --git a/src/gallium/state_trackers/xvmc/tests/test_subpicture.c b/src/gallium/state_trackers/xvmc/tests/test_subpicture.c
index ae0bc8b5a73330511b7ecc826f1740a02b9442c3..57ba1c751385e8de06caa5f1fbe3f258938a0c49 100644 (file)
--- a/src/gallium/state_trackers/xvmc/tests/test_subpicture.c
+++ b/src/gallium/state_trackers/xvmc/tests/test_subpicture.c
@@ -26,7 +26,6 @@
  **************************************************************************/
 
 #include <assert.h>
-#include <error.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "testlib.h"
@@ -87,7 +86,8 @@ int main(int argc, char **argv)
        ))
        {
                XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
+               fprintf(stderr, "Error, unable to find a good port.\n");
+               exit(1);
        }
 
        if (is_overlay)

diff --git a/src/gallium/state_trackers/xvmc/tests/test_surface.c b/src/gallium/state_trackers/xvmc/tests/test_surface.c
index 8145686a0eec0c28aab72ac83475a6a3eade4558..964ca82c506230117b39978b926319e200561bc3 100644 (file)
--- a/src/gallium/state_trackers/xvmc/tests/test_surface.c
+++ b/src/gallium/state_trackers/xvmc/tests/test_surface.c
@@ -26,7 +26,8 @@
  **************************************************************************/
 
 #include <assert.h>
-#include <error.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "testlib.h"
 
 int main(int argc, char **argv)
@@ -59,7 +60,8 @@ int main(int argc, char **argv)
        ))
        {
                XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
+               fprintf(stderr, "Error, unable to find a good port.\n");
+               exit(1);
        }
 
        if (is_overlay)