From 88dd3b2c71c6c50ae65f19d4f6226cb1a798d327 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Wed, 27 Jun 2018 17:25:01 -0600 Subject: [PATCH] dtlogin: remove register keyword --- cde/programs/dtlogin/auth.c | 10 +++++----- cde/programs/dtlogin/bls/validate.c | 10 +++++----- cde/programs/dtlogin/chooser.c | 2 +- cde/programs/dtlogin/daemon.c | 2 +- cde/programs/dtlogin/dtchooser.c | 6 +++--- cde/programs/dtlogin/sysauth.c | 12 ++++++------ cde/programs/dtlogin/util.c | 2 +- cde/programs/dtlogin/verify.c | 4 ++-- cde/programs/dtlogin/vgauth.c | 16 ++++++++-------- cde/programs/dtlogin/vgcallback.c | 2 +- cde/programs/dtlogin/vglang.c | 2 +- cde/programs/dtlogin/vglogo.c | 2 +- cde/programs/dtlogin/vgmain.c | 10 +++++----- cde/programs/dtlogin/vgutil.c | 2 +- 14 files changed, 41 insertions(+), 41 deletions(-) diff --git a/cde/programs/dtlogin/auth.c b/cde/programs/dtlogin/auth.c index a1c88dd1..a019faf3 100644 --- a/cde/programs/dtlogin/auth.c +++ b/cde/programs/dtlogin/auth.c @@ -504,7 +504,7 @@ SetLocalAuthorization (struct display *d) void SetAuthorization (struct display *d) { - register Xauth **auth = d->authorizations; + Xauth **auth = d->authorizations; int i; for (i = 0; i < d->authNum; i++) @@ -866,11 +866,11 @@ DefineSelf (int fd, FILE *file, Xauth *auth) { char buf[2048]; struct ifconf ifc; - register int n; + int n; int len; char *addr; int family; - register struct ifreq *ifr; + struct ifreq *ifr; ifc.ifc_len = sizeof (buf); ifc.ifc_buf = buf; @@ -937,13 +937,13 @@ DefineSelf (int fd, FILE *file, Xauth *auth) static void DefineSelf (int fd, int file, int auth) { - register int n; + int n; int len; caddr_t addr; int family; struct utsname name; - register struct hostent *hp; + struct hostent *hp; union { struct sockaddr sa; diff --git a/cde/programs/dtlogin/bls/validate.c b/cde/programs/dtlogin/bls/validate.c index 213317d5..02819341 100644 --- a/cde/programs/dtlogin/bls/validate.c +++ b/cde/programs/dtlogin/bls/validate.c @@ -768,12 +768,12 @@ getGroups ( char *name, struct verify_info *verify, int gid) int passwordExpired( struct verify_info *verify) { - register struct pr_passwd *pr; - register time_t expiration; - register time_t last_change; + struct pr_passwd *pr; + time_t expiration; + time_t last_change; time_t expiration_time; - register time_t now; - register int passwd_status; + time_t now; + int passwd_status; struct pr_passwd save_data; struct pr_default *df; char *ttime; diff --git a/cde/programs/dtlogin/chooser.c b/cde/programs/dtlogin/chooser.c index ac52ef91..dd034dc1 100644 --- a/cde/programs/dtlogin/chooser.c +++ b/cde/programs/dtlogin/chooser.c @@ -582,7 +582,7 @@ RegisterHostname (char *name) struct hostent *hostent; struct sockaddr_in in_addr; struct ifconf ifc; - register struct ifreq *ifr; + struct ifreq *ifr; struct sockaddr broad_addr; char buf[2048]; int n; diff --git a/cde/programs/dtlogin/daemon.c b/cde/programs/dtlogin/daemon.c index f905c1c8..d1ee27b8 100644 --- a/cde/programs/dtlogin/daemon.c +++ b/cde/programs/dtlogin/daemon.c @@ -62,7 +62,7 @@ extern void exit (); void BecomeDaemon( void ) { - register int i; + int i; /* * fork so that the process goes into the background automatically. Also diff --git a/cde/programs/dtlogin/dtchooser.c b/cde/programs/dtlogin/dtchooser.c index 0e8baa44..d299a268 100644 --- a/cde/programs/dtlogin/dtchooser.c +++ b/cde/programs/dtlogin/dtchooser.c @@ -316,7 +316,7 @@ MakeRootCursor( void ) void MakeBackground( void ) { - register int i; + int i; /* * Get resources first @@ -430,7 +430,7 @@ MakeBackground( void ) void MakeButtons( void ) { - register int i; + int i; Dimension width; @@ -659,7 +659,7 @@ MakeChooser( void ) void MakeDialog( DialogType dtype ) { - register int i, j; + int i, j; int width; diff --git a/cde/programs/dtlogin/sysauth.c b/cde/programs/dtlogin/sysauth.c index 9bad7ec8..34a987b2 100644 --- a/cde/programs/dtlogin/sysauth.c +++ b/cde/programs/dtlogin/sysauth.c @@ -217,7 +217,7 @@ static void Audit( struct passwd *p, char *msg, int errnum) ; static int CheckPassword( char *name, char *passwd, struct passwd **ppwd ); static int CountUsers( int added_users) ; static int CountUsersStrict( char *new_user) ; -static int PasswordAged( register struct passwd *pw) ; +static int PasswordAged( struct passwd *pw) ; static void WriteBtmp( char *name) ; @@ -488,7 +488,7 @@ CountUsersStrict( char *new_user ) #define SECONDS_IN_WEEK 604800L static int -PasswordAged( register struct passwd *pw ) +PasswordAged( struct passwd *pw ) { long change_week; /* week password was changed (1/1/70 = Week 0) */ long last_week; /* week after which password must change */ @@ -1357,7 +1357,7 @@ Authenticate( struct display *d, char *name, char *passwd, char **msg ) ***************************************************************************/ static void Audit( struct passwd *p, char *msg, int errnum) ; -static int PasswordAged(char *name, register struct passwd *pw) ; +static int PasswordAged(char *name, struct passwd *pw) ; static void WriteBtmp( char *name) ; @@ -1436,7 +1436,7 @@ WriteBtmp( char *name ) #define SECONDS_IN_WEEK 604800L static int -PasswordAged(char *name, register struct passwd *pw ) +PasswordAged(char *name, struct passwd *pw ) { struct userpw *pupw; /* authentication information from getuserpw() */ struct userpw upw; /* working authentication information */ @@ -1832,7 +1832,7 @@ tsm_check_login(uid_t uid) ***************************************************************************/ static void Audit( struct passwd *p, char *msg, int errnum) ; -static int PasswordAged( register struct passwd *pw) ; +static int PasswordAged( struct passwd *pw) ; static void WriteBtmp( char *name) ; @@ -1896,7 +1896,7 @@ WriteBtmp( char *name ) #define SECONDS_IN_WEEK 604800L static int -PasswordAged( register struct passwd *pw ) +PasswordAged( struct passwd *pw ) { return(FALSE); } diff --git a/cde/programs/dtlogin/util.c b/cde/programs/dtlogin/util.c index ee253386..60a54e98 100644 --- a/cde/programs/dtlogin/util.c +++ b/cde/programs/dtlogin/util.c @@ -592,7 +592,7 @@ MakeLangAbort( int arg ) void MakeLangList( void ) { - register int i, j; + int i, j; char *lang[500]; /* sort list for languages */ int nlang; /* total number of languages */ diff --git a/cde/programs/dtlogin/verify.c b/cde/programs/dtlogin/verify.c index b736d87e..d9f70fe3 100644 --- a/cde/programs/dtlogin/verify.c +++ b/cde/programs/dtlogin/verify.c @@ -449,8 +449,8 @@ login_defaults( struct display *d ) { extern int defcntl(); - register int flags; - register char *ptr; + int flags; + char *ptr; char *Def_path; char *final_path = malloc(MAXPATHLEN); char *element; diff --git a/cde/programs/dtlogin/vgauth.c b/cde/programs/dtlogin/vgauth.c index 017185a4..41dc6f9c 100644 --- a/cde/programs/dtlogin/vgauth.c +++ b/cde/programs/dtlogin/vgauth.c @@ -198,7 +198,7 @@ static void Audit( struct passwd *p, char *msg, int errnum) ; static int CheckPassword( char *name, char *passwd, struct passwd **ppwd ); static int CountUsers( int added_users) ; static int CountUsersStrict( char *new_user) ; -static int PasswordAged( register struct passwd *pw) ; +static int PasswordAged( struct passwd *pw) ; static void WriteBtmp( char *name) ; @@ -469,7 +469,7 @@ CountUsersStrict( char *new_user ) #define SECONDS_IN_WEEK 604800L static int -PasswordAged( register struct passwd *pw ) +PasswordAged( struct passwd *pw ) { long change_week; /* week password was changed (1/1/70 = Week 0) */ long last_week; /* week after which password must change */ @@ -1054,7 +1054,7 @@ WriteBtmp( char *name ) ***************************************************************************/ static void Audit( struct passwd *p, char *msg, int errnum) ; -static int PasswordAged( register struct passwd *pw) ; +static int PasswordAged( struct passwd *pw) ; static void WriteBtmp( char *name) ; @@ -1117,7 +1117,7 @@ WriteBtmp( char *name ) #define SECONDS_IN_WEEK 604800L static int -PasswordAged( register struct passwd *pw ) +PasswordAged( struct passwd *pw ) { long change_week; /* week password was changed (1/1/70 = Week 0) */ long last_week; /* week after which password must change */ @@ -1300,7 +1300,7 @@ Verify( char *name, char *passwd ) ***************************************************************************/ static void Audit( struct passwd *p, char *msg, int errnum) ; -static int PasswordAged(char *name, register struct passwd *pw) ; +static int PasswordAged(char *name, struct passwd *pw) ; static void WriteBtmp( char *name) ; @@ -1363,7 +1363,7 @@ WriteBtmp( char *name ) #define SECONDS_IN_WEEK 604800L static int -PasswordAged(char *name, register struct passwd *pw ) +PasswordAged(char *name, struct passwd *pw ) { struct userpw *pupw; /* authentication information from getuserpw() */ struct userpw upw; /* working authentication information */ @@ -1579,7 +1579,7 @@ Verify( char *name, char *passwd ) ***************************************************************************/ static void Audit( struct passwd *p, char *msg, int errnum) ; -static int PasswordAged( register struct passwd *pw) ; +static int PasswordAged( struct passwd *pw) ; static void WriteBtmp( char *name) ; @@ -1642,7 +1642,7 @@ WriteBtmp( char *name ) #define SECONDS_IN_WEEK 604800L static int -PasswordAged( register struct passwd *pw ) +PasswordAged( struct passwd *pw ) { return(FALSE); } diff --git a/cde/programs/dtlogin/vgcallback.c b/cde/programs/dtlogin/vgcallback.c index 69461c18..6f134ad6 100644 --- a/cde/programs/dtlogin/vgcallback.c +++ b/cde/programs/dtlogin/vgcallback.c @@ -426,7 +426,7 @@ EditPasswdCB(Widget w, XtPointer client, XtPointer call_data) XmTextVerifyPtr cbs = (XmTextVerifyPtr) call_data; int i; static char buffer[MAXPATHLEN]; - register char *s, *t; + char *s, *t; #ifdef VG_TRACE vg_TRACE_EXECUTION("main: entered EditPasswdCB ..."); diff --git a/cde/programs/dtlogin/vglang.c b/cde/programs/dtlogin/vglang.c index eef0003e..9267e42b 100644 --- a/cde/programs/dtlogin/vglang.c +++ b/cde/programs/dtlogin/vglang.c @@ -443,7 +443,7 @@ compareLangDesc( void MakeLangMenu( void ) { - register int i, k; + int i, k; char cblab[MAX_NAME_LEN]; /* pushbutton label */ int nlang; /* total number of languages */ int nlangMenus; /* number of language sub-menus */ diff --git a/cde/programs/dtlogin/vglogo.c b/cde/programs/dtlogin/vglogo.c index bd04f29d..c95d86dd 100644 --- a/cde/programs/dtlogin/vglogo.c +++ b/cde/programs/dtlogin/vglogo.c @@ -111,7 +111,7 @@ static XtResource logoResources[] = { void MakeLogo( void ) { - register int i; + int i; char *logoFile; /* name of logo bitmap file */ diff --git a/cde/programs/dtlogin/vgmain.c b/cde/programs/dtlogin/vgmain.c index 067c91bc..1dbaee1b 100644 --- a/cde/programs/dtlogin/vgmain.c +++ b/cde/programs/dtlogin/vgmain.c @@ -765,7 +765,7 @@ MakeRootCursor( void ) static void MakeBackground( void ) { - register int i; + int i; #ifdef VG_TRACE vg_TRACE_EXECUTION("MakeBackground: entered ..."); @@ -1059,7 +1059,7 @@ char *temp_p; static void MakeButtons( void ) { - register int i; + int i; Dimension max_width; /* maximum width of a set of widgets */ Dimension max_height; /* maximum height of a set of widgets */ @@ -1200,7 +1200,7 @@ MakeButtons( void ) void MakeDialog( DialogType dtype ) { - register int i, j; + int i, j; int width; @@ -1481,7 +1481,7 @@ static XtResource greetResources[] = { static void MakeGreeting( void ) { - register int i; + int i; char *greetmsg; char host[128]; @@ -1678,7 +1678,7 @@ MakeGreeting( void ) static void MakeLogin( void ) { - register int i; + int i; int j; LoginTextPtr textdata; XtTranslations textTable; diff --git a/cde/programs/dtlogin/vgutil.c b/cde/programs/dtlogin/vgutil.c index 6f2256f2..d7f23da6 100644 --- a/cde/programs/dtlogin/vgutil.c +++ b/cde/programs/dtlogin/vgutil.c @@ -145,7 +145,7 @@ static XmTextScanType sarray[] = {XmSELECT_POSITION}; int InitArg( WidgetType wtype ) { - register int i; + int i; i = 0; -- 2.25.1