aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-01-03 00:18:39 +0100
committerUlrich Sibiller <uli42@gmx.de>2018-01-07 01:27:07 +0100
commit96e430069b24e0a4cd53e47e38786802999d31f4 (patch)
tree6f20fb033705859ed51656dffa43f2d93bbff5ef /nx-X11/programs/Xserver
parent525e151681ec93657f027645ff0d8e0d487d6abf (diff)
downloadnx-libs-96e430069b24e0a4cd53e47e38786802999d31f4.tar.gz
nx-libs-96e430069b24e0a4cd53e47e38786802999d31f4.tar.bz2
nx-libs-96e430069b24e0a4cd53e47e38786802999d31f4.zip
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.
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Error.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c
index 7420a8b3d..4493840d4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c
@@ -118,6 +118,8 @@ int nxagentErrorHandler(Display *dpy, XErrorEvent *event)
/* copied from XlibInt.c */
/* 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)
Display *dpy;
XErrorEvent *event;
@@ -138,7 +140,7 @@ static int nxagentPrintError(dpy, event, fp)
mesg, BUFSIZ);
(void) fprintf(fp, mesg, event->request_code);
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);
} else {
/* for (ext = dpy->ext_procs;
@@ -146,7 +148,7 @@ static int nxagentPrintError(dpy, event, fp)
ext = ext->next)
;
if (ext)
- strcpy(buffer, ext->name);
+ strncpy(buffer, ext->name, BUFSIZ);
else
*/
buffer[0] = '\0';
@@ -159,7 +161,7 @@ static int nxagentPrintError(dpy, event, fp)
(void) fprintf(fp, mesg, event->minor_code);
/*
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);
(void) fprintf(fp, " (%s)", buffer);
}
@@ -184,7 +186,7 @@ static int nxagentPrintError(dpy, event, fp)
bext = ext;
}
if (bext)
- sprintf(buffer, "%s.%d", bext->name,
+ snprintf(buffer, sizeof(buffer), "%s.%d", bext->name,
event->error_code - bext->codes.first_error);
else
*/
@@ -229,10 +231,10 @@ static int nxagentPrintError(dpy, event, fp)
mesg, BUFSIZ);
fputs(" ", fp);
(void) fprintf(fp, mesg, event->serial);
- XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",
+ /* XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",
mesg, BUFSIZ);
fputs("\n ", fp);
- /* (void) fprintf(fp, mesg, dpy->request); */
+ (void) fprintf(fp, mesg, dpy->request); */
fputs("\n", fp);
if (event->error_code == BadImplementation) return 0;
return 1;