Use XDisplayName() when reporting errors (bug 8079).
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user