Use XDisplayName() when reporting errors (bug 8079).

diff --git a/progs/xdemos/glthreads.c b/progs/xdemos/glthreads.c
index 83413383dd4d8f66c43708a3453d32d35394f38a..989697fbcaab8d6cb2601f430c046f81167c8714 100644 (file)
--- a/progs/xdemos/glthreads.c
+++ b/progs/xdemos/glthreads.c
@@ -473,7 +473,7 @@ main(int argc, char *argv[])
 
       dpy = XOpenDisplay(displayName);
       if (!dpy) {
-         fprintf(stderr, "Unable to open display %s\n", displayName);
+         fprintf(stderr, "Unable to open display %s\n", XDisplayName(displayName));
          return -1;
       }
    }

diff --git a/progs/xdemos/glxcontexts.c b/progs/xdemos/glxcontexts.c
index fbc296ef625eac257e9ab7f14ac5ad6a275c88f1..a9ff326ed5ed8439eb23db49c6a2f25aa5c84d2f 100644 (file)
--- a/progs/xdemos/glxcontexts.c
+++ b/progs/xdemos/glxcontexts.c
@@ -587,8 +587,8 @@ main(int argc, char *argv[])
 
    dpy = XOpenDisplay(dpyName);
    if (!dpy) {
-      printf("Error: couldn't open display %s\n",
-            dpyName ? dpyName : getenv("DISPLAY"));
+      fprintf(stderr, "Error: couldn't open display %s\n",
+             XDisplayName(dpyName));
       return -1;
    }
 

diff --git a/progs/xdemos/glxgears_fbconfig.c b/progs/xdemos/glxgears_fbconfig.c
index acbadd21ac52e6d8dec2ec14413f774788938dad..2dac00b75d1010d3075cf241e66ab3ebfaa0a7b2 100644 (file)
--- a/progs/xdemos/glxgears_fbconfig.c
+++ b/progs/xdemos/glxgears_fbconfig.c
@@ -575,7 +575,7 @@ main(int argc, char *argv[])
 
    dpy = XOpenDisplay(dpyName);
    if (!dpy) {
-      printf("Error: couldn't open display %s\n", dpyName);
+      printf("Error: couldn't open display %s\n", XDisplayName(dpyName));
       return -1;
    }
 

diff --git a/progs/xdemos/glxheads.c b/progs/xdemos/glxheads.c
index 0145a70e91c250cb93922db65655bffaa7c673d8..b3290e90d51d26c1aae9641e0e9eab39cbb2b59e 100644 (file)
--- a/progs/xdemos/glxheads.c
+++ b/progs/xdemos/glxheads.c
@@ -57,7 +57,7 @@ static int NumHeads = 0;
 static void
 Error(const char *display, const char *msg)
 {
-   fprintf(stderr, "Error on display %s - %s\n", display, msg);
+   fprintf(stderr, "Error on display %s - %s\n", XDisplayName(display), msg);
    exit(1);
 }
 

diff --git a/progs/xdemos/glxinfo.c b/progs/xdemos/glxinfo.c
index a1aca5ad31e800399b664552bca11323273a329d..3e8e0be52031c67ab88a63ae2bf51f923d635e58 100644 (file)
--- a/progs/xdemos/glxinfo.c
+++ b/progs/xdemos/glxinfo.c
@@ -939,7 +939,7 @@ main(int argc, char *argv[])
 
    dpy = XOpenDisplay(displayName);
    if (!dpy) {
-      fprintf(stderr, "Error: unable to open display %s\n", displayName);
+      fprintf(stderr, "Error: unable to open display %s\n", XDisplayName(displayName));
       return -1;
    }
 

diff --git a/progs/xdemos/glxswapcontrol.c b/progs/xdemos/glxswapcontrol.c
index 0ed5ebe4722a0ab537e39dabcc9b304ffc7e0964..d9be984be57be77e8dba3f532b31a5a4810ff574 100644 (file)
--- a/progs/xdemos/glxswapcontrol.c
+++ b/progs/xdemos/glxswapcontrol.c
@@ -749,7 +749,7 @@ main(int argc, char *argv[])
 
    dpy = XOpenDisplay(dpyName);
    if (!dpy) {
-      printf("Error: couldn't open display %s\n", dpyName);
+      printf("Error: couldn't open display %s\n", XDisplayName(dpyName));
       return -1;
    }
 

diff --git a/progs/xdemos/manywin.c b/progs/xdemos/manywin.c
index c9cca7513418a15f01b7d3522a5844ce017bb3ea..cfea555210af8c615803a4347baa6260f0ef2eca 100644 (file)
--- a/progs/xdemos/manywin.c
+++ b/progs/xdemos/manywin.c
@@ -59,7 +59,7 @@ static GLuint TexObj = 0;
 static void
 Error(const char *display, const char *msg)
 {
-   fprintf(stderr, "Error on display %s - %s\n", display, msg);
+   fprintf(stderr, "Error on display %s - %s\n", XDisplayName(display), msg);
    exit(1);
 }
 

diff --git a/progs/xdemos/opencloseopen.c b/progs/xdemos/opencloseopen.c
index 2e4de24c71d7a4327ba443dcac38765d432586e5..0b8d06184319416579d842d1489bbfc01b1a6071 100644 (file)
--- a/progs/xdemos/opencloseopen.c
+++ b/progs/xdemos/opencloseopen.c
@@ -91,7 +91,7 @@ make_window( const char * dpyName, const char *name,
 
    dpy = XOpenDisplay(dpyName);
    if (!dpy) {
-      printf("Error: couldn't open display %s\n", dpyName);
+      printf("Error: couldn't open display %s\n", XDisplayName(dpyName));
       exit(1);
    }
 

diff --git a/progs/xdemos/pbinfo.c b/progs/xdemos/pbinfo.c
index 88d93c8da625cb21f7e024523ea8f8858c7042bd..b43adf1bb70130b90c0b46637d0285c43e5da2b6 100644 (file)
--- a/progs/xdemos/pbinfo.c
+++ b/progs/xdemos/pbinfo.c
@@ -95,7 +95,7 @@ main(int argc, char *argv[])
    dpy = XOpenDisplay(dpyName);
 
    if (!dpy) {
-      printf("Error: couldn't open display %s\n", dpyName ? dpyName : ":0");
+      printf("Error: couldn't open display %s\n", XDisplayName(dpyName));
       return 1;
    }
 

diff --git a/progs/xdemos/yuvrect_client.c b/progs/xdemos/yuvrect_client.c
index 48f82cb75994496bb3920e2b1eec494235cb8178..e2b79a7c0e19443ba05b190a30438e254e068b48 100644 (file)
--- a/progs/xdemos/yuvrect_client.c
+++ b/progs/xdemos/yuvrect_client.c
@@ -296,7 +296,7 @@ main(int argc, char *argv[])
    dpy = XOpenDisplay(dpyName);
    if (!dpy) {
       printf("Error: couldn't open display %s\n",
-            dpyName ? dpyName : getenv("DISPLAY"));
+            XDisplayName(dpyName));
       return -1;
    }