Remove storage specifier 'register'

'register' is an optimization hint to the compiler that is generally
not necessary and needlessly prevents using a c++ compiler to compile
twm.

Signed-off-by: Tim Wiederhake <twied@gmx.net>

6 files changed, 23 insertions, 23 deletions

diff --git a/src/add_window.c b/src/add_window.c
index 8af8f73..d02a1c8 100644
--- a/src/add_window.c
+++ b/src/add_window.c
@@ -122,7 +122,7 @@ GetGravityOffsets(TwmWindow *tmp, int *xp, int *yp)
         {  0,  0 },                     /* StaticGravity */
     };
     /* *INDENT-ON* */
-    register int g = ((tmp->hints.flags & PWinGravity)
+    int g = ((tmp->hints.flags & PWinGravity)
                       ? tmp->hints.win_gravity : NorthWestGravity);
 
     if (g < ForgetGravity || g > StaticGravity) {
@@ -455,7 +455,7 @@ AddWindow(Window w, int iconm, IconMgr *iconp)
                      */
                     if (firsttime) {
                         if (root != Scr->Root) {
-                            register int scrnum;
+                            int scrnum;
 
                             for (scrnum = 0; scrnum < NumScreens; scrnum++) {
                                 if (root == RootWindow(dpy, scrnum))
@@ -1217,13 +1217,13 @@ ComputeWindowTitleOffsets(TwmWindow *tmp_win, int width, Bool squeeze)
  * of the frame window.
  */
 void
-ComputeTitleLocation(register TwmWindow *tmp)
+ComputeTitleLocation(TwmWindow *tmp)
 {
     tmp->title_x = -tmp->frame_bw;
     tmp->title_y = -tmp->frame_bw;
 
     if (tmp->squeeze_info) {
-        register SqueezeInfo *si = tmp->squeeze_info;
+        SqueezeInfo *si = tmp->squeeze_info;
         int basex;
         int maxwidth = tmp->frame_width;
         int tw = tmp->title_width;
@@ -1373,8 +1373,8 @@ FetchWmProtocols(TwmWindow *tmp)
     int n;
 
     if (XGetWMProtocols(dpy, tmp->w, &protocols, &n)) {
-        register int i;
-        register Atom *ap;
+        int i;
+        Atom *ap;
 
         for (i = 0, ap = protocols; i < n; i++, ap++) {
             if (*ap == _XA_WM_TAKE_FOCUS)
@@ -1467,7 +1467,7 @@ CreateColormapWindow(Window w, Bool creating_parent, Bool property_window)
 void
 FetchWmColormapWindows(TwmWindow *tmp)
 {
-    register int i, j;
+    int i, j;
     Window *cmap_windows = NULL;
     Bool can_free_cmap_windows = False;
     int number_cmap_windows = 0;
diff --git a/src/events.c b/src/events.c
index 9b2daa9..f80f6b5 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1101,12 +1101,12 @@ HandleExpose(void)
         else if (Tmp_win->titlebuttons) {
             int i;
             Window w = Event.xany.window;
-            register TBWindow *tbw;
+            TBWindow *tbw;
             int nb = Scr->TBInfo.nleft + Scr->TBInfo.nright;
 
             for (i = 0, tbw = Tmp_win->titlebuttons; i < nb; i++, tbw++) {
                 if (w == tbw->window) {
-                    register TitleButton *tb = tbw->info;
+                    TitleButton *tb = tbw->info;
 
                     FB(Tmp_win->title.fore, Tmp_win->title.back);
                     XCopyPlane(dpy, tb->bitmap, w, Scr->NormalGC,
@@ -1759,8 +1759,8 @@ HandleButtonPress(void)
 
     /* check the title bar buttons */
     if (Tmp_win && Tmp_win->title_height && Tmp_win->titlebuttons) {
-        register int i;
-        register TBWindow *tbw;
+        int i;
+        TBWindow *tbw;
         int nb = Scr->TBInfo.nleft + Scr->TBInfo.nright;
 
         for (i = 0, tbw = Tmp_win->titlebuttons; i < nb; i++, tbw++) {
diff --git a/src/gram.y b/src/gram.y
index a738f88..9de5935 100644
--- a/src/gram.y
+++ b/src/gram.y
@@ -667,9 +667,9 @@ yyerror(const char *s)
 static void
 RemoveDQuote(char *str)
 {
-    register char *i, *o;
-    register int n;
-    register int count;
+    char *i, *o;
+    int n;
+    int count;
 
     for (i = str + 1, o = str; *i && *i != '\"'; o++) {
         if (*i == '\\') {
diff --git a/src/menus.c b/src/menus.c
index 5450363..9903f75 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -254,7 +254,7 @@ CreateTitleButton(const char *name, int func, const char *action,
         Scr->TBInfo.head = tb;
     }
     else if (append && rightside) {     /* 3 */
-        register TitleButton *t;
+        TitleButton *t;
 
         /* SUPPRESS 530 */
         for (t = Scr->TBInfo.head; t->next; t = t->next);
@@ -262,7 +262,7 @@ CreateTitleButton(const char *name, int func, const char *action,
         tb->next = NULL;
     }
     else {                      /* 2 */
-        register TitleButton *t, *prev = NULL;
+        TitleButton *t, *prev = NULL;
 
         for (t = Scr->TBInfo.head; t && !t->rightside; t = t->next) {
             prev = t;
@@ -1105,8 +1105,8 @@ belongs_to_twm_window(TwmWindow *t, Window w)
         return True;
 
     if (t && t->titlebuttons) {
-        register TBWindow *tbw;
-        register int nb = Scr->TBInfo.nleft + Scr->TBInfo.nright;
+        TBWindow *tbw;
+        int nb = Scr->TBInfo.nleft + Scr->TBInfo.nright;
 
         for (tbw = t->titlebuttons; nb > 0; tbw++, nb--) {
             if (tbw->window == w)
@@ -1983,7 +1983,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win,
     case F_WARPPREV:
     case F_WARPNEXT:
     {
-        register TwmWindow *t;
+        TwmWindow *t;
         TwmWindow *of, *l, *n;
         int c = 0;
 
@@ -2029,7 +2029,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win,
 
     case F_WARPTO:
     {
-        register TwmWindow *t;
+        TwmWindow *t;
         int len;
 
         len = (int) strlen(action);
diff --git a/src/parse.c b/src/parse.c
index eae817e..0ad806e 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -602,7 +602,7 @@ static int numkeywords = (sizeof(keytable) / sizeof(keytable[0]));
 int
 parse_keyword(char *s, int *nump)
 {
-    register int lower = 0, upper = numkeywords - 1;
+    int lower = 0, upper = numkeywords - 1;
 
     XmuCopyISOLatin1Lowered(s, s);
     while (lower <= upper) {
diff --git a/src/util.c b/src/util.c
index a3673e3..f77b0b6 100644
--- a/src/util.c
+++ b/src/util.c
@@ -96,7 +96,7 @@ MoveOutline(Window root, int x, int y, int width, int height, int bw, int th)
     int xl, xr, yt, yb, xinnerl, xinnerr, yinnert, yinnerb;
     int xthird, ythird;
     XSegment outline[18];
-    register XSegment *r;
+    XSegment *r;
 
     if (x == lastx && y == lasty && width == lastWidth && height == lastHeight
         && lastBW == bw && th == lastTH)
@@ -587,7 +587,7 @@ FindFontSet(MyFont *font, const char *fontname)
         int ascent;
         int descent;
         int fnum;
-        register int i;
+        int i;
 
         if (font->fontset != NULL) {
             XFreeFontSet(dpy, font->fontset);