Mercurial > mplayer.hg
changeset 35633:be047c67cb96
Cosmetic: Adjust parameter names to r35725 and r35726 harmonization.
Additionally, add some blank lines.
| author | ib |
|---|---|
| date | Thu, 10 Jan 2013 12:21:19 +0000 |
| parents | 07ecd8abd362 |
| children | b98a97813f10 |
| files | gui/wm/ws.c |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/wm/ws.c Thu Jan 10 12:04:19 2013 +0000 +++ b/gui/wm/ws.c Thu Jan 10 12:21:19 2013 +0000 @@ -191,16 +191,18 @@ // Init X Window System. // ---------------------------------------------------------------------------------------------- -static int wsErrorHandler(Display *dpy, XErrorEvent *Event) +static int wsErrorHandler(Display *display, XErrorEvent *event) { char type[128]; - XGetErrorText(dpy, Event->error_code, type, 128); + XGetErrorText(display, event->error_code, type, 128); + fprintf(stderr, "[ws] Error in display.\n"); - fprintf(stderr, "[ws] Error code: %d ( %s )\n", Event->error_code, type); - fprintf(stderr, "[ws] Request code: %d\n", Event->request_code); - fprintf(stderr, "[ws] Minor code: %d\n", Event->minor_code); + fprintf(stderr, "[ws] Error code: %d ( %s )\n", event->error_code, type); + fprintf(stderr, "[ws] Request code: %d\n", event->request_code); + fprintf(stderr, "[ws] Minor code: %d\n", event->minor_code); fprintf(stderr, "[ws] Modules: %s\n", current_module ? current_module : "(NULL)"); + return 0; }