Module Name: xsrc
Committed By: mrg
Date: Fri May 31 00:37:09 UTC 2013
Modified Files:
xsrc/external/mit/libXTrap/dist/src: XEConTxt.c
Removed Files:
xsrc/external/mit/libXTrap/dist: autogen.sh mkinstalldirs
Log Message:
merge libXTrap 1.0.1
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXTrap/dist/autogen.sh \
xsrc/external/mit/libXTrap/dist/mkinstalldirs
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXTrap/dist/src/XEConTxt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXTrap/dist/src/XEConTxt.c
diff -u xsrc/external/mit/libXTrap/dist/src/XEConTxt.c:1.2 xsrc/external/mit/libXTrap/dist/src/XEConTxt.c:1.3
--- xsrc/external/mit/libXTrap/dist/src/XEConTxt.c:1.2 Thu Aug 11 22:10:52 2011
+++ xsrc/external/mit/libXTrap/dist/src/XEConTxt.c Fri May 31 00:37:09 2013
@@ -49,8 +49,6 @@ SOFTWARE.
# define FALSE 0L
#endif
-extern char *extensionData;
-
static XETC TC;
/*
@@ -71,7 +69,7 @@ XETC *XECreateTC(Display *dpy, CARD32 va
{
firsttime = False;
/* The first Trap Context is the Template (default) TC */
- (void)memset(tc,0L,sizeof(*tc));
+ memset(tc,0L,sizeof(*tc));
tc->eventBase = 0x7FFFFFFFL;
tc->errorBase = 0x7FFFFFFFL;
tc->values.v.max_pkt_size = 0x7FFFL;
@@ -325,10 +323,6 @@ void XEFreeTC(XETC *tc)
}
XtFree((XtPointer)tc);
- if (extensionData)
- {
- XtFree(extensionData);
- }
}
return;
}
@@ -342,7 +336,7 @@ int XETrapSetMaxPacket(XETC *tc, Bool se
XETCValues tcv;
int status = True;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagMaxPacket(&tcv, valid, True);
XETrapSetCfgFlagMaxPacket(&tcv, data, set_flag);
XETrapSetCfgMaxPktSize(&tcv, size);
@@ -355,7 +349,7 @@ int XETrapSetCommandKey(XETC *tc, Bool s
int status = True;
KeyCode cmd_keycode;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagCmd(&tcv, valid, True);
XETrapSetCfgFlagCmd(&tcv, data, set_flag);
if (set_flag == True)
@@ -389,7 +383,7 @@ int XETrapSetTimestamps(XETC *tc, Bool s
XETCValues tcv;
int status = True;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagTimestamp(&tcv, valid, True);
XETrapSetCfgFlagTimestamp(&tcv, data, set_flag);
XETrapSetValFlagDeltaTimes(&tcv, delta_flag);
@@ -402,7 +396,7 @@ int XETrapSetWinXY(XETC *tc, Bool set_fl
XETCValues tcv;
int status = True;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagWinXY(&tcv, valid, True);
XETrapSetCfgFlagWinXY(&tcv, data, set_flag);
status = XEChangeTC(tc, TCWinXY, &tcv);
@@ -414,7 +408,7 @@ int XETrapSetCursor(XETC *tc, Bool set_f
XETCValues tcv;
int status = True;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagCursor(&tcv, valid, True);
XETrapSetCfgFlagCursor(&tcv, data, set_flag);
status = XEChangeTC(tc, TCCursor, &tcv);
@@ -426,7 +420,7 @@ int XETrapSetXInput(XETC *tc, Bool set_f
XETCValues tcv;
int status = True;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagXInput(&tcv, valid, True);
XETrapSetCfgFlagXInput(&tcv, data, set_flag);
status = XEChangeTC(tc, TCXInput, &tcv);
@@ -438,7 +432,7 @@ int XETrapSetColorReplies(XETC *tc, Bool
XETCValues tcv;
int status = True;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagColorReplies(&tcv, valid, True);
XETrapSetCfgFlagColorReplies(&tcv, data, set_flag);
status = XEChangeTC(tc, TCColorReplies, &tcv);
@@ -450,7 +444,7 @@ int XETrapSetGrabServer(XETC *tc, Bool s
XETCValues tcv;
int status = True;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagGrabServer(&tcv, valid, True);
XETrapSetCfgFlagGrabServer(&tcv, data, set_flag);
status = XEChangeTC(tc, TCGrabServer, &tcv);
@@ -462,7 +456,7 @@ int XETrapSetStatistics(XETC *tc, Bool s
XETCValues tcv;
int status = True;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagStatistics(&tcv, valid, True);
XETrapSetCfgFlagStatistics(&tcv, data, set_flag);
status = XEChangeTC(tc, TCStatistics, &tcv);
@@ -475,7 +469,7 @@ int XETrapSetRequests(XETC *tc, Bool set
int status = True;
int i;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagRequest(&tcv, valid, True);
XETrapSetCfgFlagRequest(&tcv, data, set_flag);
for (i=0; i<256L; i++)
@@ -492,7 +486,7 @@ int XETrapSetEvents(XETC *tc, Bool set_f
int status = True;
int i;
- (void)memset((char *)&tcv,0L,sizeof(tcv));
+ memset((char *)&tcv,0L,sizeof(tcv));
XETrapSetCfgFlagEvent(&tcv, valid, True);
XETrapSetCfgFlagEvent(&tcv, data, set_flag);
for (i=KeyPress; i<=MotionNotify; i++)
