From 43cdfab6a1d2fc65dbd9bb447e50dda7c6ba0bad Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Wed, 27 Jun 2018 17:49:12 -0600 Subject: [PATCH] dtstyle: remove register keyword --- cde/programs/dtstyle/Audio.c | 2 +- cde/programs/dtstyle/Backdrop.c | 8 +++--- cde/programs/dtstyle/ColorEdit.c | 8 +++--- cde/programs/dtstyle/ColorMain.c | 28 +++++++++---------- cde/programs/dtstyle/ColorPalette.c | 2 +- cde/programs/dtstyle/Dtwm.c | 2 +- cde/programs/dtstyle/Font.c | 2 +- cde/programs/dtstyle/I18nEnv.c | 6 ++--- cde/programs/dtstyle/I18nMain.c | 2 +- cde/programs/dtstyle/I18nUtil.c | 2 +- cde/programs/dtstyle/Keyboard.c | 2 +- cde/programs/dtstyle/Mouse.c | 16 +++++------ cde/programs/dtstyle/Screen.c | 42 ++++++++++++++--------------- cde/programs/dtstyle/Startup.c | 2 +- 14 files changed, 62 insertions(+), 62 deletions(-) diff --git a/cde/programs/dtstyle/Audio.c b/cde/programs/dtstyle/Audio.c index 8b1af21f..f8c32ea3 100644 --- a/cde/programs/dtstyle/Audio.c +++ b/cde/programs/dtstyle/Audio.c @@ -137,7 +137,7 @@ static Widget build_audioDlg( Widget shell ) { - register int i, n; + int i, n; Arg args[MAX_ARGS]; XmString button_string[NUM_LABELS]; XmString string; diff --git a/cde/programs/dtstyle/Backdrop.c b/cde/programs/dtstyle/Backdrop.c index f09fc22b..9a004643 100644 --- a/cde/programs/dtstyle/Backdrop.c +++ b/cde/programs/dtstyle/Backdrop.c @@ -196,7 +196,7 @@ build_dirList(char * dirStr, char tokenSep[] = ":"; char * token; char ** dirList = NULL; - register int i = 0; + int i = 0; char * tmpStr; int len = strlen(dirStr); *count = 0; @@ -243,7 +243,7 @@ free_dirList(char ** dirList, int count) { - register int i; + int i; if (dirList == NULL) return; @@ -332,7 +332,7 @@ static int CreateBackdropDialog( Widget parent ) { - register int i, n; + int i, n; Arg args[20]; Widget mainForm; Widget list; @@ -565,7 +565,7 @@ static int width, height, x, y; Window win; int num; - register int i; + int i; char *string; /* allocate space for temporary bitmap info */ backdrops.tmpBitmapNames = (char **)XtCalloc(100, sizeof(char *)); diff --git a/cde/programs/dtstyle/ColorEdit.c b/cde/programs/dtstyle/ColorEdit.c index 9ba5ded7..e125a6a4 100644 --- a/cde/programs/dtstyle/ColorEdit.c +++ b/cde/programs/dtstyle/ColorEdit.c @@ -215,7 +215,7 @@ static void CreateColorEditor( Widget parent ) { - register int n,i; + int n,i; Arg args[MAX_ARGS]; Widget sampleTB; Widget sampleForm; @@ -589,7 +589,7 @@ sliderLayoutCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[12]; Dimension redLabelWidth; Dimension greenLabelWidth; @@ -834,7 +834,7 @@ sliderLayoutCB( static void InitializeNewButton( void ) { - register int n; + int n; Arg args[6]; n=0; @@ -862,7 +862,7 @@ InitializeNewButton( void ) static void InitializeOldButton( void ) { - register int i,n, numOfPixels; + int i,n, numOfPixels; unsigned long *pixels; unsigned long plane_mask; int hue, val, sat, status; diff --git a/cde/programs/dtstyle/ColorMain.c b/cde/programs/dtstyle/ColorMain.c index 3f295796..f302fca9 100644 --- a/cde/programs/dtstyle/ColorMain.c +++ b/cde/programs/dtstyle/ColorMain.c @@ -385,7 +385,7 @@ void Customize( Widget shell ) { - register int i; + int i; /* ** Main routine does the following: @@ -501,7 +501,7 @@ void CreatePaletteButtons( Widget parent ) { - register int i,n; + int i,n; Arg args[16]; XmString string; Pixmap pixmap100; @@ -630,7 +630,7 @@ InitializePaletteList( Boolean startup ) #endif { - register int n; + int n; Arg args[4]; XmString string; XmStringTable string_table; @@ -834,7 +834,7 @@ selectPaletteCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[10]; XmListCallbackStruct *cb = (XmListCallbackStruct *)call_data; palette *tmp_palette; @@ -1058,7 +1058,7 @@ timeoutCB( XtPointer client_data, XtIntervalId *id ) { - register int n; + int n; intptr_t i; Arg args[2]; Pixel bg_pixel; @@ -1095,7 +1095,7 @@ addPaletteCB( XtPointer call_data ) { - register int n; + int n; Arg args[10]; XmString string; XmString string1; @@ -1158,7 +1158,7 @@ addOkCB( XtPointer client_data, XtPointer call_data ) { - register int n, i; + int n, i; Arg args[6]; XmString string; char *name, *filename, *tmpstr; @@ -1499,7 +1499,7 @@ deletePaletteCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[10]; char *tmpStr; palette *tmp_palette; @@ -1591,7 +1591,7 @@ resourcesCB( XtPointer call_data ) { - register int n; + int n; Arg args[12]; XmString button_string[NUM_LABELS]; XmString string; @@ -1983,7 +1983,7 @@ void DeletePaletteFromLinkList( Widget list ) { - register int n; + int n; Arg args[2]; int i; XmString string; @@ -2670,7 +2670,7 @@ CreateDialogBoxD( void AddToDialogBox( void ) { - register int n; + int n; Arg args[3]; if(style.count > 1) @@ -2701,7 +2701,7 @@ AddToDialogBox( void ) void CreateTopColor1( void ) { - register int n; + int n; Arg args[6]; XmString string; @@ -2737,7 +2737,7 @@ CreateTopColor1( void ) void CreateTopColor2( void ) { - register int n; + int n; Arg args[8]; if(style.count > 3) @@ -2770,7 +2770,7 @@ CreateTopColor2( void ) void CreateBottomColor( void ) { - register int n; + int n; Arg args[12]; XmString string; Widget addDeleteForm; diff --git a/cde/programs/dtstyle/ColorPalette.c b/cde/programs/dtstyle/ColorPalette.c index 58058808..8f8c79a4 100644 --- a/cde/programs/dtstyle/ColorPalette.c +++ b/cde/programs/dtstyle/ColorPalette.c @@ -137,7 +137,7 @@ AllocatePaletteCells( int ReColorPalette( void ) { - register int n; + int n; Arg args[MAX_ARGS]; int i; int j=0; diff --git a/cde/programs/dtstyle/Dtwm.c b/cde/programs/dtstyle/Dtwm.c index 89aabd50..a9d62f98 100644 --- a/cde/programs/dtstyle/Dtwm.c +++ b/cde/programs/dtstyle/Dtwm.c @@ -365,7 +365,7 @@ static Widget build_dtwmDlg( Widget shell ) { - register int i, n; + int i, n; Arg args[MAX_ARGS]; XmString button_string[NUM_LABELS]; XmString string; diff --git a/cde/programs/dtstyle/Font.c b/cde/programs/dtstyle/Font.c index 1dbf7a0b..ff509de6 100644 --- a/cde/programs/dtstyle/Font.c +++ b/cde/programs/dtstyle/Font.c @@ -164,7 +164,7 @@ CreateFontDlg( Widget parent ) { - register int n; + int n; int i; Arg args[MAX_ARGS]; Widget appTBox; diff --git a/cde/programs/dtstyle/I18nEnv.c b/cde/programs/dtstyle/I18nEnv.c index f8099151..674624ee 100644 --- a/cde/programs/dtstyle/I18nEnv.c +++ b/cde/programs/dtstyle/I18nEnv.c @@ -105,10 +105,10 @@ I18nEnv i18n_env; * which does the trick. */ static int -strcasecmp(register const char *s1, - register const char *s2) +strcasecmp(const char *s1, + const char *s2) { - register int c1, c2; + int c1, c2; while (*s1 && *s2) { c1 = isupper(*s1) ? tolower(*s1) : *s1; diff --git a/cde/programs/dtstyle/I18nMain.c b/cde/programs/dtstyle/I18nMain.c index f88b86e0..b468ee17 100644 --- a/cde/programs/dtstyle/I18nMain.c +++ b/cde/programs/dtstyle/I18nMain.c @@ -363,7 +363,7 @@ static Widget BuildI18nDlg( Widget shell ) { - register int i, n; + int i, n; Arg args[MAX_ARGS]; XmString button_string[NUM_LABELS]; XmString string; diff --git a/cde/programs/dtstyle/I18nUtil.c b/cde/programs/dtstyle/I18nUtil.c index 85c7dc0b..853f05c3 100644 --- a/cde/programs/dtstyle/I18nUtil.c +++ b/cde/programs/dtstyle/I18nUtil.c @@ -128,7 +128,7 @@ trim_line( char *ptr ) { - register char *lastp; + char *lastp; skip_white(ptr); for (lastp = ptr + strlen(ptr) - 1; diff --git a/cde/programs/dtstyle/Keyboard.c b/cde/programs/dtstyle/Keyboard.c index e6a90da8..84c177c0 100644 --- a/cde/programs/dtstyle/Keyboard.c +++ b/cde/programs/dtstyle/Keyboard.c @@ -157,7 +157,7 @@ static Widget build_keyboardDlg( Widget shell ) { - register int i, n; + int i, n; Arg args[MAX_ARGS]; Widget widget_list[12]; int count = 0; diff --git a/cde/programs/dtstyle/Mouse.c b/cde/programs/dtstyle/Mouse.c index 4b1b0a61..24875d93 100644 --- a/cde/programs/dtstyle/Mouse.c +++ b/cde/programs/dtstyle/Mouse.c @@ -270,7 +270,7 @@ popup_mouseBB( Widget shell ) static Widget build_mouseDialog( Widget shell ) { - register int i, n; + int i, n; Arg args[MAX_ARGS]; int nmap; XmString button_string[NUM_LABELS]; @@ -1040,7 +1040,7 @@ dclickTestCB( XtPointer call_data ) { Arg color[3], args[10]; /* arg list */ - register int n; /* arg count */ + int n; /* arg count */ XmPushButtonCallbackStruct *cb = (XmPushButtonCallbackStruct *)call_data; static int selectstate = False; @@ -1105,7 +1105,7 @@ warnToggleCB( XtPointer call_data ) { - register int n; + int n; Arg args[10]; XmString string; Boolean set; @@ -1161,7 +1161,7 @@ midwarnToggleCB( XtPointer call_data ) { - register int n; + int n; Arg args[10]; XmString warnstring; Boolean set; @@ -1225,7 +1225,7 @@ cancelWarnCB( XtPointer call_data ) { - register int n; + int n; Arg args[10]; XmString string; @@ -1254,7 +1254,7 @@ midcancelWarnCB( XtPointer call_data ) { - register int n; + int n; Arg args[10]; XmString string; @@ -1281,7 +1281,7 @@ reverseToggleCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; int i, j; Arg args[MAX_ARGS]; Boolean set; @@ -1365,7 +1365,7 @@ midreverseToggleCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; int i, j; Arg args[MAX_ARGS]; Boolean set; diff --git a/cde/programs/dtstyle/Screen.c b/cde/programs/dtstyle/Screen.c index 5a7a8a3f..3c2c937e 100644 --- a/cde/programs/dtstyle/Screen.c +++ b/cde/programs/dtstyle/Screen.c @@ -272,7 +272,7 @@ build_saverList(char * str, char tokenSep[] = " "; char * token; char ** saverList = NULL; - register int i = 0; + int i = 0; char * tmpStr, *tmpStr2; int len = strlen(str); @@ -335,7 +335,7 @@ build_selsaverList(char * envStr, char tokenSep[] = " "; char * token; char ** saverList = NULL; - register int i = 0; + int i = 0; char * tmpStr; int len = strlen(envStr); *count = 0; @@ -416,7 +416,7 @@ build_selectedList(char ** saverList, { char * selectedList = NULL; - register int i = 0; + int i = 0; char * tmpStr; int len = 0; int tmplen = 0; @@ -450,7 +450,7 @@ free_saverList(char ** saverList, int count) { - register int i; + int i; if (saverList == NULL) return; @@ -489,7 +489,7 @@ static Widget build_screenDialog( Widget shell ) { - register int i, m, n; + int i, m, n; Arg args[MAX_ARGS]; Widget form; Boolean sel_matched = False; @@ -1059,7 +1059,7 @@ formLayoutCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; Dimension ScaleHeight; Dimension LabelHeight; @@ -1329,7 +1329,7 @@ no_svr_ext_formLayoutCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; Dimension ScaleHeight; Dimension LabelHeight; @@ -1543,7 +1543,7 @@ _DtmapCB_screenDialog( XtPointer call_data ) { static int first_time = 1; - register int n; + int n; Arg args[MAX_ARGS]; XmString string; Boolean lock_on, saver_on; @@ -1800,7 +1800,7 @@ no_svr_ext_DtmapCB_screenDialog( XtPointer call_data ) { static int first_time = 1; - register int n; + int n; Arg args[MAX_ARGS]; XmString string; int mintime; @@ -1941,7 +1941,7 @@ timeOutvalueChangedCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; n=0; @@ -1979,7 +1979,7 @@ no_svr_ext_timeOutvalueChangedCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; n=0; @@ -2004,7 +2004,7 @@ saverToggleCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; Boolean set; XmString string; @@ -2118,7 +2118,7 @@ no_svr_ext_saverToggleCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; Boolean set; XmString string; @@ -2173,7 +2173,7 @@ lockToggleCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; Boolean set; XmToggleButtonCallbackStruct *cb = (XmToggleButtonCallbackStruct *)call_data; @@ -2239,7 +2239,7 @@ saversToggleCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; Boolean set; XmString string; @@ -2321,7 +2321,7 @@ systemDefaultCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; screen.saverTimeout = SAVER_DEFAULT; @@ -2357,7 +2357,7 @@ no_svr_ext_systemDefaultCB( XtPointer client_data, XtPointer call_data ) { - register int n; + int n; Arg args[MAX_ARGS]; screen.saverTimeout = SAVER_DEFAULT; @@ -2391,7 +2391,7 @@ ButtonCB( XtPointer client_data, XtPointer call_data ) { - register int i, n, m; + int i, n, m; Arg args[MAX_ARGS]; Boolean sel_matched = False; Boolean lockset; @@ -2608,7 +2608,7 @@ no_svr_ext_ButtonCB( XtPointer client_data, XtPointer call_data ) { - register int i, n, m; + int i, n, m; Arg args[MAX_ARGS]; Boolean sel_matched = False; Boolean saverset; @@ -2927,7 +2927,7 @@ saveScreen( static XmString * MakeListStrings( char ** list ) { - register int i; + int i; XmString *xmList; xmList = (XmString *) XtMalloc(savers.saverCount * sizeof(XmString)); @@ -2973,7 +2973,7 @@ ListCB( XtPointer call_data ) { XmListCallbackStruct *cb = (XmListCallbackStruct *)call_data; - register int i; + int i; Boolean runsaver = False; XmString string; diff --git a/cde/programs/dtstyle/Startup.c b/cde/programs/dtstyle/Startup.c index bc754c05..ce99c831 100644 --- a/cde/programs/dtstyle/Startup.c +++ b/cde/programs/dtstyle/Startup.c @@ -195,7 +195,7 @@ static Widget BuildStartup( Widget shell ) { - register int n; + int n; Arg args[MAX_ARGS]; XmString button_string[NUM_LABELS]; XmString string; -- 2.25.1