dtterm: remove register keyword

[oweals/cde.git] / cde / programs / dtterm / DtTermMain.c

diff --git a/cde/programs/dtterm/DtTermMain.c b/cde/programs/dtterm/DtTermMain.c
index 15daf1b7970a973e9ad09e4e3bcc2e59d851f2c0..5210bff33c0cf883310891f43ee4b62aee4f9d4e 100644 (file)
--- a/cde/programs/dtterm/DtTermMain.c
+++ b/cde/programs/dtterm/DtTermMain.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -37,6 +37,7 @@ static char rcs_id[] = "$TOG: DtTermMain.c /main/19 1999/09/17 13:26:34 mgreess
 #include <dlfcn.h>
 #endif /* sun */
 #include "TermHeader.h"
+#include "TermPrim.h"
 #include "TermPrimDebug.h"
 #include <fcntl.h>
 #include <sys/types.h>
@@ -141,7 +142,7 @@ static void SetWorkSpaceHints(
         Widget shell,
         char *workspaces );
 
-static XtEventHandler TestProbeHandler(
+static void TestProbeHandler(
        Widget  w,
        XtPointer       client_data,
        XEvent          *event,
@@ -419,7 +420,7 @@ DecrementInstanceCountAndExit(Widget w, XtPointer client_data,
     InstanceCount--;
     if (InstanceCount > 0)
     {
-        new_instance_list = (DtTermViewWidget *)XtMalloc(sizeof(DtTermViewWidget *)*InstanceCount);
+        new_instance_list = (DtTermViewWidget *)XtMalloc(sizeof(DtTermViewWidget) * InstanceCount);
        for (j = 0,i = 0; i < (InstanceCount+1); i++)
            if (instance_list[i] != (DtTermViewWidget )w)
            {
@@ -504,7 +505,7 @@ static void RegisterTestProbe(
  * TestProbeHandler - handle the client message for test probes                   *
  *                                                                        *
  ***************************************************************************/
-static XtEventHandler TestProbeHandler(
+static void TestProbeHandler(
        Widget  w,
        XtPointer       client_data,
        XEvent          *event,
@@ -666,7 +667,7 @@ AddMenubarToggle
 static void
 CloneCallback(Widget wid, XtPointer client_data, XtPointer call_data)
 {
-    register DtTermViewWidget w = (DtTermViewWidget) wid;
+    DtTermViewWidget w = (DtTermViewWidget) wid;
     DtTermViewCallbackStruct *termCB = (DtTermViewCallbackStruct *) call_data;
 
     Widget parent = XtParent((Widget) w);
@@ -757,7 +758,7 @@ CloneCallback(Widget wid, XtPointer client_data, XtPointer call_data)
     (void) XtAddCallback(termWidget, DtNnewCallback,
            CloneCallback, (XtPointer) 0);
     instance_list = (DtTermViewWidget *)XtRealloc((char *)instance_list,
-                                               (sizeof(DtTermViewWidget *)*InstanceCount));
+                                               (sizeof(DtTermViewWidget) * InstanceCount));
     instance_list[InstanceCount - 1] = (DtTermViewWidget )termWidget;
 
     (void) XtRealizeWidget(shellWidget);
@@ -824,15 +825,19 @@ CreateInstance
            DecrementInstanceCountAndExit, (XtPointer) topLevelWidget);
     (void) _DtTermPrimAddDeleteWindowCallback(topLevelWidget, DestroyDtTerm,
            (XtPointer) topLevelWidget);
-    instance_list = (DtTermViewWidget * )XtRealloc((char *)instance_list,(sizeof(DtTermViewWidget *)*InstanceCount));
+    instance_list = (DtTermViewWidget * ) XtRealloc((char *)instance_list, (sizeof(DtTermViewWidget) * InstanceCount));
     instance_list[InstanceCount - 1] = (DtTermViewWidget )termViewWidget;
     if (enableCloneCallback)
        (void) XtAddCallback(termViewWidget, DtNnewCallback,
                CloneCallback, (XtPointer) 0);
+
+#ifdef SUN_TERMINAL_SERVER
+    return(True);
+#endif
 }
 
 void
-AtExitProc()
+AtExitProc(void)
 {
     static int i = 0;
 
@@ -1060,7 +1065,7 @@ FixOSFBindings
   /* changed from XtFree to free as it was allocated with malloc to avoid FMM */
     if (freeOrigBindings) free(origDisplayBindings);
 
-    if (ignoredKeysymList) XtFree((char *)ignoredKeysymList);
+    XtFree((char *)ignoredKeysymList);
 
     /* and finally, reparse the string... */
     _XmVirtKeysInitialize(w);
@@ -1099,7 +1104,7 @@ base_name(
      char *name
 )
 {
-       register char *cp;
+       char *cp;
 
        cp = strrchr(name, '/');
        return(cp ? cp + 1 : name);
@@ -1374,9 +1379,10 @@ main(int argc, char **argv)
 
        /* realize the interface... */
        i = 0;
-        (void) XtSetArg(arglist[i], XmNtitle, attrs.title); i++;
-       if ((!attrs.icon_name) && (!attrs.dtterm_name))
+    (void) XtSetArg(arglist[i], XmNtitle, attrs.title); i++;
+       if ((!attrs.icon_name) && (!attrs.dtterm_name)) {
          (void) XtSetArg(arglist[i], XmNiconName, attrs.title); i++;
+       }
        (void) XtSetArg(arglist[i], XmNmappedWhenManaged, False); i++;
        (void) XtSetArg(arglist[i], XmNgeometry, NULL); i++;
        (void) XtSetValues(topShell, arglist, i);