Fixes for compilation with gcc 15

[micropolis] / src / tk / tkbind.c

diff --git a/src/tk/tkbind.c b/src/tk/tkbind.c
index d32d8c9eaf4abae5c6c6fea242fd8f3f64baa58b..9c11224bf3c9564fae37148f9fab7369506f74b8 100644 (file)
--- a/src/tk/tkbind.c
+++ b/src/tk/tkbind.c
@@ -403,11 +403,12 @@ static PatSeq *           MatchPatterns _ANSI_ARGS_((TkDisplay *dispPtr,
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-Tk_BindingTable
-Tk_CreateBindingTable(interp)
-    Tcl_Interp *interp;                /* Interpreter to associate with the binding
+Tk_BindingTable 
+Tk_CreateBindingTable (
+    Tcl_Interp *interp         /* Interpreter to associate with the binding

                                 * table:  commands are executed in this
                                 * interpreter. */
                                 * table:  commands are executed in this
                                 * interpreter. */

+)

 {
     register BindingTable *bindPtr;
     int i;
 {
     register BindingTable *bindPtr;
     int i;


@@ -479,10 +480,11 @@ Tk_CreateBindingTable(interp)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-void
-Tk_DeleteBindingTable(bindingTable)
-    Tk_BindingTable bindingTable;      /* Token for the binding table to
+void 
+Tk_DeleteBindingTable (
+    Tk_BindingTable bindingTable       /* Token for the binding table to

                                         * destroy. */
                                         * destroy. */

+)

 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     PatSeq *psPtr, *nextPtr;
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     PatSeq *psPtr, *nextPtr;


@@ -539,19 +541,20 @@ Tk_DeleteBindingTable(bindingTable)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-unsigned long
-Tk_CreateBinding(interp, bindingTable, object, eventString, command, append)
-    Tcl_Interp *interp;                        /* Used for error reporting. */
-    Tk_BindingTable bindingTable;      /* Table in which to create binding. */
-    ClientData object;                 /* Token for object with which binding
+unsigned long 
+Tk_CreateBinding (
+    Tcl_Interp *interp,                        /* Used for error reporting. */
+    Tk_BindingTable bindingTable,      /* Table in which to create binding. */
+    ClientData object,                 /* Token for object with which binding

                                         * is associated. */
                                         * is associated. */

-    char *eventString;                 /* String describing event sequence
+    char *eventString,                 /* String describing event sequence

                                         * that triggers binding. */
                                         * that triggers binding. */

-    char *command;                     /* Contains Tcl command to execute
+    char *command,                     /* Contains Tcl command to execute

                                         * when binding triggers. */
                                         * when binding triggers. */

-    int append;                                /* 0 means replace any existing
+    int append                         /* 0 means replace any existing

                                         * binding for eventString;  1 means
                                         * append to that binding. */
                                         * binding for eventString;  1 means
                                         * append to that binding. */

+)

 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     register PatSeq *psPtr;
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     register PatSeq *psPtr;


@@ -608,14 +611,15 @@ Tk_CreateBinding(interp, bindingTable, object, eventString, command, append)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-int
-Tk_DeleteBinding(interp, bindingTable, object, eventString)
-    Tcl_Interp *interp;                        /* Used for error reporting. */
-    Tk_BindingTable bindingTable;      /* Table in which to delete binding. */
-    ClientData object;                 /* Token for object with which binding
+int 
+Tk_DeleteBinding (
+    Tcl_Interp *interp,                        /* Used for error reporting. */
+    Tk_BindingTable bindingTable,      /* Table in which to delete binding. */
+    ClientData object,                 /* Token for object with which binding

                                         * is associated. */
                                         * is associated. */

-    char *eventString;                 /* String describing event sequence
+    char *eventString                  /* String describing event sequence

                                         * that triggers binding. */
                                         * that triggers binding. */

+)

 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     register PatSeq *psPtr, *prevPtr;
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     register PatSeq *psPtr, *prevPtr;


@@ -697,14 +701,15 @@ Tk_DeleteBinding(interp, bindingTable, object, eventString)
  */
 
 char *
  */
 
 char *

-Tk_GetBinding(interp, bindingTable, object, eventString)
-    Tcl_Interp *interp;                        /* Interpreter for error reporting. */
-    Tk_BindingTable bindingTable;      /* Table in which to look for
+Tk_GetBinding (
+    Tcl_Interp *interp,                        /* Interpreter for error reporting. */
+    Tk_BindingTable bindingTable,      /* Table in which to look for

                                         * binding. */
                                         * binding. */

-    ClientData object;                 /* Token for object with which binding
+    ClientData object,                 /* Token for object with which binding

                                         * is associated. */
                                         * is associated. */

-    char *eventString;                 /* String describing event sequence
+    char *eventString                  /* String describing event sequence

                                         * that triggers binding. */
                                         * that triggers binding. */

+)

 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     register PatSeq *psPtr;
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     register PatSeq *psPtr;


@@ -737,12 +742,13 @@ Tk_GetBinding(interp, bindingTable, object, eventString)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-void
-Tk_GetAllBindings(interp, bindingTable, object)
-    Tcl_Interp *interp;                        /* Interpreter for error reporting. */
-    Tk_BindingTable bindingTable;      /* Table in which to look for
+void 
+Tk_GetAllBindings (
+    Tcl_Interp *interp,                        /* Interpreter for error reporting. */
+    Tk_BindingTable bindingTable,      /* Table in which to look for

                                         * bindings. */
                                         * bindings. */

-    ClientData object;                 /* Token for object. */
+    ClientData object                  /* Token for object. */
+)

 
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
 
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;


@@ -892,11 +898,12 @@ Tk_GetAllBindings(interp, bindingTable, object)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-void
-Tk_DeleteAllBindings(bindingTable, object)
-    Tk_BindingTable bindingTable;      /* Table in which to delete
+void 
+Tk_DeleteAllBindings (
+    Tk_BindingTable bindingTable,      /* Table in which to delete

                                         * bindings. */
                                         * bindings. */

-    ClientData object;                 /* Token for object. */
+    ClientData object                  /* Token for object. */
+)

 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     register PatSeq *psPtr, *prevPtr;
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     register PatSeq *psPtr, *prevPtr;


@@ -963,17 +970,18 @@ Tk_DeleteAllBindings(bindingTable, object)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-void
-Tk_BindEvent(bindingTable, eventPtr, tkwin, numObjects, objectPtr)
-    Tk_BindingTable bindingTable;      /* Table in which to look for
+void 
+Tk_BindEvent (
+    Tk_BindingTable bindingTable,      /* Table in which to look for

                                         * bindings. */
                                         * bindings. */

-    XEvent *eventPtr;                  /* What actually happened. */
-    Tk_Window tkwin;                   /* Window on display where event
+    XEvent *eventPtr,                  /* What actually happened. */
+    Tk_Window tkwin,                   /* Window on display where event

                                         * occurred (needed in order to
                                         * locate display information). */
                                         * occurred (needed in order to
                                         * locate display information). */

-    int numObjects;                    /* Number of objects at *objectPtr. */
-    ClientData *objectPtr;             /* Array of one or more objects
+    int numObjects,                    /* Number of objects at *objectPtr. */
+    ClientData *objectPtr              /* Array of one or more objects

                                         * to check for a matching binding. */
                                         * to check for a matching binding. */

+)

 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;


@@ -1121,21 +1129,22 @@ Tk_BindEvent(bindingTable, eventPtr, tkwin, numObjects, objectPtr)
  */
 
 static PatSeq *
  */
 
 static PatSeq *

-FindSequence(interp, bindPtr, object, eventString, create, maskPtr)
-    Tcl_Interp *interp;                /* Interpreter to use for error
+FindSequence (
+    Tcl_Interp *interp,                /* Interpreter to use for error

                                 * reporting. */
                                 * reporting. */

-    BindingTable *bindPtr;     /* Table to use for lookup. */
-    ClientData object;         /* Token for object(s) with which binding
+    BindingTable *bindPtr,     /* Table to use for lookup. */
+    ClientData object,         /* Token for object(s) with which binding

                                 * is associated. */
                                 * is associated. */

-    char *eventString;         /* String description of pattern to
+    char *eventString,         /* String description of pattern to

                                 * match on.  See user documentation
                                 * for details. */
                                 * match on.  See user documentation
                                 * for details. */

-    int create;                        /* 0 means don't create the entry if
+    int create,                        /* 0 means don't create the entry if

                                 * it doesn't already exist.   Non-zero
                                 * means create. */
                                 * it doesn't already exist.   Non-zero
                                 * means create. */

-    unsigned long *maskPtr;    /* *maskPtr is filled in with the event
+    unsigned long *maskPtr     /* *maskPtr is filled in with the event

                                 * types on which this pattern sequence
                                 * depends. */
                                 * types on which this pattern sequence
                                 * depends. */

+)

 
 {
     Pattern pats[EVENT_BUFFER_SIZE];
 
 {
     Pattern pats[EVENT_BUFFER_SIZE];


@@ -1436,11 +1445,12 @@ FindSequence(interp, bindPtr, object, eventString, create, maskPtr)
  */
 
 static char *
  */
 
 static char *

-GetField(p, copy, size)
-    register char *p;          /* Pointer to part of pattern. */
-    register char *copy;       /* Place to copy field. */
-    int size;                  /* Maximum number of characters to
+GetField (
+    register char *p,          /* Pointer to part of pattern. */
+    register char *copy,       /* Place to copy field. */
+    int size                   /* Maximum number of characters to

                                 * copy. */
                                 * copy. */

+)

 {
     while ((*p != '\0') && !isspace(*p) && (*p != '>')
            && (*p != '-') && (size > 1)) {
 {
     while ((*p != '\0') && !isspace(*p) && (*p != '>')
            && (*p != '-') && (size > 1)) {


@@ -1473,11 +1483,12 @@ GetField(p, copy, size)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static KeySym
-GetKeySym(dispPtr, eventPtr)
-    register TkDisplay *dispPtr;       /* Display in which to
+static KeySym 
+GetKeySym (
+    register TkDisplay *dispPtr,       /* Display in which to

                                         * map keycode. */
                                         * map keycode. */

-    register XEvent *eventPtr;         /* Description of X event. */
+    register XEvent *eventPtr          /* Description of X event. */
+)

 {
     KeySym *symPtr;
     KeySym sym;
 {
     KeySym *symPtr;
     KeySym sym;


@@ -1576,11 +1587,12 @@ GetKeySym(dispPtr, eventPtr)
  */
 
 static PatSeq *
  */
 
 static PatSeq *

-MatchPatterns(dispPtr, bindPtr, psPtr)
-    TkDisplay *dispPtr;
-    BindingTable *bindPtr;     /* Information about binding table, such
+MatchPatterns (
+    TkDisplay *dispPtr,
+    BindingTable *bindPtr,     /* Information about binding table, such

                                 * as ring of recent events. */
                                 * as ring of recent events. */

-    register PatSeq *psPtr;    /* List of pattern sequences. */
+    register PatSeq *psPtr     /* List of pattern sequences. */
+)

 {
     register PatSeq *bestPtr = NULL;
 
 {
     register PatSeq *bestPtr = NULL;
 


@@ -1805,18 +1817,19 @@ MatchPatterns(dispPtr, bindPtr, psPtr)
  */
 
 static char *
  */
 
 static char *

-ExpandPercents(before, eventPtr, keySym, after, afterSize)
-    register char *before;     /* Command containing percent
+ExpandPercents (
+    register char *before,     /* Command containing percent

                                 * expressions to be replaced. */
                                 * expressions to be replaced. */

-    register XEvent *eventPtr; /* X event containing information
+    register XEvent *eventPtr, /* X event containing information

                                 * to be used in % replacements. */
                                 * to be used in % replacements. */

-    KeySym keySym;             /* KeySym: only relevant for
+    KeySym keySym,             /* KeySym: only relevant for

                                 * KeyPress and KeyRelease events). */
                                 * KeyPress and KeyRelease events). */

-    char *after;               /* Place to generate new expanded
+    char *after,               /* Place to generate new expanded

                                 * command.  Must contain at least
                                 * "afterSize" bytes of space. */
                                 * command.  Must contain at least
                                 * "afterSize" bytes of space. */

-    int afterSize;             /* Number of bytes of space available at
+    int afterSize              /* Number of bytes of space available at

                                 * after. */
                                 * after. */

+)

 {
     register char *buffer;     /* Pointer to buffer currently being used
                                 * as destination. */
 {
     register char *buffer;     /* Pointer to buffer currently being used
                                 * as destination. */


@@ -2178,10 +2191,11 @@ ExpandPercents(before, eventPtr, keySym, after, afterSize)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-void
-TkBindError(interp)
-    Tcl_Interp *interp;                /* Interpreter in which an error has
+void 
+TkBindError (
+    Tcl_Interp *interp         /* Interpreter in which an error has

                                 * occurred. */
                                 * occurred. */

+)

 {
     char *argv[2];
     char *command;
 {
     char *argv[2];
     char *command;