From f446ca54e94a8b7510ddc205e0d5d47dac3fbe2b Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Wed, 27 Jun 2018 15:03:37 -0600 Subject: [PATCH] DtSvc/DtUtil1: remove register keyword --- cde/lib/DtSvc/DtUtil1/Action.c | 172 ++++++++++++++--------------- cde/lib/DtSvc/DtUtil1/ActionDb.c | 8 +- cde/lib/DtSvc/DtUtil1/ActionFind.c | 16 +-- cde/lib/DtSvc/DtUtil1/ActionTt.c | 2 +- cde/lib/DtSvc/DtUtil1/ActionUtil.c | 10 +- cde/lib/DtSvc/DtUtil1/DbUtil.c | 6 +- cde/lib/DtSvc/DtUtil1/DtHash.c | 24 ++-- cde/lib/DtSvc/DtUtil1/Dts.c | 6 +- cde/lib/DtSvc/DtUtil1/DtsDb.c | 4 +- cde/lib/DtSvc/DtUtil1/DtsMM.c | 4 +- cde/lib/DtSvc/DtUtil1/inttab.c | 4 +- cde/lib/DtSvc/DtUtil1/strtab.c | 14 +-- 12 files changed, 135 insertions(+), 135 deletions(-) diff --git a/cde/lib/DtSvc/DtUtil1/Action.c b/cde/lib/DtSvc/DtUtil1/Action.c index e63d066b..a69918e9 100644 --- a/cde/lib/DtSvc/DtUtil1/Action.c +++ b/cde/lib/DtSvc/DtUtil1/Action.c @@ -131,7 +131,7 @@ Boolean _DtCompileMessagePiece( ActionRequest * _DtCloneRequest ( ActionRequest * request) ; void _DtFreeRequest( - register ActionRequest *request) ; + ActionRequest *request) ; char * _DtFindCwd( void ) ; @@ -222,9 +222,9 @@ static void AddFailedHostToList ( ActionRequest * request, char * badHost) ; static int _DtAddEntry( - register char * string, - register char * **arrayPtr, - register int *sizePtr) ; + char * string, + char * **arrayPtr, + int *sizePtr) ; static void TryToTypeFile( ObjectData *obj, char * host, @@ -255,10 +255,10 @@ static Boolean ParseFileArgument( char * filetype, Boolean typeFile) ; static void AddPrompt( - register int argNum, + int argNum, char * prompt, - register int *numPrompts, - register PromptEntry **prompts) ; + int *numPrompts, + PromptEntry **prompts) ; static int MatchParamsToAction( ActionRequest *request, int *numPrompts, @@ -273,33 +273,33 @@ static void ProcessOneSegment( int * unused, Boolean * paramUsed) ; static ActionPtr CloneActionDBEntry( - register ActionPtr action) ; + ActionPtr action) ; static void CloneParsedMessage( - register parsedMsg * old_pmsg, - register parsedMsg * new_pmsg ) ; + parsedMsg * old_pmsg, + parsedMsg * new_pmsg ) ; static void FreeParsedMessage( - register parsedMsg * parsedMessage) ; + parsedMsg * parsedMessage) ; static parsedMsg * CloneParsedMessageArray( - register parsedMsg * pmsgArray, - register int count ) ; + parsedMsg * pmsgArray, + int count ) ; static void FreeParsedMessageArray( - register parsedMsg * parsedMessageArray, + parsedMsg * parsedMessageArray, int count ) ; static Boolean InsertArgumentString( Widget w, - register char **bufPtr, + char **bufPtr, int * bufSizePtr, ActionRequest *request, - register ObjectData *object, + ObjectData *object, unsigned long mask, char * relPathHost, char * relPathDir, Boolean addLeadingSpace, unsigned long processingMask ) ; static void InsertUnmappedArgumentString( - register char **bufPtr, + char **bufPtr, int * bufSizePtr, - register ObjectData *object, + ObjectData *object, Boolean addLeadingSpace ) ; static char * GrowMsgBuffer( char * buffer, @@ -324,9 +324,9 @@ static void InitiateDtNotifyMessage( ActionRequest *request ) ; static void PrepareAndExecuteAction( Widget w, - register ActionRequest *request); + ActionRequest *request); static void __ExtractCWD( - register ActionRequest *request, + ActionRequest *request, char ** hostPtr, char ** dirPtr, Boolean useObjectInfo) ; @@ -342,29 +342,29 @@ static void CreateContinueDialog( Widget w, ActionRequest *request, int numPrompts, - register PromptEntry *prompts) ; + PromptEntry *prompts) ; static void CancelPromptDialog( Widget widget, PromptDialog *dialog, XtPointer call_data) ; static void ProcessPromptDialog( Widget widget, - register PromptDialog *dialog, + PromptDialog *dialog, XtPointer call_data) ; static void ChangePromptTraversal( Widget widget, - register PromptDialog *dialog, + PromptDialog *dialog, XtPointer call_data) ; static void CreatePromptDialog( Widget w, ActionRequest *request, - register int numPrompts, - register PromptEntry *prompts) ; + int numPrompts, + PromptEntry *prompts) ; static Boolean MoreArgumentsToProcess( - register ActionRequest *request) ; + ActionRequest *request) ; static Boolean ProcessRequest( Widget w, - register ActionRequest *request) ; + ActionRequest *request) ; static void InitLocalizedStrings( void ) ; static int LinkToTypeQuark( char * host, @@ -485,7 +485,7 @@ DtActionInvoke( DtActionCallbackProc statusUpdateCb, XtPointer client_data) { - register int i; + int i; ActionRequest *request; char *contextHost= NULL;/* dummy to replace old parameter */ _DtActInvRecT *invp; /* pointer to invocation record */ @@ -1281,11 +1281,11 @@ CreateActionRequest( _DtActInvRecT *invp ) { - register int i, j; + int i, j; int numObjects = 0; ObjectData * objectDataArray; ObjectData objectData; - register ActionRequest * request; + ActionRequest * request; /* Allocate a new request structure -- zero filled */ @@ -1453,7 +1453,7 @@ CreateInvocationRecord( DtActionArg *aap, int aac) { - register int i; + int i; _DtActInvRecT *invp; /* pointer to invocation record */ char *tmp; @@ -1720,7 +1720,7 @@ ParseFileArgument( Boolean typeFile ) { - register int i, j; + int i, j; String dirName; String host; String dir; @@ -1890,12 +1890,12 @@ _DtFindCwd( void ) static int _DtAddEntry( - register String string, - register String **arrayPtr, - register int *sizePtr ) + String string, + String **arrayPtr, + int *sizePtr ) { - register int i; + int i; /* See if the string is already in the array */ for (i = 0; i < *sizePtr; i++) @@ -2050,11 +2050,11 @@ LinkToTypeQuark( static Boolean ProcessRequest( Widget w, - register ActionRequest *request ) + ActionRequest *request ) { int unused; - register ActionPtr action; + ActionPtr action; int numPrompts; PromptEntry * prompts; DtShmBoson actionQuark; @@ -2239,13 +2239,13 @@ ProcessRequest( static void PrepareAndExecuteAction( Widget w, - register ActionRequest *request ) + ActionRequest *request ) { char * relPathHost; char * relPathDir; - register int i; - register ActionPtr action = request->clonedAction; + int i; + ActionPtr action = request->clonedAction; int argNum; _DtActInvRecT *invp; /* pointer to invocation record */ _DtActChildRecT *childrecp; /* pointer to child record */ @@ -2423,7 +2423,7 @@ PrepareAndExecuteAction( */ static void __ExtractCWD( - register ActionRequest *request, + ActionRequest *request, char ** hostPtr, char ** dirPtr, Boolean useObjectInfo ) @@ -2432,7 +2432,7 @@ __ExtractCWD( String msg; String lastCh; int lastChLen; - register ActionPtr action = request->clonedAction; + ActionPtr action = request->clonedAction; /* Only dropped objects will have been 'typed' at this point */ if (useObjectInfo && (IS_CMD(action->mask)) && (request->numObjects > 0) && @@ -2534,10 +2534,10 @@ __ExtractCWD( static Boolean MoreArgumentsToProcess( - register ActionRequest *request ) + ActionRequest *request ) { - register int i; + int i; char * path; char * dtype; @@ -2761,10 +2761,10 @@ _DtCloneRequest ( void _DtFreeRequest( - register ActionRequest *request ) + ActionRequest *request ) { - register int i; + int i; XtFree(request->actionName); @@ -2826,11 +2826,11 @@ _DtFreeRequest( static ActionPtr CloneActionDBEntry( - register ActionPtr action ) + ActionPtr action ) { - register ActionPtr newAction = (ActionPtr)XtMalloc((Cardinal)sizeof(Action)); - register int i; + ActionPtr newAction = (ActionPtr)XtMalloc((Cardinal)sizeof(Action)); + int i; /* Clone each field */ newAction->action = action->action; @@ -2928,10 +2928,10 @@ CloneActionDBEntry( void _DtFreeActionStruct( - register ActionPtr action ) + ActionPtr action ) { - register int i; + int i; if (action == NULL) return; @@ -2975,13 +2975,13 @@ _DtFreeActionStruct( static void CloneParsedMessage( - register parsedMsg * old_pmsg, - register parsedMsg * new_pmsg ) + parsedMsg * old_pmsg, + parsedMsg * new_pmsg ) { int i; - register MsgComponent * piece; - register MsgComponent * newPiece; + MsgComponent * piece; + MsgComponent * newPiece; new_pmsg->numMsgParts = old_pmsg->numMsgParts; if (old_pmsg->compiledMessage) @@ -3041,7 +3041,7 @@ CloneParsedMessage( */ static void FreeParsedMessage( - register parsedMsg * parsedMessage ) + parsedMsg * parsedMessage ) { int i; @@ -3067,8 +3067,8 @@ FreeParsedMessage( */ static parsedMsg * CloneParsedMessageArray( - register parsedMsg * pmsgArray, - register int count ) + parsedMsg * pmsgArray, + int count ) { parsedMsg * newArray; @@ -3092,7 +3092,7 @@ CloneParsedMessageArray( */ static void FreeParsedMessageArray( - register parsedMsg * parsedMessageArray, + parsedMsg * parsedMessageArray, int count ) { @@ -3135,9 +3135,9 @@ _DtCompileMessagePiece( int * promptDataIndex ) { - register int i, j; + int i, j; Boolean firstParmUsed; - register MsgComponent * segment; + MsgComponent * segment; char * compiledMsg = NULL; int compiledMsgSize = 0; ObjectData tmpObjData; @@ -3393,10 +3393,10 @@ _DtCompileMessagePiece( static Boolean InsertArgumentString( Widget w, - register char **bufPtr, + char **bufPtr, int * bufSizePtr, ActionRequest *request, - register ObjectData *object, + ObjectData *object, unsigned long mask, char * relPathHost, char * relPathDir, @@ -3568,9 +3568,9 @@ InsertArgumentString( static void InsertUnmappedArgumentString( - register char **bufPtr, + char **bufPtr, int * bufSizePtr, - register ObjectData *object, + ObjectData *object, Boolean addLeadingSpace ) { @@ -3645,13 +3645,13 @@ GrowMsgBuffer( static void AddPrompt( - register int argNum, + int argNum, String prompt, - register int *numPrompts, - register PromptEntry **prompts ) + int *numPrompts, + PromptEntry **prompts ) { - register int i; + int i; /* * Standard arguments only want their prompts entered once. @@ -3697,7 +3697,7 @@ MatchParamsToAction( Boolean * paramUsed = NULL; int unused; Boolean argsOptionFound; - register int i; + int i; int lastArgReferenced; ActionPtr action = request->clonedAction; @@ -3966,7 +3966,7 @@ CancelPromptDialog( static void ChangePromptTraversal( Widget widget, - register PromptDialog *dialog, + PromptDialog *dialog, XtPointer call_data ) { XmProcessTraversal (widget, XmTRAVERSE_NEXT_TAB_GROUP); @@ -3982,11 +3982,11 @@ ChangePromptTraversal( static void ProcessPromptDialog( Widget widget, - register PromptDialog *dialog, + PromptDialog *dialog, XtPointer call_data ) { - register int i, j; + int i, j; String value; /* Unpost the dialog */ @@ -4114,18 +4114,18 @@ static void CreatePromptDialog( Widget w, ActionRequest *request, - register int numPrompts, - register PromptEntry *prompts ) + int numPrompts, + PromptEntry *prompts ) { - register PromptDialog * dialog; - register DialogPromptEntry * promptDes; + PromptDialog * dialog; + DialogPromptEntry * promptDes; XmString pt1; String title; Widget shell, bboard, frame, form, label; Widget promptLabel, topAttach; Widget separator, ok, cancel; - register int count; + int count; int n, i; Arg args[20]; XmString labelString; @@ -4411,8 +4411,8 @@ ContinueRequest( XtPointer call_data ) { - register int i; - register ContinueDialog *dialog = (ContinueDialog *)user_data; + int i; + ContinueDialog *dialog = (ContinueDialog *)user_data; /* Destroy the dialog */ XtDestroyWidget(XtParent(dialog->topLevel)); @@ -4478,8 +4478,8 @@ CancelRequest( XtPointer call_data ) { - register int i; - register ContinueDialog *dialog = (ContinueDialog *)user_data; + int i; + ContinueDialog *dialog = (ContinueDialog *)user_data; unsigned long evalStatus; unsigned long userStatus; _DtActInvRecT *invp; @@ -4529,13 +4529,13 @@ CreateContinueDialog( Widget w, ActionRequest *request, int numPrompts, - register PromptEntry *prompts ) + PromptEntry *prompts ) { - register ContinueDialog * dialog; + ContinueDialog * dialog; String title; XmString label; - register int i; + int i; int n; Arg args[10]; XmString ok, cancel; diff --git a/cde/lib/DtSvc/DtUtil1/ActionDb.c b/cde/lib/DtSvc/DtUtil1/ActionDb.c index 8d6497b4..9716d21a 100644 --- a/cde/lib/DtSvc/DtUtil1/ActionDb.c +++ b/cde/lib/DtSvc/DtUtil1/ActionDb.c @@ -230,7 +230,7 @@ static unsigned long _DtActFieldBitLookup(char *name) { - register int j; + int j; char *np = name; #ifdef _DT_ALLOW_DT_MSGS char dtnamebuf[sizeof(_DtPFX) + sizeof(_DtACTION_DTN_VALUE)] = _DtPFX; @@ -290,7 +290,7 @@ _DtActFieldBitLookup(char *name) static char * _DtActFieldNameLookup(long bitmask) { - register int j; + int j; if ( !bitmask ) return NULL; @@ -312,7 +312,7 @@ _DtActFieldNameLookup(long bitmask) static Boolean _DtActDupFieldNameCheck(DtDtsDbField **fields,int numFields,XrmQuark name) { - register int i; + int i; for ( i = 0; i < numFields; i++ ) { @@ -998,7 +998,7 @@ _DtActionConverter(DtDtsDbField * fields, DtDtsDbDatabase *act_db; DtDtsDbRecord *act_rec; DtDtsDbField *fld; - register int i; + int i; unsigned int mask = 0; char bigBuf[_DtAct_MAX_BUF_SIZE]; char *buf = bigBuf; diff --git a/cde/lib/DtSvc/DtUtil1/ActionFind.c b/cde/lib/DtSvc/DtUtil1/ActionFind.c index 365a6214..46d2c4f7 100644 --- a/cde/lib/DtSvc/DtUtil1/ActionFind.c +++ b/cde/lib/DtSvc/DtUtil1/ActionFind.c @@ -106,9 +106,9 @@ static void _DtActionGetRecordWeight( long * primaryWeightPtr, long * secondaryWeightPtr ); static void ParseMessage( - register ActionPtr action, - register char * str, - register parsedMsg * msg) ; + ActionPtr action, + char * str, + parsedMsg * msg) ; static Boolean ValidKeyword( char *start, char *end, @@ -2273,18 +2273,18 @@ _DtActionFindDBEntry( ActionRequest *reqp, static void ParseMessage( - register ActionPtr action, - register char * str, - register parsedMsg * msg ) + ActionPtr action, + char * str, + parsedMsg * msg ) { char *start; - register char *string; + char *string; char *keywordStart, *keywordEnd; char *prompt; int keyword, argNum; Boolean isFile; - register MsgComponent *newBlock; + MsgComponent *newBlock; /* Initialize all fields */ msg->parsedMessage = NULL; diff --git a/cde/lib/DtSvc/DtUtil1/ActionTt.c b/cde/lib/DtSvc/DtUtil1/ActionTt.c index 1a666b45..02de2196 100644 --- a/cde/lib/DtSvc/DtUtil1/ActionTt.c +++ b/cde/lib/DtSvc/DtUtil1/ActionTt.c @@ -136,7 +136,7 @@ extern Boolean _DtCompileMessagePiece( extern ActionRequest * _DtCloneRequest ( ActionRequest * request) ; extern void _DtFreeRequest( - register ActionRequest *request) ; + ActionRequest *request) ; /******** End Public Function Declarations ********/ diff --git a/cde/lib/DtSvc/DtUtil1/ActionUtil.c b/cde/lib/DtSvc/DtUtil1/ActionUtil.c index 239cb9b5..3a4c7667 100644 --- a/cde/lib/DtSvc/DtUtil1/ActionUtil.c +++ b/cde/lib/DtSvc/DtUtil1/ActionUtil.c @@ -886,7 +886,7 @@ _DtActGenerateTmpFile(char *dir,char *format,mode_t mode,int *fd) void _DtRemoveTrailingBlanksInPlace(char **s) { - register char *p; + char *p; if (!s || !strlen(*s)) return; @@ -1182,7 +1182,7 @@ _DtActFreeChildRec( _DtActChildRecT *childRecP) ******************************************************************************/ int _DtActDeleteChildRec( _DtActInvRecT *invp, _DtActChildRecT *childp) { - register int i,j; + int i,j; if ( !invp || !childp ) return 0; @@ -1222,7 +1222,7 @@ int _DtActDeleteChildRec( _DtActInvRecT *invp, _DtActChildRecT *childp) ******************************************************************************/ int _DtActDeleteInvRec( DtActionInvocationID id ) { - register int i; + int i; CallbackData *data; _DtSvcProcessLock(); @@ -1394,7 +1394,7 @@ _DtActChildRecT *_DtActFindChildRec( static void _DtActFreeInvRec( _DtActInvRecT *invp ) { - register int i; + int i; /* @@ -1880,7 +1880,7 @@ _DtActGetCmdReturnArgs( _DtActChildRecT *childp, DtActionArg **aargv ) { - register int i; + int i; _DtActInvRecT *invp; DtActionArg *newArgp; diff --git a/cde/lib/DtSvc/DtUtil1/DbUtil.c b/cde/lib/DtSvc/DtUtil1/DbUtil.c index ff88e3f8..7e05bf38 100644 --- a/cde/lib/DtSvc/DtUtil1/DbUtil.c +++ b/cde/lib/DtSvc/DtUtil1/DbUtil.c @@ -618,20 +618,20 @@ _DtFindMatchingFiles( { /* LOCAL VARIABLES */ - register DtDirPaths *files; /* An array of pointers to the filenames which + DtDirPaths *files; /* An array of pointers to the filenames which have been found. */ int max_files; /* The total number of filenames that can be stored in the "files" array before it must be reallocd. */ int num_found; /* The number of files which have been found. */ - register DIR *dirp; /* Variables for walking through the directory + DIR *dirp; /* Variables for walking through the directory entries. */ char * next_file; struct dirent *dp = NULL; char *file_suffix; int suffixLen, nameLen; int nextIndex; - register char * next_path; + char * next_path; int files_in_this_directory; int base; diff --git a/cde/lib/DtSvc/DtUtil1/DtHash.c b/cde/lib/DtSvc/DtUtil1/DtHash.c index b6133926..2bb59c77 100644 --- a/cde/lib/DtSvc/DtUtil1/DtHash.c +++ b/cde/lib/DtSvc/DtUtil1/DtHash.c @@ -146,8 +146,8 @@ DtHashTbl _DtUtilMakeIHash(int size) void ** _DtUtilGetHash(DtHashTbl t, const unsigned char * key) { hash * tbl = (hash *) t; - register int bucket; - register hash_entry * tmp; + int bucket; + hash_entry * tmp; hash_entry * new; if(tbl->hash_type == String_Key) @@ -194,8 +194,8 @@ void ** _DtUtilGetHash(DtHashTbl t, const unsigned char * key) void ** _DtUtilFindHash(DtHashTbl t, const unsigned char * key) { - register hash * tbl = (hash *) t; - register hash_entry * tmp; + hash * tbl = (hash *) t; + hash_entry * tmp; if(tbl->hash_type == String_Key) { @@ -217,10 +217,10 @@ void ** _DtUtilFindHash(DtHashTbl t, const unsigned char * key) void * _DtUtilDelHash(DtHashTbl t, const unsigned char * key) { - register hash * tbl = (hash *) t; + hash * tbl = (hash *) t; - register int bucket; - register hash_entry * tmp, * prev = NULL; + int bucket; + hash_entry * tmp, * prev = NULL; if(tbl->hash_type == String_Key) bucket = hash_string(key, tbl->size); @@ -277,7 +277,7 @@ void * _DtUtilDelHash(DtHashTbl t, const unsigned char * key) int _DtUtilOperateHash(DtHashTbl t, void (*ptr)(), void * usr_arg) { hash * tbl = (hash *) t; - register hash_entry * tmp = tbl->start; + hash_entry * tmp = tbl->start; int c = 0; while(tmp) @@ -292,7 +292,7 @@ int _DtUtilOperateHash(DtHashTbl t, void (*ptr)(), void * usr_arg) void _DtUtilDestroyHash(DtHashTbl t, int (*ptr)(), void * usr_arg) { hash * tbl = (hash *) t; - register hash_entry * tmp = tbl->start, * prev; + hash_entry * tmp = tbl->start, * prev; while(tmp) { @@ -309,10 +309,10 @@ void _DtUtilDestroyHash(DtHashTbl t, int (*ptr)(), void * usr_arg) free(tbl); } -static int hash_string(register const unsigned char * s, int modulo) +static int hash_string(const unsigned char * s, int modulo) { - register unsigned result = 0; - register int i=1; + unsigned result = 0; + int i=1; while(*s!=0) result += (*s++ << i++); diff --git a/cde/lib/DtSvc/DtUtil1/Dts.c b/cde/lib/DtSvc/DtUtil1/Dts.c index 846942da..c5160af3 100644 --- a/cde/lib/DtSvc/DtUtil1/Dts.c +++ b/cde/lib/DtSvc/DtUtil1/Dts.c @@ -2227,10 +2227,10 @@ name_list(type_info_t *linfo, DtDtsMMDatabase *db, DtDtsMMRecord *rec_ptr) * 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/lib/DtSvc/DtUtil1/DtsDb.c b/cde/lib/DtSvc/DtUtil1/DtsDb.c index 6983f825..ba7c3086 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsDb.c +++ b/cde/lib/DtSvc/DtUtil1/DtsDb.c @@ -338,7 +338,7 @@ _DtDtsDbRecordSort(DtDtsDbDatabase *db, _DtDtsDbRecordCompare compare) DtDtsDbField * _DtDtsDbGetField(DtDtsDbRecord *rec, char *name) { - register int i; + int i; /* * Field names have been quarked so quark 'name' and @@ -379,7 +379,7 @@ _DtDtsDbGetRecordByName(DtDtsDbDatabase *db, char *name) DtDtsDbRecord srch; DtDtsDbRecord **result; DtDtsDbRecord *s = &srch; - register int i; + int i; XrmQuark name_quark = XrmStringToQuark(name); /* diff --git a/cde/lib/DtSvc/DtUtil1/DtsMM.c b/cde/lib/DtSvc/DtUtil1/DtsMM.c index b6530b6a..99965b0e 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsMM.c +++ b/cde/lib/DtSvc/DtUtil1/DtsMM.c @@ -414,7 +414,7 @@ _DtDtsMMGet(const char *name) DtDtsMMField * _DtDtsMMGetField(DtDtsMMRecord *rec, const char *name) { - register int i; + int i; int fld; DtDtsMMField *fld_ptr; DtDtsMMField *fld_ptr_list; @@ -460,7 +460,7 @@ _DtDtsMMGetRecordByName(DtDtsMMDatabase *db, const char *name) DtDtsMMRecord srch; DtDtsMMRecord *result; DtDtsMMRecord *s = &srch; - register int i; + int i; DtShmBoson name_quark = _DtDtsMMStringToBoson(name); DtDtsMMRecord *rec_ptr; DtDtsMMRecord *rec_ptr_list; diff --git a/cde/lib/DtSvc/DtUtil1/inttab.c b/cde/lib/DtSvc/DtUtil1/inttab.c index b7dd2737..bc1de38a 100644 --- a/cde/lib/DtSvc/DtUtil1/inttab.c +++ b/cde/lib/DtSvc/DtUtil1/inttab.c @@ -73,9 +73,9 @@ typedef struct builder { const int * _DtShmFindIntTabEntry(DtShmInttab inttab, unsigned int key) { - register const inttab_t * ptr = (const inttab_t *) inttab; + const inttab_t * ptr = (const inttab_t *) inttab; - register int i; + int i; if ( !ptr->key) return(0); diff --git a/cde/lib/DtSvc/DtUtil1/strtab.c b/cde/lib/DtSvc/DtUtil1/strtab.c index 34969776..dda9589e 100644 --- a/cde/lib/DtSvc/DtUtil1/strtab.c +++ b/cde/lib/DtSvc/DtUtil1/strtab.c @@ -89,9 +89,9 @@ const char * _DtShmBosonToString(DtShmStrtab strtab, int boson) DtShmBoson _DtShmStringToBoson(DtShmStrtab strtab, const char * string) { - register unsigned int i,j; - register unsigned const char * s; - register strtab_entry_t * ptr = (strtab_entry_t *) ((unsigned char *) strtab + + unsigned int i,j; + unsigned const char * s; + strtab_entry_t * ptr = (strtab_entry_t *) ((unsigned char *) strtab + ((strtab_t *) strtab) -> st_taboffset); /* @@ -260,10 +260,10 @@ _DtShmProtoCopyStrtab(DtShmProtoStrtab in, void * destination) static void build_it(int a, struct strtab_build * ptr, unsigned char * key) { - register unsigned int i,j; - register unsigned char * s; - register strtab_entry_t * e; - register unsigned short * add_ptr; + unsigned int i,j; + unsigned char * s; + strtab_entry_t * e; + unsigned short * add_ptr; strcpy((char *) ptr->strstart + a, (const char *)key); -- 2.25.1