diff options
| -rw-r--r-- | include/X11/Xmu/Drawing.h | 4 | ||||
| -rw-r--r-- | src/EditresCom.c | 23 |
2 files changed, 12 insertions, 15 deletions
diff --git a/include/X11/Xmu/Drawing.h b/include/X11/Xmu/Drawing.h index 587fb3e..ad62eb7 100644 --- a/include/X11/Xmu/Drawing.h +++ b/include/X11/Xmu/Drawing.h @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.6 2001/12/14 19:55:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.7 2003/11/17 22:20:22 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities @@ -38,12 +38,10 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xlib.h> #include <X11/Xfuncproto.h> -#if NeedFunctionPrototypes #include <stdio.h> #if ! defined(_XtIntrinsic_h) && ! defined(PIXEL_ALREADY_TYPEDEFED) typedef unsigned long Pixel; #endif -#endif _XFUNCPROTOBEGIN diff --git a/src/EditresCom.c b/src/EditresCom.c index 5ddd653..4b6a5cc 100644 --- a/src/EditresCom.c +++ b/src/EditresCom.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.17 2002/12/03 18:07:59 paulo Exp $ */ +/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.21 2003/10/24 15:44:05 tsi Exp $ */ /* * Author: Chris D. Peterson, Dave Sternlicht, MIT X Consortium @@ -135,7 +135,7 @@ typedef struct _Globals { */ static Widget _FindChild(Widget, int, int); static void _XEditresGetStringValues(Widget, Arg*, int); -static XtPointer BuildReturnPacket(ResIdent, EditresCommand, ProtocolStream*); +static XtPointer BuildReturnPacket(ResIdent, EditResError, ProtocolStream*); static void CommandDone(Widget, Atom*, Atom*); static Boolean ConvertReturnCommand(Widget, Atom*, Atom*, Atom*, XtPointer*, unsigned long*, int*); @@ -166,7 +166,7 @@ static Bool isApplicationShell(Widget); static void LoadResources(Widget); static Bool PositionInChild(Widget, int, int); static int qcmp_widget_list(register _Xconst void*, register _Xconst void*); -static void SendCommand(Widget, Atom, ResIdent, EditresCommand, +static void SendCommand(Widget, Atom, ResIdent, EditResError, ProtocolStream*); static void SendFailure(Widget, Atom, ResIdent, char*); static char *VerifyWidget(Widget, WidgetInfo*); @@ -631,20 +631,19 @@ SendFailure(Widget w, Atom sel, ResIdent ident, char *str) * packet to send */ static XtPointer -BuildReturnPacket(ResIdent ident, EditresCommand command, - ProtocolStream *stream) +BuildReturnPacket(ResIdent ident, EditResError error, ProtocolStream *stream) { long old_alloc, old_size; - unsigned char *old_current; + unsigned char *old_current; /* * We have cleverly keep enough space at the top of the header * for the return protocol stream, so all we have to do is - * fill in the space + * fill in the space */ /* * Fool the insert routines into putting the header in the right - * place while being damn sure not to realloc (that would be very bad.) + * place while being damn sure not to realloc (that would be very bad.) */ old_current = stream->current; old_alloc = stream->alloc; @@ -654,7 +653,7 @@ BuildReturnPacket(ResIdent ident, EditresCommand command, stream->alloc = stream->size + (2 * HEADER_SIZE); _XEditResPut8(stream, ident); - _XEditResPut8(stream, (unsigned char)command); + _XEditResPut8(stream, (unsigned char)error); _XEditResPut32(stream, old_size); stream->alloc = old_alloc; @@ -678,10 +677,10 @@ BuildReturnPacket(ResIdent ident, EditresCommand command, * Builds a return command line */ static void -SendCommand(Widget w, Atom sel, ResIdent ident, EditresCommand command, +SendCommand(Widget w, Atom sel, ResIdent ident, EditResError error, ProtocolStream *stream) { - BuildReturnPacket(ident, command, stream); + BuildReturnPacket(ident, error, stream); globals.command_stream = stream; /* @@ -997,7 +996,7 @@ HandleToolkitErrors(String name, String type, String class, String msg, XmuSnprintf(buf, sizeof(buf), msg, params[0]); else if (streq(name, "conversionFailed") || streq(name, "conversionError")) { - if (streq(info->event->value, XtRString)) + if (streq((String)info->event->value, XtRString)) XmuSnprintf(buf, sizeof(buf), "Could not convert the string '%s' for the `%s' " "resource.", info->event->value, info->event->name); |