DtWidget: remove register keyword

diff --git a/cde/lib/DtWidget/DialogBox.c b/cde/lib/DtWidget/DialogBox.c
index f5e67f01e1e200e055eb883b8eb525cf9d0f993b..476341bf41c6c16863d15e5d2fe7dd7abee3a89d 100644 (file)
--- a/cde/lib/DtWidget/DialogBox.c
+++ b/cde/lib/DtWidget/DialogBox.c
@@ -507,7 +507,7 @@ InsertChild(
        XmManagerWidgetClass    mc = (XmManagerWidgetClass)xmManagerWidgetClass;
        Dimension               s_t = M_ShadowThickness (w);
        Arg             al[20];         /*  arg list            */
-       register int    ac;             /*  arg count           */
+       int     ac;             /*  arg count           */
        XtWidgetProc    insert_child;
 
        _DtProcessLock();
@@ -628,7 +628,7 @@ GetSize(
        Widget                  work_area =     M_WorkArea (mgr),
                                separator =     M_Separator (mgr);
        Widget *                button =        M_Button (mgr);
-       register int            button_count =  M_ButtonCount (mgr),
+       int             button_count =  M_ButtonCount (mgr),
                                i;                    
        Boolean                 min_btns =      M_MinimizeButtons (mgr);
        Dimension               sep_h = 0,
@@ -717,7 +717,7 @@ CreateChildren(
        char            button_name[100];
 
        Arg             al[20];         /*  arg list            */
-       register int    ac;             /*  arg count           */
+       int     ac;             /*  arg count           */
 
 /*     Compute position factors.
 */

diff --git a/cde/lib/DtWidget/EditAreaData.c b/cde/lib/DtWidget/EditAreaData.c
index f2b5ae468cd56647f2231e80e7e467eb7e2fdd63..758bc3d0b79f14f6ce285138a4b9ca5afaf868f0 100644 (file)
--- a/cde/lib/DtWidget/EditAreaData.c
+++ b/cde/lib/DtWidget/EditAreaData.c
@@ -84,9 +84,9 @@ static DtEditorErrorCode LoadFile(
  */
 static int
 strcasecmp(s1, s2)
-    register char *s1, *s2;
+    char *s1, *s2;
 {
-    register int c1, c2;
+    int c1, c2;
 
     while (*s1 && *s2) {
        c1 = isupper(*s1) ? tolower(*s1) : *s1;
@@ -1386,7 +1386,7 @@ CopySubstring(
         char *buf,
         Boolean addNewlines)
 {
-    register XmTextLineTable line_table = widget->text.line_table;
+    XmTextLineTable line_table = widget->text.line_table;
     int currLine, firstLine;
     char *pString, *pCurrChar, *pLastChar;
     int numToCopy;

diff --git a/cde/lib/DtWidget/EditCalls.c b/cde/lib/DtWidget/EditCalls.c
index 8020107c4171e7d3a98327c83158cd735dc00ebe..36356072168b9605ec482140c0400d3ccfa85b57 100644 (file)
--- a/cde/lib/DtWidget/EditCalls.c
+++ b/cde/lib/DtWidget/EditCalls.c
@@ -389,7 +389,7 @@ _DtEditorModifyVerifyCB(
         caddr_t client_data,
         caddr_t call_data )
 {
-  register XmTextVerifyCallbackStruct * cb = 
+  XmTextVerifyCallbackStruct * cb =
                                (XmTextVerifyCallbackStruct *) call_data;
   DtEditorWidget editor = (DtEditorWidget) client_data;
 

diff --git a/cde/lib/DtWidget/Editor.c b/cde/lib/DtWidget/Editor.c
index 983d61e7000f3af140dbddc6593bf20cb18cd306..7bd42a993e29720cc21b7d316a9ce910b4c28393 100644 (file)
--- a/cde/lib/DtWidget/Editor.c
+++ b/cde/lib/DtWidget/Editor.c
@@ -1607,7 +1607,7 @@ static Widget
 CreateText(
         DtEditorWidget parent)
 {
-    register            int ac;         /* arg count */
+               int ac;         /* arg count */
     Arg                al[21];         /* arg list */
     Widget             text;
 
@@ -2102,7 +2102,7 @@ SetValues(
 {
   Boolean         redisplay_flag = False;
   Arg          al[15];         /*  arg list            */
-  register int    ac;          /*  arg count           */
+  int    ac;           /*  arg count           */
 
   Boolean      resetSpellTitle = False,
                resetFormatTitle = False,
@@ -3726,8 +3726,8 @@ static unsigned int
 GetModeSwitchModifier(
                 Display *dpy)
 {
-    register XModifierKeymap *pMap;
-    register int mapIndex, keyCol, mapSize;
+    XModifierKeymap *pMap;
+    int mapIndex, keyCol, mapSize;
     KeySym keySym;
     unsigned int modeSwitchModMask = 0;
     pMap = XGetModifierMapping(dpy);
@@ -4549,7 +4549,7 @@ UpdateOverstrikeIndicator(
        Boolean         overstrikeOn )
 {
     Arg           al[10];
-    register      int ac;
+    int ac;
     DtEditorWidget ew = (DtEditorWidget) widget;
  
     /*
@@ -4639,7 +4639,7 @@ SetStatusLine(
        Boolean statusLineOn)
 {
    Arg                 al[10];
-   register int        ac;
+   int ac;
    int currentLine;
    XmTextPosition cursorPos;
 
@@ -5188,16 +5188,16 @@ extern int _nl_space_alt;
 /*
  * Forward declarations
  */
-static int DoLine (FormatData *data, register FILE *filep);
+static int DoLine (FormatData *data, FILE *filep);
 static void Center (FormatData *data, 
-                   wint_t *in_line, register wint_t *inlinelim);
-static void Fill (FormatData *data, wint_t *in_line, register wint_t *inlinelim);
+                   wint_t *in_line, wint_t *inlinelim);
+static void Fill (FormatData *data, wint_t *in_line, wint_t *inlinelim);
 static void FillWord (FormatData *data);
 static void Dump (FormatData *data, int endpara);
 static void PrintIndent (FormatData *data, int indent);
 static void PrintTag (FormatData *data, WORD *wordpast);
 static void PrintWords (FormatData *data, WORD *wordpast);
-static void Justify (FormatData *data, register int blanks, WORD *wordpast);
+static void Justify (FormatData *data, int blanks, WORD *wordpast);
 static int CompareWords (const void *, const void *);
 static int EkinBekinProc(FormatData *data, WORD **wordpast);
 static void postEkinBekinProc(FormatData *data, int *poutchars, WORD *wordpast);
@@ -5353,8 +5353,8 @@ fixLeftMarginAndNewlines(
        int endPos)
 {
     Widget widget = M_text(editor);
-    register XmTextLineTable lineTable;
-    register int i;
+    XmTextLineTable lineTable;
+    int i;
     int lineIndex, lineLen, nextLen, lineIndent, lastIndex,
         lineByteLen, total_lines;
     Boolean newPara = True;
@@ -5541,7 +5541,7 @@ FormatText (
 
 { 
   long         maxmargin;      /* max allowed */ 
-  register FILE        *filep;         /* file to read */ 
+  FILE *filep;         /* file to read */
   int          retVal;
   FormatData   data;
 
@@ -5648,12 +5648,12 @@ CleanUp:
 
 static int 
 DoLine (FormatData     *data,
-       register FILE   *filep)                 /* open file to read    */
+       FILE    *filep)                 /* open file to read    */
 {
        wint_t  in_line [LINESIZE];             /* after reading in     */
-       register wint_t *incp    = in_line;     /* place in in_line     */
-       register wint_t *incplim = in_line + LINESIZE;  /* limit of in_line */
-       register wint_t   c;
+       wint_t  *incp    = in_line;     /* place in in_line     */
+       wint_t  *incplim = in_line + LINESIZE;  /* limit of in_line */
+       wint_t   c;
 
 /*
  * READ LINE WITH BACKSPACE CRUNCHING:
@@ -5713,17 +5713,17 @@ DoLine (FormatData      *data,
 static void
 Center (FormatData *data, 
        wint_t  *in_line,                       /* start of input line  */
-       register wint_t *inlinelim)             /* end of line + 1      */
+       wint_t  *inlinelim)             /* end of line + 1      */
 {
-       register wint_t *incp;          /* pointer in in_line   */
+       wint_t  *incp;          /* pointer in in_line   */
        wint_t  outline [LINESIZE + MAXTABSIZE];  /* after generic work */
-       register wint_t *outcp      = outline;    /* place in outline   */
-       register wint_t *outlinelim = outline + LINESIZE; /* limit of outline*/
+       wint_t  *outcp      = outline;    /* place in outline   */
+       wint_t  *outlinelim = outline + LINESIZE; /* limit of outline*/
 
        int     haveword  = False;      /* hit word in in_line? */
-       register wint_t ch;             /* current working char */
-       register int    needsp;         /* spaces need for tab  */
-       register int    indent = 0;     /* size of indentation  */
+       wint_t  ch;             /* current working char */
+       int     needsp;         /* spaces need for tab  */
+       int     indent = 0;     /* size of indentation  */
        int     textwidth;              /* size of text part    */
        int     extwidth = 0;           /* additional width for MBCS */
 
@@ -5875,12 +5875,12 @@ Center (FormatData *data,
 static void
 Fill (FormatData *data,
       wint_t   *in_line,               /* start of input line  */
-      register wint_t  *inlinelim)     /* end of line + 1      */
+      wint_t   *inlinelim)     /* end of line + 1      */
 {
-       register wint_t *incp;          /* place in in_line     */
-       register wint_t ch;             /* current working char */
+       wint_t  *incp;          /* place in in_line     */
+       wint_t  ch;             /* current working char */
        int     haveword = False;       /* hit word in in_line? */
-       register int    inword   = False;       /* currently in a word? */
+       int     inword   = False;       /* currently in a word? */
 /*
  * SCAN INPUT LINE:
  */
@@ -6017,7 +6017,7 @@ FillWord (FormatData *data)
 {
   int  wordlen;                /* length of word to fill */
   int  blanks = 1;             /* trailing blanks needed */
-  register wint_t      ch1, ch2, ch3;          /* last chars of word     */
+  wint_t       ch1, ch2, ch3;          /* last chars of word     */
 
   data->wordat->length = (data->incolumn - data->wordat->incolumn);
   wordlen = data->wordat->wclen;
@@ -6094,9 +6094,9 @@ Dump (FormatData *data,
   int  startpara;                      /* start of paragraph?  */
   int  normal;                         /* non-tagged line?     */
   WORD *wordpast = data->wordfirst;            /* past last to dump    */
-  register int wordlen;                /* length of one word   */
+  int  wordlen;                /* length of one word   */
   int  indent;                         /* local value          */
-  register int outneed;                /* chars need to dump   */
+  int  outneed;                /* chars need to dump   */
   int  outchars;                       /* chars found to dump  */
 
 /*
@@ -6274,10 +6274,10 @@ static void
 PrintTag (FormatData *data, 
          WORD  *wordpast)              /* past last to print */
 {
-   register WORD       *wordat = data->wordfirst;      /* local value    */
-   register int        outcol = data->indent1 + 1;     /* next column    */
+   WORD        *wordat = data->wordfirst;      /* local value    */
+   int outcol = data->indent1 + 1;     /* next column    */
    int wordcol;                /* desired column */
-   register wint_t     *wordcp;                /* place in word  */
+   wint_t      *wordcp;                /* place in word  */
    wint_t      *wordcplim;             /* limit of word  */
 
    while (True)                                /* till break */
@@ -6318,10 +6318,10 @@ static void
 PrintWords (FormatData *data,
            WORD       *wordpast)               /* past last to print */
 {
-   register WORD       *wordat = data->wordfirst;      /* local value   */
-   register wint_t     *wordcp;                /* place in word */
+   WORD        *wordat = data->wordfirst;      /* local value   */
+   wint_t      *wordcp;                /* place in word */
    wint_t      *wordcplim;             /* limit of word */
-   register int        blanks;                 /* after a word  */
+   int blanks;                 /* after a word  */
 
    while (True)                                /* till break */
    {
@@ -6363,13 +6363,13 @@ PrintWords (FormatData *data,
 
 static void
 Justify (FormatData *data, 
-        register int blanks,                   /* blanks to insert   */
+        int blanks,                    /* blanks to insert   */
         WORD   *wordpast)              /* past last to print */
 {
-   register WORD       *wordat;                /* local value          */
-   register int        sortat;                 /* place in sort[]      */
-   register int        wordlen;                /* size of this word    */
-   register int        nextlen;                /* size of next word    */
+   WORD        *wordat;                /* local value          */
+   int sortat;                 /* place in sort[]      */
+   int wordlen;                /* size of this word    */
+   int nextlen;                /* size of next word    */
    int level;                  /* current blanks level */
 
    WORD        *sort [WORDMAX];        /* sorted pointers */
@@ -7041,7 +7041,7 @@ ComputeRightMargin(
               margin_width;
     int        rightMargin;
     Arg al[5];             /* arg list */
-    register   int ac;    /* arg count */
+    int ac;    /* arg count */
 
     ac=0;
     XtSetArg(al[ac], XmNwidth, &text_width); ac++;
@@ -7177,7 +7177,7 @@ CreateFormatDialog(
        DtEditorWidget editor)
 {
     Arg                al[15];        /* arg list */
-    register   int ac;        /* arg count */
+    int ac;        /* arg count */
     Pixel      textBackground, textForeground;
     XmString   tempString = (XmString)NULL;
 
@@ -8072,7 +8072,7 @@ DtEditorGetSizeHints(
     XSizeHints *pHints) /* Return */
 {
     Arg al[10];                 /* arg list */
-    register int ac;            /* arg count */
+    int ac;            /* arg count */
     Dimension FormWidth, FormHeight, 
              Twidth, Theight, statusHeight,
              highlightThickness, shadowThickness,

diff --git a/cde/lib/DtWidget/Icon.c b/cde/lib/DtWidget/Icon.c
index 9b09a81c93907121875911e85057338c4171931f..8a234b5c8901425358d31fb07dd834d502bc3492 100644 (file)
--- a/cde/lib/DtWidget/Icon.c
+++ b/cde/lib/DtWidget/Icon.c
@@ -2668,8 +2668,8 @@ SetValues(
 static void 
 BorderHighlight( DtIconGadget g)
 {
-   register int width;
-   register int height;
+   int width;
+   int height;
    CallCallbackProc call_callback;
 
    width = g->rectangle.width;
@@ -2699,9 +2699,9 @@ static void
 BorderUnhighlight( DtIconGadget g)
 {
 
-   register int window_width;
-   register int window_height;
-   register int highlight_width;
+   int window_width;
+   int window_height;
+   int highlight_width;
    CallCallbackProc    call_callback;
 
    window_width = g->rectangle.width;

diff --git a/cde/lib/DtWidget/SearchDlg.c b/cde/lib/DtWidget/SearchDlg.c
index 92b4e2d19a1ee95c84b96fb3b648d27d8b609480..4b608a2f3d596d9838bfffd1f89d28e4f7f0cfc5 100644 (file)
--- a/cde/lib/DtWidget/SearchDlg.c
+++ b/cde/lib/DtWidget/SearchDlg.c
@@ -66,7 +66,7 @@ ManageFind(
         DtEditorWidget pPriv)
 {
     Arg al[10];
-    register int ac;
+    int ac;
 
     ac = 0;
     XtSetArg(al[ac], XmNtopAttachment, XmATTACH_WIDGET); ac++;
@@ -83,7 +83,7 @@ UnmanageFind(
         DtEditorWidget pPriv)
 {
     Arg al[10];
-    register int ac;
+    int ac;
 
     XtUnmanageChild(M_search_findLbl(pPriv));
     XtUnmanageChild(M_findText(pPriv));
@@ -109,7 +109,7 @@ _DtEditorSearch(
         Boolean createonly )
 {
     Arg al[10];             /* arg list */
-    register int ac;        /* arg count */
+    int ac;        /* arg count */
 
     /* create the dialog if it is the first time */
     if ( !M_search_dialog(pPriv) ) 
@@ -274,7 +274,7 @@ CreateSearchDialog(
         DtEditorWidget pPriv)
 {
     Arg             al[10];         /* arg list */
-    register int ac;         /* arg count */
+    int ac;         /* arg count */
     Pixel    textBackground, textForeground;
     XmString tmpStr1;
 

diff --git a/cde/lib/DtWidget/TitleBox.c b/cde/lib/DtWidget/TitleBox.c
index e60113a6777b612af7415b7e21a402c74c79cd73..2bf1e93451c65e7879839c2d54e7eb705a759ac1 100644 (file)
--- a/cde/lib/DtWidget/TitleBox.c
+++ b/cde/lib/DtWidget/TitleBox.c
@@ -498,7 +498,7 @@ GetTitleString(
         XtArgVal *value )
 {
        Arg             al[10];         /*  arg list            */
-       register int    ac;             /*  arg count           */
+       int     ac;             /*  arg count           */
        Widget          title_area = M_TitleArea (manager);
        XmString        string = NULL;
 
@@ -558,7 +558,7 @@ Initialize(
         DtTitleBoxWidget new )
 {
        Arg             al[10];         /*  arg list            */
-       register int    ac;             /*  arg count           */
+       int     ac;             /*  arg count           */
        Widget          title = NULL;
        XmString        title_string = NULL;
 
@@ -823,7 +823,7 @@ SetValues(
                        new_title = False,
                        new_font = False;
        Arg             al[10];         /*  arg list            */
-       register int    ac;             /*  arg count           */
+       int     ac;             /*  arg count           */
 
 /*     Validate title position.
 */