Module Name: xsrc
Committed By: mrg
Date: Fri Dec 28 08:59:06 UTC 2018
Modified Files:
xsrc/external/mit/xtrap/dist: xtrapin.c xtrapinfo.c xtrapout.c
xtrapproto.c xtrapreset.c xtrapstats.c
Removed Files:
xsrc/external/mit/xtrap/dist: AUTHORS INSTALL NEWS
Log Message:
merge xtrap 1.0.3.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xtrap/dist/AUTHORS \
xsrc/external/mit/xtrap/dist/INSTALL xsrc/external/mit/xtrap/dist/NEWS
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xtrap/dist/xtrapin.c \
xsrc/external/mit/xtrap/dist/xtrapinfo.c \
xsrc/external/mit/xtrap/dist/xtrapproto.c \
xsrc/external/mit/xtrap/dist/xtrapreset.c \
xsrc/external/mit/xtrap/dist/xtrapstats.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xtrap/dist/xtrapout.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/xtrap/dist/xtrapin.c
diff -u xsrc/external/mit/xtrap/dist/xtrapin.c:1.2 xsrc/external/mit/xtrap/dist/xtrapin.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapin.c:1.2 Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapin.c Fri Dec 28 08:59:06 2018
@@ -102,8 +102,8 @@ extern int opterr;
static Boolean grabFlag = False;
-FILE *ifp;
-XrmOptionDescRec optionTable [] =
+static FILE *ifp;
+static XrmOptionDescRec optionTable [] =
{
{"-f", "*script", XrmoptionSepArg, (caddr_t) NULL},
{"-g", "*grabServer",XrmoptionSkipArg, (caddr_t) NULL},
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
appW = XtAppInitialize(&app,"XTrap",optionTable,(Cardinal)1L,
(int *)&argc, (String *)argv, (String *)NULL,(ArgList)&tmp,
- (Cardinal)0);
+ 0);
dpy = XtDisplay(appW);
#ifdef DEBUG
@@ -181,7 +181,7 @@ main(int argc, char *argv[])
#endif
printf("Display: %s \n", DisplayString(dpy));
- if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+ if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
{
fprintf(stderr,"%s: could not initialize XTrap extension\n", ProgName);
exit (1L);
Index: xsrc/external/mit/xtrap/dist/xtrapinfo.c
diff -u xsrc/external/mit/xtrap/dist/xtrapinfo.c:1.2 xsrc/external/mit/xtrap/dist/xtrapinfo.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapinfo.c:1.2 Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapinfo.c Fri Dec 28 08:59:06 2018
@@ -68,13 +68,13 @@ main(int argc, char *argv[])
/* Connect to Server */
appW = XtAppInitialize(&app,"XTrap",NULL,(Cardinal)0L,
(int *)&argc, (String *)argv, (String *)NULL, (ArgList)&tmp,
- (Cardinal)0);
+ 0);
dpy = XtDisplay(appW);
#ifdef DEBUG
XSynchronize(dpy, True);
#endif
printf("Display: %s \n", DisplayString(dpy));
- if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+ if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
{
fprintf(stderr,"%s: could not initialize extension\n",argv[0]);
exit(1L);
Index: xsrc/external/mit/xtrap/dist/xtrapproto.c
diff -u xsrc/external/mit/xtrap/dist/xtrapproto.c:1.2 xsrc/external/mit/xtrap/dist/xtrapproto.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapproto.c:1.2 Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapproto.c Fri Dec 28 08:59:06 2018
@@ -72,10 +72,10 @@ main(int argc, char *argv[])
/* Connect to Server */
appW = XtAppInitialize(&app,"XTrap",NULL,(Cardinal)0L,
(int *)&argc, (String *)argv, (String *)NULL,(ArgList)&tmp,
- (Cardinal)0);
+ 0);
dpy = XtDisplay(appW);
printf("Display: %s \n", DisplayString(dpy));
- if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+ if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
{
fprintf(stderr,"%s: could not initialize extension\n",argv[0]);
exit(1L);
Index: xsrc/external/mit/xtrap/dist/xtrapreset.c
diff -u xsrc/external/mit/xtrap/dist/xtrapreset.c:1.2 xsrc/external/mit/xtrap/dist/xtrapreset.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapreset.c:1.2 Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapreset.c Fri Dec 28 08:59:06 2018
@@ -67,14 +67,14 @@ main(int argc, char *argv[])
/* Connect to Server */
appW = XtAppInitialize(&app,"XTrap",NULL,(Cardinal)0L,
(int *)&argc, (String *)argv, (String *)NULL,(ArgList)&tmp,
- (Cardinal)0);
+ 0);
dpy = XtDisplay(appW);
#ifdef DEBUG
XSynchronize(dpy, True);
#endif
printf("Resetting Display: %s \n", DisplayString(dpy));
- if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+ if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
{
fprintf(stderr,"%s: could not initialize extension\n",argv[0]);
exit (1L);
Index: xsrc/external/mit/xtrap/dist/xtrapstats.c
diff -u xsrc/external/mit/xtrap/dist/xtrapstats.c:1.2 xsrc/external/mit/xtrap/dist/xtrapstats.c:1.3
--- xsrc/external/mit/xtrap/dist/xtrapstats.c:1.2 Tue Jun 17 03:46:27 2014
+++ xsrc/external/mit/xtrap/dist/xtrapstats.c Fri Dec 28 08:59:06 2018
@@ -75,13 +75,13 @@ main(int argc, char *argv[])
/* Connect to Server */
appW = XtAppInitialize(&app,"XTrap",NULL,(Cardinal)0L,
(int *)&argc, (String *)argv, (String *)NULL,(ArgList)&tmp,
- (Cardinal)0);
+ 0);
dpy = XtDisplay(appW);
#ifdef DEBUG
XSynchronize(dpy, True);
#endif
printf("Display: %s \n", DisplayString(dpy));
- if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+ if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
{
fprintf(stderr,"%s: could not initialize extension\n",argv[0]);
exit(1L);
Index: xsrc/external/mit/xtrap/dist/xtrapout.c
diff -u xsrc/external/mit/xtrap/dist/xtrapout.c:1.4 xsrc/external/mit/xtrap/dist/xtrapout.c:1.5
--- xsrc/external/mit/xtrap/dist/xtrapout.c:1.4 Sun Mar 25 16:18:27 2018
+++ xsrc/external/mit/xtrap/dist/xtrapout.c Fri Dec 28 08:59:06 2018
@@ -88,6 +88,10 @@ SOFTWARE.
**--
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <inttypes.h>
#include <stdio.h>
#include <X11/extensions/xtraplib.h>
@@ -110,16 +114,16 @@ extern int opterr;
/* Forward declarations */
-static void SetGlobalDone (int);
+static void SetGlobalDone (int unused );
static void print_req_callback (XETC *tc , XETrapDatum *data ,
- unsigned char *my_buf );
+ BYTE *my_buf );
static void print_evt_callback (XETC *tc , XETrapDatum *data ,
- unsigned char *my_buf );
+ BYTE *my_buf );
-FILE *ofp;
-Bool GlobalDone = False;
-XrmOptionDescRec optionTable [] =
+static FILE *ofp;
+static Bool GlobalDone = False;
+static XrmOptionDescRec optionTable [] =
{
{"-f", "*script", XrmoptionSepArg, (caddr_t) NULL},
{"-e", "*eventFlag", XrmoptionSkipArg, (caddr_t) NULL},
@@ -133,7 +137,7 @@ static void SetGlobalDone(int unused)
return;
}
-static void print_req_callback(XETC *tc, XETrapDatum *data, unsigned char *my_buf)
+static void print_req_callback(XETC *tc, XETrapDatum *data, BYTE *my_buf)
{
char *req_type;
req_type = (data->u.req.reqType == XETrapGetExtOpcode(tc) ? "XTrap" :
@@ -143,7 +147,7 @@ static void print_req_callback(XETC *tc,
(long)data->u.req.id);
}
-static void print_evt_callback(XETC *tc, XETrapDatum *data, unsigned char *my_buf)
+static void print_evt_callback(XETC *tc, XETrapDatum *data, BYTE *my_buf)
{
static Time last_time = 0;
int delta;
@@ -225,14 +229,14 @@ main(int argc, char *argv[])
appW = XtAppInitialize(&app,"XTrap",optionTable,(Cardinal)2L,
(int *)&argc, (String *)argv, (String *)NULL,(ArgList)&tmp,
- (Cardinal)0);
+ 0);
dpy = XtDisplay(appW);
#ifdef DEBUG
XSynchronize(dpy, True);
#endif
fprintf(stderr,"Display: %s \n", DisplayString(dpy));
- if ((tc = XECreateTC(dpy,0L, NULL)) == False)
+ if ((tc = XECreateTC(dpy,0L, NULL)) == NULL)
{
fprintf(stderr,"%s: could not initialize XTrap extension\n",ProgName);
exit (1L);
