[xsrc/trunk]: xsrc/external/mit/xtrap/dist merge xtrap 1.0.3.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/1d9fe4eefecc
branches:  trunk
changeset: 10006:1d9fe4eefecc
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Dec 28 08:59:06 2018 +0000

description:
merge xtrap 1.0.3.

diffstat:

 external/mit/xtrap/dist/xtrapin.c    |   8 ++++----
 external/mit/xtrap/dist/xtrapinfo.c  |   4 ++--
 external/mit/xtrap/dist/xtrapout.c   |  24 ++++++++++++++----------
 external/mit/xtrap/dist/xtrapproto.c |   4 ++--
 external/mit/xtrap/dist/xtrapreset.c |   4 ++--
 external/mit/xtrap/dist/xtrapstats.c |   4 ++--
 6 files changed, 26 insertions(+), 22 deletions(-)

diffs (178 lines):

diff -r 74989d10f739 -r 1d9fe4eefecc external/mit/xtrap/dist/xtrapin.c
--- a/external/mit/xtrap/dist/xtrapin.c Fri Dec 28 08:56:33 2018 +0000
+++ b/external/mit/xtrap/dist/xtrapin.c Fri Dec 28 08:59:06 2018 +0000
@@ -102,8 +102,8 @@
 
 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 @@
 
     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 @@
 #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);
diff -r 74989d10f739 -r 1d9fe4eefecc external/mit/xtrap/dist/xtrapinfo.c
--- a/external/mit/xtrap/dist/xtrapinfo.c       Fri Dec 28 08:56:33 2018 +0000
+++ b/external/mit/xtrap/dist/xtrapinfo.c       Fri Dec 28 08:59:06 2018 +0000
@@ -68,13 +68,13 @@
     /* 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);
diff -r 74989d10f739 -r 1d9fe4eefecc external/mit/xtrap/dist/xtrapout.c
--- a/external/mit/xtrap/dist/xtrapout.c        Fri Dec 28 08:56:33 2018 +0000
+++ b/external/mit/xtrap/dist/xtrapout.c        Fri Dec 28 08:59:06 2018 +0000
@@ -88,6 +88,10 @@
 **--
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <inttypes.h>
 #include <stdio.h>
 #include <X11/extensions/xtraplib.h>
@@ -110,16 +114,16 @@
 
 
 /* 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 @@
     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 @@
         (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 @@
 
     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);
diff -r 74989d10f739 -r 1d9fe4eefecc external/mit/xtrap/dist/xtrapproto.c
--- a/external/mit/xtrap/dist/xtrapproto.c      Fri Dec 28 08:56:33 2018 +0000
+++ b/external/mit/xtrap/dist/xtrapproto.c      Fri Dec 28 08:59:06 2018 +0000
@@ -72,10 +72,10 @@
     /* 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);
diff -r 74989d10f739 -r 1d9fe4eefecc external/mit/xtrap/dist/xtrapreset.c
--- a/external/mit/xtrap/dist/xtrapreset.c      Fri Dec 28 08:56:33 2018 +0000
+++ b/external/mit/xtrap/dist/xtrapreset.c      Fri Dec 28 08:59:06 2018 +0000
@@ -67,14 +67,14 @@
     /* 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);
diff -r 74989d10f739 -r 1d9fe4eefecc external/mit/xtrap/dist/xtrapstats.c
--- a/external/mit/xtrap/dist/xtrapstats.c      Fri Dec 28 08:56:33 2018 +0000
+++ b/external/mit/xtrap/dist/xtrapstats.c      Fri Dec 28 08:59:06 2018 +0000
@@ -75,13 +75,13 @@
     /* 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);