From: Jon Trulson Date: Wed, 27 Jun 2018 23:54:24 +0000 (-0600) Subject: dtwm: remove register keyword X-Git-Tag: 2.3.0a~300 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c1227cc6299fb7dbcea008d0e8a3b078fbd7b97f;p=oweals%2Fcde.git dtwm: remove register keyword --- diff --git a/cde/programs/dtwm/Clock.c b/cde/programs/dtwm/Clock.c index 990e4939..5dc7785d 100644 --- a/cde/programs/dtwm/Clock.c +++ b/cde/programs/dtwm/Clock.c @@ -325,8 +325,8 @@ ClockTick( struct tm tm; time_t time_value; char * time_ptr; - register Display * dpy = XtDisplay (w); - register Window win = XtWindow (w); + Display * dpy = XtDisplay (w); + Window win = XtWindow (w); if (id || !w->clock.interval_id) w->clock.interval_id = @@ -508,8 +508,8 @@ DrawHand( Dimension width, double fraction_of_a_circle ) { - register double angle, cosangle, sinangle; - register double ws, wc; + double angle, cosangle, sinangle; + double ws, wc; Position x, y, x1, y1, x2, y2; double cos (); double sin (); @@ -593,8 +593,8 @@ DrawClockFace( Boolean draw_minute_ticks = ((G_ClockWidth (g) > (Dimension) (2 * SIZE_DEFAULT)) && (G_ClockHeight (g) > (Dimension) (2 * SIZE_DEFAULT))); - register int i; - register int delta = + int i; + int delta = (int)(g->clock.radius - g->clock.tick_spacing) / 3; if (! XtIsManaged ((Widget)g)) diff --git a/cde/programs/dtwm/WmColormap.c b/cde/programs/dtwm/WmColormap.c index 0c2253d4..5d8d9ddf 100644 --- a/cde/programs/dtwm/WmColormap.c +++ b/cde/programs/dtwm/WmColormap.c @@ -549,7 +549,7 @@ void ProcessColormapList (WmScreenData *pSD, ClientData *pCD) { - register int i; + int i; XEvent event; diff --git a/cde/programs/dtwm/WmFeedback.c b/cde/programs/dtwm/WmFeedback.c index c6e9a22e..d5d0e2ea 100644 --- a/cde/programs/dtwm/WmFeedback.c +++ b/cde/programs/dtwm/WmFeedback.c @@ -724,7 +724,7 @@ static void CancelCB (Widget w, caddr_t client_data, caddr_t call_data) void ConfirmAction (WmScreenData *pSD, int nbr) { Arg args[8]; - register int n; + int n; int x, y; Dimension width, height; Widget dialogShellW = NULL; diff --git a/cde/programs/dtwm/WmFunction.c b/cde/programs/dtwm/WmFunction.c index 36305ec7..1f9c50da 100644 --- a/cde/programs/dtwm/WmFunction.c +++ b/cde/programs/dtwm/WmFunction.c @@ -3507,7 +3507,7 @@ F_Version (String args, ClientData *pCD, XEvent *event) Boolean F_Send_Msg (String args, ClientData *pCD, XEvent *event) { - register int i; + int i; if (pCD && pCD->mwmMessagesCount) diff --git a/cde/programs/dtwm/WmGraphics.c b/cde/programs/dtwm/WmGraphics.c index f3c71cae..6e8d3409 100644 --- a/cde/programs/dtwm/WmGraphics.c +++ b/cde/programs/dtwm/WmGraphics.c @@ -108,7 +108,7 @@ void BevelRectangle (RList *prTop, RList *prBot, int x, int y, unsigned int width, unsigned int height, unsigned int top_wid, unsigned int right_wid, unsigned int bot_wid, unsigned int left_wid) { XRectangle *prect; /* pointer to "current" rectangle */ - register int count; /* counter used for beveling operation */ + int count; /* counter used for beveling operation */ int join1, join2; /* used to compute "good" bevel joints */ int x1, y1, len; /* used to compute bevel parameters */ int *piTop, *piBot; @@ -262,7 +262,7 @@ void BevelRectangle (RList *prTop, RList *prBot, int x, int y, unsigned int widt void BevelDepressedRectangle (RList *prTop, RList *prBot, int x, int y, unsigned int width, unsigned int height, unsigned int top_wid, unsigned int right_wid, unsigned int bot_wid, unsigned int left_wid, unsigned int in_wid) { XRectangle *prect; /* pointer to "current" rectangle */ - register int count; /* counter used for beveling operation */ + int count; /* counter used for beveling operation */ int join1, join2; /* used to compute "good" bevel joints */ int x1, y1, len; /* used to compute bevel parameters */ int *piTop, *piBot; diff --git a/cde/programs/dtwm/WmParse.c b/cde/programs/dtwm/WmParse.c index 955bdca5..607bb01e 100644 --- a/cde/programs/dtwm/WmParse.c +++ b/cde/programs/dtwm/WmParse.c @@ -908,7 +908,7 @@ _DtWmParseNextLine ( * ***********************************************************************/ - register unsigned char *string; + unsigned char *string; int len; int chlen; wchar_t last; diff --git a/cde/programs/dtwm/WmResCvt.c b/cde/programs/dtwm/WmResCvt.c index c136c315..c24852b8 100644 --- a/cde/programs/dtwm/WmResCvt.c +++ b/cde/programs/dtwm/WmResCvt.c @@ -1497,9 +1497,9 @@ unsigned char *NextToken (unsigned char *pchIn, int *pLen, unsigned char **ppchNext) { unsigned char *pchR = pchIn; - register int i; + int i; - register int chlen; + int chlen; for (i = 0; ((chlen = mblen((char *)pchIn, MB_CUR_MAX)) > 0) && (pchIn[0] != '\0'); diff --git a/cde/programs/dtwm/WmResParse.c b/cde/programs/dtwm/WmResParse.c index 7587373f..164c059b 100644 --- a/cde/programs/dtwm/WmResParse.c +++ b/cde/programs/dtwm/WmResParse.c @@ -2440,7 +2440,7 @@ static MenuItem *ParseMenuItems (WmScreenData *pSD) MenuItem *firstMenuItem; MenuItem *lastMenuItem; MenuItem *menuItem; - register int ix; + int ix; /* * Parse "label [mnemonic] [accelerator] function" or @@ -2836,7 +2836,7 @@ int ParseWmFunction (unsigned char **linePP, unsigned int res_spec, { unsigned char *lineP = *linePP; unsigned char *string; - register int low, mid, high, cmp; + int low, mid, high, cmp; /* * Skip leading white space. @@ -4367,7 +4367,7 @@ static Boolean ParseModifiers(unsigned char **linePP, unsigned int *state) static Boolean LookupModifier (unsigned char *name, unsigned int *valueP) { - register int i; + int i; if (name != NULL) { @@ -4423,7 +4423,7 @@ static Boolean ParseEventType (unsigned char **linePP, EventTableEntry *table, unsigned char *lineP = *linePP; unsigned char *startP = *linePP; unsigned char eventTypeStr[MAX_EVENTTYPE_STRLEN+1]; - register int len; + int len; /* Parse out the event string */ ScanAlphanumeric (&lineP); diff --git a/cde/programs/dtwm/WmResource.c b/cde/programs/dtwm/WmResource.c index 059521df..661bfde0 100644 --- a/cde/programs/dtwm/WmResource.c +++ b/cde/programs/dtwm/WmResource.c @@ -5857,10 +5857,10 @@ XmColorData * _WmGetDefaultColors (Screen *screen, Colormap colormap, static int defaultCount[2] = {0, 0}; static int defaultSize[2] = {0, 0}; int setId; - register XmColorData *set; - register int count; - register int size; - register int i; + XmColorData *set; + int count; + int size; + int i; Display *display = DisplayOfScreen (screen); XColor colorDef; diff --git a/cde/programs/dtwm/WmWinInfo.c b/cde/programs/dtwm/WmWinInfo.c index 75d5da85..18b5b6ff 100644 --- a/cde/programs/dtwm/WmWinInfo.c +++ b/cde/programs/dtwm/WmWinInfo.c @@ -953,8 +953,8 @@ ProcessWmSaveHint (ClientData *pCD) void ProcessWmHints (ClientData *pCD, Boolean firstTime) { - register XWMHints *pXWMHints; - register long flags; + XWMHints *pXWMHints; + long flags; Pixmap iconPixmap; Pixmap iconMask; WmWorkspaceData *pWsTmp; @@ -1372,8 +1372,8 @@ ProcessWmHints (ClientData *pCD, Boolean firstTime) void ProcessWmNormalHints (ClientData *pCD, Boolean firstTime, long manageFlags) { - register SizeHints *pNormalHints; - register long flags; + SizeHints *pNormalHints; + long flags; int diff; unsigned long decoration; unsigned int boxdim, tmpMin; @@ -3162,7 +3162,7 @@ PlaceIconOnScreen (ClientData *pCD, int *pX, int *pY) void FixWindowConfiguration (ClientData *pCD, unsigned int *pWidth, unsigned int *pHeight, unsigned int widthInc, unsigned int heightInc) { - register int delta; + int delta; /* * Make sure we're on width/height increment boundaries. @@ -3225,8 +3225,8 @@ FixWindowConfiguration (ClientData *pCD, unsigned int *pWidth, unsigned int *pHe void FixWindowSize (ClientData *pCD, unsigned int *pWidth, unsigned int *pHeight, unsigned int widthInc, unsigned int heightInc) { - register int deltaW; - register int deltaH; + int deltaW; + int deltaH; WmScreenData *pSD = pCD->pSD; /* diff --git a/cde/programs/dtwm/WmWinList.c b/cde/programs/dtwm/WmWinList.c index 643bfcc0..e6909c66 100644 --- a/cde/programs/dtwm/WmWinList.c +++ b/cde/programs/dtwm/WmWinList.c @@ -2624,7 +2624,7 @@ MakeTransientFamilyStackingList ( ClientData *pcdSub; Window *nextWindow, wSave, wTemp, wTop; int count = CountTransientChildren (pcdLeader); - register int i, j; + int i, j; /* * Construct the transient stacking list according to diff --git a/cde/programs/dtwm/examples/occupy/occupy.c b/cde/programs/dtwm/examples/occupy/occupy.c index 9e2c3496..a19e2716 100644 --- a/cde/programs/dtwm/examples/occupy/occupy.c +++ b/cde/programs/dtwm/examples/occupy/occupy.c @@ -105,8 +105,8 @@ char **argv; Widget top; XtAppContext app_context; Arg args[10]; - register int n; - register int i; + int n; + int i; /* * initialize toolkit @@ -273,8 +273,8 @@ Widget top; { Window root; Arg args[10]; /* arg list */ - register int n; /* arg count */ - register int i; + int n; /* arg count */ + int i; DtWsmWorkspaceInfo *pWsInfo; char *pchWs; Widget left = None; @@ -346,7 +346,7 @@ Widget top; void ShowWorkspaceOccupancy () { Arg args[10]; /* arg list */ - register int n; /* arg count */ + int n; /* arg count */ int i,j; Atom *paWsIn = NULL; unsigned long numWsIn; diff --git a/cde/programs/dtwm/examples/wsinfo/wsinfo.c b/cde/programs/dtwm/examples/wsinfo/wsinfo.c index 2eb22997..06d76566 100644 --- a/cde/programs/dtwm/examples/wsinfo/wsinfo.c +++ b/cde/programs/dtwm/examples/wsinfo/wsinfo.c @@ -101,8 +101,8 @@ char **argv; Widget top; XtAppContext app_context; Arg args[10]; - register int n; - register int i; + int n; + int i; XmString xms, xmsBlank; /* @@ -454,7 +454,7 @@ char **argv; void ShowCurrentWorkspaceInfo () { Arg args[10]; /* arg list */ - register int n; /* arg count */ + int n; /* arg count */ Atom aWs; int rval; Display *dpy;