Skip to content

N
nx-libs
Commit 96e43006 authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

Error.c: update nxagentPrintError

This is a partial copy from XlibInt.c's _XPrintDefaultError, which had some minor changes since being copied. Update to reflect these changes. Also comment some more lines as their result was unused an cluttered the output.
parent 525e1516
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
nx-X11/programs/Xserver/hw/nxagent/Error.c
View file @ 96e43006
...@@ -118,6 +118,8 @@ int nxagentErrorHandler(Display *dpy, XErrorEvent *event) ...@@ -118,6 +118,8 @@ int nxagentErrorHandler(Display *dpy, XErrorEvent *event)
/* copied from XlibInt.c */ /* copied from XlibInt.c */
/* extension stuff roughly commented out */ /* extension stuff roughly commented out */
/* FIXME: why? What's wrong with printing extension stuff?
We could drop this in favour of _XprintDefaultError then! */
static int nxagentPrintError(dpy, event, fp) static int nxagentPrintError(dpy, event, fp)
Display *dpy; Display *dpy;
XErrorEvent *event; XErrorEvent *event;
...@@ -138,7 +140,7 @@ static int nxagentPrintError(dpy, event, fp) ...@@ -138,7 +140,7 @@ static int nxagentPrintError(dpy, event, fp)
mesg, BUFSIZ); mesg, BUFSIZ);
(void) fprintf(fp, mesg, event->request_code); (void) fprintf(fp, mesg, event->request_code);
if (event->request_code < 128) { if (event->request_code < 128) {
sprintf(number, "%d", event->request_code); snprintf(number, sizeof(number), "%d", event->request_code);
XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
} else { } else {
/* for (ext = dpy->ext_procs; /* for (ext = dpy->ext_procs;
...@@ -146,7 +148,7 @@ static int nxagentPrintError(dpy, event, fp) ...@@ -146,7 +148,7 @@ static int nxagentPrintError(dpy, event, fp)
ext = ext->next) ext = ext->next)
; ;
if (ext) if (ext)
strcpy(buffer, ext->name); strncpy(buffer, ext->name, BUFSIZ);
else else
*/ */
buffer[0] = '\0'; buffer[0] = '\0';
...@@ -159,7 +161,7 @@ static int nxagentPrintError(dpy, event, fp) ...@@ -159,7 +161,7 @@ static int nxagentPrintError(dpy, event, fp)
(void) fprintf(fp, mesg, event->minor_code); (void) fprintf(fp, mesg, event->minor_code);
/* /*
if (ext) { if (ext) {
sprintf(mesg, "%s.%d", ext->name, event->minor_code); snprintf(mesg, sizeof(mesg), "%s.%d", ext->name, event->minor_code);
XGetErrorDatabaseText(dpy, "XRequest", mesg, "", buffer, BUFSIZ); XGetErrorDatabaseText(dpy, "XRequest", mesg, "", buffer, BUFSIZ);
(void) fprintf(fp, " (%s)", buffer); (void) fprintf(fp, " (%s)", buffer);
} }
...@@ -184,7 +186,7 @@ static int nxagentPrintError(dpy, event, fp) ...@@ -184,7 +186,7 @@ static int nxagentPrintError(dpy, event, fp)
bext = ext; bext = ext;
} }
if (bext) if (bext)
sprintf(buffer, "%s.%d", bext->name, snprintf(buffer, sizeof(buffer), "%s.%d", bext->name,
event->error_code - bext->codes.first_error); event->error_code - bext->codes.first_error);
else else
*/ */
...@@ -229,10 +231,10 @@ static int nxagentPrintError(dpy, event, fp) ...@@ -229,10 +231,10 @@ static int nxagentPrintError(dpy, event, fp)
mesg, BUFSIZ); mesg, BUFSIZ);
fputs(" ", fp); fputs(" ", fp);
(void) fprintf(fp, mesg, event->serial); (void) fprintf(fp, mesg, event->serial);
XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d", /* XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",
mesg, BUFSIZ); mesg, BUFSIZ);
fputs("\n ", fp); fputs("\n ", fp);
/* (void) fprintf(fp, mesg, dpy->request); */ (void) fprintf(fp, mesg, dpy->request); */
fputs("\n", fp); fputs("\n", fp);
if (event->error_code == BadImplementation) return 0; if (event->error_code == BadImplementation) return 0;
return 1; return 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment