1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00

dtfile: remove register keyword

This commit is contained in:
Jon Trulson 2018-06-27 16:32:54 -06:00
parent 55a80f00cf
commit ea2d3927c7
17 changed files with 97 additions and 97 deletions

View file

@ -412,7 +412,7 @@ GetValues(
{ {
ChangeDirData * change_dir_data; ChangeDirData * change_dir_data;
Arg args[8]; Arg args[8];
register int n; int n;
XmStringTable history_list; XmStringTable history_list;
XmString string_path; XmString string_path;
@ -664,7 +664,7 @@ static void
FreeValues( FreeValues(
ChangeDirData *change_dir_data ) ChangeDirData *change_dir_data )
{ {
register int i; int i;
for (i = 0; i < change_dir_data->list_count; i++) for (i = 0; i < change_dir_data->list_count; i++)
XmStringFree (change_dir_data->history_list[i]); XmStringFree (change_dir_data->history_list[i]);

View file

@ -122,8 +122,8 @@ UpdateActionMenuPane(
FileViewData *file_view_data; FileViewData *file_view_data;
DesktopRec *desktopWindow; DesktopRec *desktopWindow;
Widget child; Widget child;
register int i, menu_offset; int i, menu_offset;
register int action_count; int action_count;
int count, del_count; int count, del_count;
int num_children; int num_children;
char ** command_list; char ** command_list;

View file

@ -1861,7 +1861,7 @@ DeselectAllDTFiles (
WorkspaceRec *workspaceData) WorkspaceRec *workspaceData)
{ {
int selection_count; int selection_count;
register int i; int i;
selection_count = workspaceData->files_selected; selection_count = workspaceData->files_selected;
@ -1892,8 +1892,8 @@ DeselectDTFile (
DesktopRec *desktopWindow) DesktopRec *desktopWindow)
{ {
int selection_count; int selection_count;
register int i; int i;
register int j; int j;
selection_count = workspaceData->files_selected; selection_count = workspaceData->files_selected;

View file

@ -841,7 +841,7 @@ _DtHideDialog(
Dialog * dialog; Dialog * dialog;
DialogData * new_data; DialogData * new_data;
CorePart * core; CorePart * core;
register int i; int i;
/* Find the dialog and then hide it. */ /* Find the dialog and then hide it. */
@ -1575,7 +1575,7 @@ TimerEvent(
XtIntervalId *id ) XtIntervalId *id )
{ {
register int i; int i;
Dialog * dialog; Dialog * dialog;
Dialog * prev_dialog; Dialog * prev_dialog;
int count; int count;

View file

@ -282,7 +282,7 @@ static ObjectPosition *GetPositionalData (
static void RedisplayUsingStackingOrder ( static void RedisplayUsingStackingOrder (
FileMgrData * file_mgr_data, FileMgrData * file_mgr_data,
Widget w, Widget w,
register XEvent *event, XEvent *event,
Region region) ; Region region) ;
static void ReorderChildrenList ( static void ReorderChildrenList (
XmManagerWidget file_window, XmManagerWidget file_window,
@ -345,8 +345,8 @@ static void LayoutDesktopIcons(
Boolean turn_off_hourglass); Boolean turn_off_hourglass);
static XmGadget InputInGadget ( static XmGadget InputInGadget (
Widget w, Widget w,
register int x, int x,
register int y); int y);
static XmGadget InputForGadget ( static XmGadget InputForGadget (
Widget cw, Widget cw,
int x, int x,
@ -787,8 +787,8 @@ OrderFiles(
FileViewData ** order_list; FileViewData ** order_list;
int * sort; int * sort;
int * sub_sort; int * sub_sort;
register int i; int i;
register int start; int start;
file_view_data = directory_set->file_view_data; file_view_data = directory_set->file_view_data;
file_count = directory_set->file_count; file_count = directory_set->file_count;
@ -903,7 +903,7 @@ FilterFiles(
{ {
FileViewData **file_view_data; FileViewData **file_view_data;
FilterData * filter_data; FilterData * filter_data;
register int i, j, k; int i, j, k;
Boolean show_hidden; Boolean show_hidden;
String filter; String filter;
Boolean mustMatch, matches; Boolean mustMatch, matches;
@ -1868,7 +1868,7 @@ GetDragIcon(
XmManagerWidget mw = (XmManagerWidget) XtParent(w); XmManagerWidget mw = (XmManagerWidget) XtParent(w);
Widget screen_object = (Widget) XmGetXmScreen(XtScreenOfObject(w)); Widget screen_object = (Widget) XmGetXmScreen(XtScreenOfObject(w));
Arg args[11]; Arg args[11];
register int n; int n;
unsigned int wid, hei, d, junk; unsigned int wid, hei, d, junk;
Widget dragIcon; Widget dragIcon;
Pixmap dragPixmap; Pixmap dragPixmap;
@ -2247,7 +2247,7 @@ InitiateIconDrag(
XRectangle pRect, lRect; XRectangle pRect, lRect;
unsigned char flags; unsigned char flags;
int stringSize; int stringSize;
register int i; int i;
Arg args[10]; Arg args[10];
Boolean allowDropInInitiatingWindow; Boolean allowDropInInitiatingWindow;
int rectCount; int rectCount;
@ -2321,18 +2321,18 @@ InitiateIconDrag(
static XmGadget static XmGadget
InputInGadget ( InputInGadget (
Widget w, Widget w,
register int x, int x,
register int y) int y)
{ {
CompositeWidget cw = (CompositeWidget)w; CompositeWidget cw = (CompositeWidget)w;
static Region r = NULL; static Region r = NULL;
FileMgrData * file_mgr_data; FileMgrData * file_mgr_data;
Boolean simpleCheck = False; Boolean simpleCheck = False;
register int i; int i;
unsigned char flags; unsigned char flags;
XRectangle pRect, lRect; XRectangle pRect, lRect;
register Widget widget; Widget widget;
file_mgr_data = ReturnDesktopPtr((Widget)cw); file_mgr_data = ReturnDesktopPtr((Widget)cw);
@ -2741,8 +2741,8 @@ DeselectFile(
Boolean valid) Boolean valid)
{ {
int selection_count; int selection_count;
register int i; int i;
register int j; int j;
selection_count = file_mgr_data->selected_file_count; selection_count = file_mgr_data->selected_file_count;
@ -2781,7 +2781,7 @@ DeselectAllFiles(
FileMgrData *file_mgr_data ) FileMgrData *file_mgr_data )
{ {
FileViewData * file_view_data; FileViewData * file_view_data;
register int i, j, k; int i, j, k;
ObjectPtr bottom; ObjectPtr bottom;
FileViewData ** repaint_list; FileViewData ** repaint_list;
@ -2887,8 +2887,8 @@ SelectAllFiles(
FileViewData ** order_list; FileViewData ** order_list;
int directory_count; int directory_count;
int selection_count; int selection_count;
register int i; int i;
register int j; int j;
ObjectPtr top; ObjectPtr top;
FileViewData ** selection_list; FileViewData ** selection_list;
@ -3678,11 +3678,11 @@ static void
RedisplayUsingStackingOrder ( RedisplayUsingStackingOrder (
FileMgrData * file_mgr_data, FileMgrData * file_mgr_data,
Widget w, Widget w,
register XEvent *event, XEvent *event,
Region region) Region region)
{ {
register Widget child; Widget child;
FileViewData * file_view_data; FileViewData * file_view_data;
ObjectPosition * bottom; ObjectPosition * bottom;
ObjectPosition * top; ObjectPosition * top;
@ -3997,7 +3997,7 @@ ReorderChildrenList (
{ {
Widget * children = file_window->composite.children; Widget * children = file_window->composite.children;
register int i, j; int i, j;
for (i = 0; i < manageCount; i++) for (i = 0; i < manageCount; i++)
children[i] = manage[i]; children[i] = manage[i];
@ -4424,7 +4424,7 @@ PositionFileView(
static Boolean static Boolean
InMultipleObjectRegion (FileMgrData * file_mgr_data, FileViewData * fileViewData) InMultipleObjectRegion (FileMgrData * file_mgr_data, FileViewData * fileViewData)
{ {
register int i; int i;
for( i = 0; i < file_mgr_data->selected_file_count; ++i ) for( i = 0; i < file_mgr_data->selected_file_count; ++i )
if( strcmp( file_mgr_data->selection_list[i]->file_data->file_name, fileViewData->file_data->file_name ) == 0 ) if( strcmp( file_mgr_data->selection_list[i]->file_data->file_name, fileViewData->file_data->file_name ) == 0 )
return True; return True;

View file

@ -231,7 +231,7 @@ FileOperationError(
************************************************************************/ ************************************************************************/
char * char *
DName( DName(
register char *name ) char *name )
{ {
char * p; char * p;
char * q; char * q;
@ -262,8 +262,8 @@ DName(
static int static int
Check( Check(
Widget w, Widget w,
register char *spth, char *spth,
register ino_t dinode, ino_t dinode,
int mode, int mode,
void (*errorHandler)() ) void (*errorHandler)() )
{ {
@ -324,15 +324,15 @@ Check(
static Boolean static Boolean
MoveDir( MoveDir(
Widget w, Widget w,
register char *source, char *source,
register char *target, char *target,
struct stat *sourceStatInfo, struct stat *sourceStatInfo,
void (*errorHandler)(), void (*errorHandler)(),
char ** targetRtn , char ** targetRtn ,
int type ) int type )
{ {
static char *pname = "MoveDir"; static char *pname = "MoveDir";
register char *p; char *p;
char * targetDir; /* original target dir path */ char * targetDir; /* original target dir path */
char *link_path; char *link_path;
@ -597,8 +597,8 @@ static Boolean
CopyDir( CopyDir(
Widget w, Widget w,
int mode, int mode,
register char *from, char *from,
register char *to, char *to,
Boolean isContainer, Boolean isContainer,
struct stat *s1, struct stat *s1,
void (*errorHandler)(), void (*errorHandler)(),
@ -771,16 +771,16 @@ Boolean
FileManip( FileManip(
Widget w, Widget w,
int mode, int mode,
register char *from, char *from,
register char *to, char *to,
Boolean isContainer, /* described in function CopyDir */ Boolean isContainer, /* described in function CopyDir */
void (*errorHandler)(), void (*errorHandler)(),
Boolean checkForBusyDir, Boolean checkForBusyDir,
int type ) int type )
{ {
register int fold; int fold;
register int fnew; int fnew;
register int n; int n;
Boolean copy_dir_return; Boolean copy_dir_return;
Boolean move_dir_return; Boolean move_dir_return;
void (*oldInt)(); void (*oldInt)();

View file

@ -1652,9 +1652,9 @@ SetValues(
ModAttrData *attr_data; ModAttrData *attr_data;
Boolean loadOk; Boolean loadOk;
register int i; int i;
register int j; int j;
register int k; int k;
DirectorySet ** directory_set; DirectorySet ** directory_set;
FileViewData ** order_list; FileViewData ** order_list;
int directory_count; int directory_count;
@ -3442,7 +3442,7 @@ DropOnPrimaryHotspot (
DirectorySet ** directory_data) DirectorySet ** directory_data)
{ {
int directory_count; int directory_count;
register int i, j; int i, j;
FileViewData * file_view_data; FileViewData * file_view_data;
DirectorySet * dir_data; DirectorySet * dir_data;
ObjectPtr top; ObjectPtr top;
@ -3967,9 +3967,9 @@ GetFileData(
int new_dir_count; int new_dir_count;
int new_file_count; int new_file_count;
ObjectPtr position_info; ObjectPtr position_info;
register int i; int i;
register int j; int j;
register int k; int k;
Boolean match; Boolean match;
@ -4787,7 +4787,7 @@ FreeDirectorySet(
DirectorySet ** directory_set, DirectorySet ** directory_set,
int directory_count) int directory_count)
{ {
register int i, j; int i, j;
if (!directory_set) if (!directory_set)
return; return;
@ -6259,7 +6259,7 @@ DoTheMove(
int file_count; int file_count;
char **file_set; char **file_set;
char **host_set; char **host_set;
register int i, j; int i, j;
char *file, *next, *end; char *file, *next, *end;
char directory[MAX_PATH]; char directory[MAX_PATH];
Boolean result = True; Boolean result = True;

View file

@ -2868,7 +2868,7 @@ findpopen(char *cmd, char *mode, int *childpid)
{ {
static char *pname = "findpopen"; static char *pname = "findpopen";
int fd[2]; int fd[2];
register int parentside, childside; int parentside, childside;
if(pipe(fd) < 0) if(pipe(fd) < 0)
return(NULL); return(NULL);

View file

@ -149,7 +149,7 @@ FileWindowExposeCallback(
DialogData * dialog_data; DialogData * dialog_data;
FileMgrData * file_mgr_data; FileMgrData * file_mgr_data;
XmDrawingAreaCallbackStruct * da_cbs; XmDrawingAreaCallbackStruct * da_cbs;
register int i; int i;
file_mgr_rec = (FileMgrRec *) client_data; file_mgr_rec = (FileMgrRec *) client_data;
dialog_data = _DtGetInstanceData ((XtPointer)file_mgr_rec); dialog_data = _DtGetInstanceData ((XtPointer)file_mgr_rec);
@ -1622,7 +1622,7 @@ ProcessSelection (
XRectangle widget_rect; XRectangle widget_rect;
DirectorySet ** directory_set; DirectorySet ** directory_set;
int directory_count; int directory_count;
register int i, j; int i, j;
Region region; Region region;
Region widget_region; Region widget_region;
Region intersect_region; Region intersect_region;

View file

@ -3920,8 +3920,8 @@ void
CloseView( CloseView(
DialogData *dialog_data ) DialogData *dialog_data )
{ {
register int i; int i;
register int j; int j;
FileMgrData * file_mgr_data; FileMgrData * file_mgr_data;
DialogData * tmpDialog_data; DialogData * tmpDialog_data;
FileMgrRec * file_mgr_rec; FileMgrRec * file_mgr_rec;
@ -4469,7 +4469,7 @@ static void
ViewHomeDirectoryHandler( ViewHomeDirectoryHandler(
Tt_message msg) Tt_message msg)
{ {
register int i, j, k; int i, j, k;
struct passwd * pwInfo; struct passwd * pwInfo;
char * homeDir; char * homeDir;
char * tmp_path; char * tmp_path;
@ -4647,7 +4647,7 @@ static void
ViewToolsDirectoryHandler( ViewToolsDirectoryHandler(
Tt_message msg) Tt_message msg)
{ {
register int i; int i;
char * tmp_path = NULL; char * tmp_path = NULL;
char * tool_dir = NULL; char * tool_dir = NULL;
char * msgFile = NULL; char * msgFile = NULL;
@ -5433,8 +5433,8 @@ static unsigned char
unsigned char **ppchNext) unsigned char **ppchNext)
{ {
unsigned char *pchR = pchIn; 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); i++) for (i = 0; ((chlen = mblen ((char *)pchIn, MB_CUR_MAX)) > 0); i++)
/* find end of word: requires singlebyte whitespace terminator */ /* find end of word: requires singlebyte whitespace terminator */
@ -5995,9 +5995,9 @@ ForceMyIconClosed (
char * host_name, char * host_name,
char * directory_name) char * directory_name)
{ {
register int i; int i;
register int j; int j;
register int k; int k;
Arg args[1]; Arg args[1];
FileViewData * file_view_data = NULL; FileViewData * file_view_data = NULL;
DialogData *dialog_data; DialogData *dialog_data;

View file

@ -624,10 +624,10 @@ extern void AddString(
/* prototype from MakeDir.c */ /* prototype from MakeDir.c */
extern int RunFileCommand( extern int RunFileCommand(
register char *command_path, char *command_path,
register char *argument1, char *argument1,
register char *argument2, char *argument2,
register char *argument3) ; char *argument3) ;
/* prototypes from Directory.h */ /* prototypes from Directory.h */
@ -960,8 +960,8 @@ extern void FileOperationError(
extern Boolean FileManip( extern Boolean FileManip(
Widget w, Widget w,
int mode, int mode,
register char *from, char *from,
register char *to, char *to,
Boolean isContainer, Boolean isContainer,
void (*errorHandler)(), void (*errorHandler)(),
Boolean checkForBusyDir, Boolean checkForBusyDir,
@ -971,7 +971,7 @@ extern int CheckAccess(
int what); int what);
extern char * DName( extern char * DName(
register char *name) ; char *name) ;
/* prototypes from FileMgr.h */ /* prototypes from FileMgr.h */

View file

@ -770,7 +770,7 @@ static void
UnmanageAllActionItems( UnmanageAllActionItems(
FileMgrRec *file_mgr_rec ) FileMgrRec *file_mgr_rec )
{ {
register int i, children; int i, children;
XmManagerWidget action_pane; XmManagerWidget action_pane;
action_pane = (XmManagerWidget) file_mgr_rec->action_pane; action_pane = (XmManagerWidget) file_mgr_rec->action_pane;
@ -987,7 +987,7 @@ TrashFiles(
Widget mbar; Widget mbar;
DtActionArg * action_args; DtActionArg * action_args;
int arg_count; int arg_count;
register int i; int i;
if (!TrashIsInitialized()) if (!TrashIsInitialized())
{ {

View file

@ -93,17 +93,17 @@
int int
RunFileCommand( RunFileCommand(
register char *command_path, char *command_path,
register char *argument1, char *argument1,
register char *argument2, char *argument2,
register char *argument3) char *argument3)
{ {
static char *pname = "RunFileCommand"; static char *pname = "RunFileCommand";
register int child; /* process id of command process */ int child; /* process id of command process */
register int wait_return; /* return value from wait */ int wait_return; /* return value from wait */
int exit_value; /* command exit value */ int exit_value; /* command exit value */
register char *command_name; /* pointer to the command name */ char *command_name; /* pointer to the command name */
register int i; int i;
void (*oldSig)(); void (*oldSig)();
/* prepare to catch the command termination */ /* prepare to catch the command termination */

View file

@ -179,10 +179,10 @@ static void RenameCollisions(
char * char *
_DtPName( _DtPName(
register char *name ) char *name )
{ {
register char * q; char * q;
static char pnam[MAXPATHLEN]; static char pnam[MAXPATHLEN];
static char dot[] = "."; static char dot[] = ".";
@ -293,16 +293,16 @@ _DtFollowLink (
Boolean Boolean
_DtStringsAreEquivalent( _DtStringsAreEquivalent(
register char *in_str, char *in_str,
register char *test_str ) char *test_str )
{ {
#ifdef NLS16 #ifdef NLS16
wchar_t c1; wchar_t c1;
wchar_t c2; wchar_t c2;
int c1size, c2size; int c1size, c2size;
#endif #endif
register int i; int i;
register int j; int j;
#ifdef NLS16 #ifdef NLS16
if (is_multibyte) if (is_multibyte)
@ -1391,7 +1391,7 @@ RetrieveAndUseNameTemplateInfo(
static void static void
RenameCollisions( char ** list, int count ) RenameCollisions( char ** list, int count )
{ {
register int i, j, k, l; int i, j, k, l;
char flg = 0, flg2 = 0; char flg = 0, flg2 = 0;
for( i = 0; i < count; ++i ) for( i = 0; i < count; ++i )

View file

@ -54,12 +54,12 @@ extern String _DtStripSpaces(
String string) ; String string) ;
extern char * _DtPName( extern char * _DtPName(
register char *name) ; char *name) ;
extern char * _DtFollowLink( extern char * _DtFollowLink(
char * path) ; char * path) ;
extern Boolean _DtStringsAreEquivalent( extern Boolean _DtStringsAreEquivalent(
register char *in_str, char *in_str,
register char *test_str) ; char *test_str) ;
extern void _DtDuplicateDialogNameList ( extern void _DtDuplicateDialogNameList (
char ** nameList, char ** nameList,
char ** newNameList, char ** newNameList,

View file

@ -395,8 +395,8 @@ static void RestoreVerifyCancel(
static int RestoreObject( static int RestoreObject(
Widget w, Widget w,
int mode, int mode,
register char *source, char *source,
register char *target, char *target,
Boolean isContainer, Boolean isContainer,
void (*errorHandler)(), void (*errorHandler)(),
Boolean checkForBusyDir, Boolean checkForBusyDir,
@ -4280,8 +4280,8 @@ static int
RestoreObject( RestoreObject(
Widget w, Widget w,
int mode, int mode,
register char *source, char *source,
register char *target, char *target,
Boolean isContainer, Boolean isContainer,
void (*errorHandler)(), void (*errorHandler)(),
Boolean checkForBusyDir, Boolean checkForBusyDir,

View file

@ -84,8 +84,8 @@
/* Cannot put into sharedFuncs.h due to conflict with FileManip.c */ /* Cannot put into sharedFuncs.h due to conflict with FileManip.c */
extern int Check( extern int Check(
register char *spth, char *spth,
register char *dpth, char *dpth,
int mode); int mode);
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------