Module: Mesa
Branch: master
Commit: c451619dde9a510e5a2214f26c16ff28266b3018
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c451619dde9a510e5a2214f26c16ff28266b3018

Author: Jonathan Gray <[email protected]>
Date:   Thu Jul 11 09:52:00 2013 +0200

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

Signed-off-by: Jonathan Gray <[email protected]>
Reviewed-by: Christian König <[email protected]>

---

 src/gallium/state_trackers/xvmc/tests/xvmc_bench.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c 
b/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c
index fe85802..37360a6 100644
--- a/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c
+++ b/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <error.h>
+#include <stdlib.h>
 #include <sys/time.h>
 #include "testlib.h"
 
@@ -144,9 +144,9 @@ void ParseArgs(int argc, char **argv, struct Config *config)
        }
 
        if (fail)
-               error
-               (
-                       1, 0,
+       {
+               fprintf(
+                       stderr,
                        "Bad argument.\n"
                        "\n"
                        "Usage: %s [options]\n"
@@ -161,6 +161,8 @@ void ParseArgs(int argc, char **argv, struct Config *config)
                        "\tMB types: i,p,b\n",
                        argv[0]
                );
+               exit(1);
+       }
 
        if (config->output_width == 0)
                config->output_width = config->input_width;
@@ -214,7 +216,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)

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to