From: Jon Trulson Date: Wed, 27 Jun 2018 22:37:15 +0000 (-0600) Subject: dtimsstart: remove register keyword X-Git-Tag: 2.3.0a~312 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=424b662372c1a346362a7ae0da9b83b8b0caec77;p=oweals%2Fcde.git dtimsstart: remove register keyword --- diff --git a/cde/programs/dtimsstart/env.c b/cde/programs/dtimsstart/env.c index e9d3f4d9..669623c4 100644 --- a/cde/programs/dtimsstart/env.c +++ b/cde/programs/dtimsstart/env.c @@ -140,7 +140,7 @@ int get_user_environ(void) int expand_string(char *in_str, char *out_str, int out_len, ImsConf *ims) { - register char *p, *q, *ep; + char *p, *q, *ep; char str[20]; int len = 0; UserEnv *uenv = &userEnv; diff --git a/cde/programs/dtimsstart/remote.c b/cde/programs/dtimsstart/remote.c index 13965673..68773673 100644 --- a/cde/programs/dtimsstart/remote.c +++ b/cde/programs/dtimsstart/remote.c @@ -132,10 +132,10 @@ Procedure: * 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; @@ -327,7 +327,7 @@ static int mk_remote_conf(ImsList *list, char *locale, return NoError; } -static char *mk_ims_ent(register char *bp, int idx, ImsEnt *ent) +static char *mk_ims_ent(char *bp, int idx, ImsEnt *ent) { ImsConf *ims = ent->ims; char val[20]; @@ -369,7 +369,7 @@ static char *mk_ims_ent(register char *bp, int idx, ImsEnt *ent) static int parse_ims_list(char *ptr, ImsList *list) { - register char *bp = ptr; + char *bp = ptr; char *np, *vp; char *def_name; int i, num_ent; @@ -759,9 +759,9 @@ int change_window_status(int status) int set_window_data(int ac, char **av) { - register int i; - register int nbytes; - register char *buf, *bp; + int i; + int nbytes; + char *buf, *bp; if (winEnv.atom_data == None || winEnv.atom_owner == None) return ErrInternal; diff --git a/cde/programs/dtimsstart/util.c b/cde/programs/dtimsstart/util.c index cf124a34..9437e366 100644 --- a/cde/programs/dtimsstart/util.c +++ b/cde/programs/dtimsstart/util.c @@ -92,14 +92,14 @@ char *find_system_locale_name(char *CDE_locale) /* ******** string manupilation ******** */ -char *strcpyx(register char *dest, register char *src) +char *strcpyx(char *dest, char *src) { while (*dest++ = *src++) ; return(--dest); } #ifdef unused -char *strcpy2(register char *dest, register char *src1, register char *src2) +char *strcpy2(char *dest, char *src1, char *src2) { while (*dest++ = *src1++) ; --dest; @@ -107,9 +107,9 @@ char *strcpy2(register char *dest, register char *src1, register char *src2) return(--dest); } -char *newstradded(register char *src1, register char *src2, register char *src3) +char *newstradded(char *src1, char *src2, char *src3) { - register char *p; + char *p; char *dest; dest = p = ALLOC(strlen(src1) + strlen(src2) + strlen(src3) + 1, char); @@ -162,7 +162,7 @@ bool str_to_bool(char *ptr, bool def_val) char *trim_line(char *ptr) { - register char *lastp; + char *lastp; skip_white(ptr); for (lastp = ptr + strlen(ptr) - 1; @@ -171,7 +171,7 @@ char *trim_line(char *ptr) return ptr; /* return lastp > ptr ? ptr : NULL; */ } -char **parse_strlist(register char *ptr, char sep_ch) +char **parse_strlist(char *ptr, char sep_ch) { char *pbuf[100], **new, **bp; char *sep, *p; @@ -207,7 +207,7 @@ char **parse_strlist(register char *ptr, char sep_ch) #ifdef unused int pack_strlist(char *ptr, char **listp, char sep_ch) { - register char *bp = ptr, **lp = listp; + char *bp = ptr, **lp = listp; /* if (!ptr) return 0; */ if (!lp || !*lp) { @@ -229,7 +229,7 @@ int pack_strlist(char *ptr, char **listp, char sep_ch) void free_strlist(char **pp) { - register char **ptr = pp; + char **ptr = pp; if (!ptr) return; for ( ; *ptr; ptr++) FREE(*ptr); @@ -327,7 +327,7 @@ int make_user_dir(char *path) char *dirname(char *path) { static char dname[MAXPATHLEN]; - register char *p = path; + char *p = path; int dlen; /* if (!p || !p[0]) return NULL; */ @@ -905,7 +905,7 @@ void pr_CmdConf(void) # ifdef old_hpux LocaleAlias **ap; # endif /* old_hpux */ - register char **p; + char **p; fprintf(LogFp, "CmdConf:\n"); fprintf(LogFp, "\timsConfDir=%s\n", conf->imsConfDir);