dtfile: remove register keyword

diff --git a/cde/programs/dtfile/ChangeDir.c b/cde/programs/dtfile/ChangeDir.c
index e30c4f18f504ab78b0c3c869e3944d8c2279a8cd..c8d8eee15310281d4629958bec74b105262a0a9d 100644 (file)
--- a/cde/programs/dtfile/ChangeDir.c
+++ b/cde/programs/dtfile/ChangeDir.c
@@ -412,7 +412,7 @@ GetValues(
 {
    ChangeDirData * change_dir_data;
    Arg args[8];
-   register int n;
+   int n;
    XmStringTable history_list;
    XmString      string_path;
 
@@ -664,7 +664,7 @@ static void
 FreeValues(
         ChangeDirData *change_dir_data )
 {
-   register int i;
+   int i;
 
    for (i = 0; i < change_dir_data->list_count; i++)
       XmStringFree (change_dir_data->history_list[i]);

diff --git a/cde/programs/dtfile/Command.c b/cde/programs/dtfile/Command.c
index e37e7834eeede169da3e5f6234dcb05e4d24bdad..2c25cc35e01187de3bae3e83b7da0de6f1b97b78 100644 (file)
--- a/cde/programs/dtfile/Command.c
+++ b/cde/programs/dtfile/Command.c
@@ -122,8 +122,8 @@ UpdateActionMenuPane(
    FileViewData *file_view_data;
    DesktopRec *desktopWindow;
    Widget child;
-   register int i, menu_offset;
-   register int action_count;
+   int i, menu_offset;
+   int action_count;
    int count, del_count;
    int num_children;
    char ** command_list;

diff --git a/cde/programs/dtfile/Desktop.c b/cde/programs/dtfile/Desktop.c
index 19490d316297d61c1b7ff599d76e025e9f64bc70..68bc6e16ddc267a9a8c45a5df0b86244f84c3224 100644 (file)
--- a/cde/programs/dtfile/Desktop.c
+++ b/cde/programs/dtfile/Desktop.c
@@ -1861,7 +1861,7 @@ DeselectAllDTFiles (
       WorkspaceRec *workspaceData)
 {
    int selection_count;
-   register int i;
+   int i;
 
    selection_count = workspaceData->files_selected;
 
@@ -1892,8 +1892,8 @@ DeselectDTFile (
       DesktopRec *desktopWindow)
 {
    int selection_count;
-   register int i;
-   register int j;
+   int i;
+   int j;
 
 
    selection_count = workspaceData->files_selected;

diff --git a/cde/programs/dtfile/Encaps.c b/cde/programs/dtfile/Encaps.c
index bf95070ff0a729e28ff2e0b0a63284562da5550c..ed72e1c8516d22a1f5b3ef40ba2eb6d8279ac7fe 100644 (file)
--- a/cde/programs/dtfile/Encaps.c
+++ b/cde/programs/dtfile/Encaps.c
@@ -841,7 +841,7 @@ _DtHideDialog(
    Dialog * dialog;
    DialogData * new_data;
    CorePart * core;
-   register int i;
+   int i;
 
 
    /*  Find the dialog and then hide it.  */
@@ -1575,7 +1575,7 @@ TimerEvent(
         XtIntervalId *id )
 
 {
-   register int i;
+   int i;
    Dialog * dialog;
    Dialog * prev_dialog;
    int count;

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

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

diff --git a/cde/programs/dtfile/FileMgr.c b/cde/programs/dtfile/FileMgr.c
index 0cc15646324c2f44c2f1ec6cbbd4d2413f968e44..011e80fecd0f76b4848838d0f4cbac2056707cc1 100644 (file)
--- a/cde/programs/dtfile/FileMgr.c
+++ b/cde/programs/dtfile/FileMgr.c
@@ -1652,9 +1652,9 @@ SetValues(
    ModAttrData *attr_data;
    Boolean loadOk;
 
-   register int i;
-   register int j;
-   register int k;
+   int i;
+   int j;
+   int k;
    DirectorySet ** directory_set;
    FileViewData ** order_list;
    int directory_count;
@@ -3442,7 +3442,7 @@ DropOnPrimaryHotspot (
    DirectorySet ** directory_data)
 {
    int directory_count;
-   register int i, j;
+   int i, j;
    FileViewData * file_view_data;
    DirectorySet * dir_data;
    ObjectPtr top;
@@ -3967,9 +3967,9 @@ GetFileData(
    int new_dir_count;
    int new_file_count;
    ObjectPtr position_info;
-   register int i;
-   register int j;
-   register int k;
+   int i;
+   int j;
+   int k;
    Boolean match;
 
 
@@ -4787,7 +4787,7 @@ FreeDirectorySet(
         DirectorySet ** directory_set,
         int directory_count)
 {
-   register int i, j;
+   int i, j;
 
    if (!directory_set)
      return;
@@ -6259,7 +6259,7 @@ DoTheMove(
    int file_count;
    char **file_set;
    char **host_set;
-   register int i, j;
+   int i, j;
    char *file, *next, *end;
    char directory[MAX_PATH];
    Boolean result = True;

diff --git a/cde/programs/dtfile/Find.c b/cde/programs/dtfile/Find.c
index b53145db279f1141858ee03353384f676b06b0c3..9293d0239a0a22b11335f3309582d46dde002a68 100644 (file)
--- a/cde/programs/dtfile/Find.c
+++ b/cde/programs/dtfile/Find.c
@@ -2868,7 +2868,7 @@ findpopen(char *cmd, char *mode, int *childpid)
 {
    static char *pname = "findpopen";
    int     fd[2];
-   register int parentside, childside;
+   int parentside, childside;
 
    if(pipe(fd) < 0)
         return(NULL);

diff --git a/cde/programs/dtfile/IconWindow.c b/cde/programs/dtfile/IconWindow.c
index 43a66ce8eacec36f0b00c6fa0aa52a01a337cbb3..3892448e68c90745fff4f07061528ac0125f4931 100644 (file)
--- a/cde/programs/dtfile/IconWindow.c
+++ b/cde/programs/dtfile/IconWindow.c
@@ -149,7 +149,7 @@ FileWindowExposeCallback(
    DialogData  * dialog_data;
    FileMgrData * file_mgr_data;
    XmDrawingAreaCallbackStruct * da_cbs;
-   register int i;
+   int i;
 
    file_mgr_rec = (FileMgrRec *) client_data;
    dialog_data = _DtGetInstanceData ((XtPointer)file_mgr_rec);
@@ -1622,7 +1622,7 @@ ProcessSelection (
    XRectangle   widget_rect;
    DirectorySet ** directory_set;
    int directory_count;
-   register int i, j;
+   int i, j;
    Region region;
    Region widget_region;
    Region intersect_region;

diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c
index 217364c5b0085d64a348a139a5de684d07d1b0f4..4943a5f65305fbdabea037933158644df5fc5f62 100644 (file)
--- a/cde/programs/dtfile/Main.c
+++ b/cde/programs/dtfile/Main.c
@@ -3920,8 +3920,8 @@ void
 CloseView(
         DialogData *dialog_data )
 {
-   register int i;
-   register int j;
+   int i;
+   int j;
    FileMgrData * file_mgr_data;
    DialogData * tmpDialog_data;
    FileMgrRec * file_mgr_rec;
@@ -4469,7 +4469,7 @@ static void
 ViewHomeDirectoryHandler(
    Tt_message msg)
 {
-   register int i, j, k;
+   int i, j, k;
    struct passwd * pwInfo;
    char * homeDir;
    char * tmp_path;
@@ -4647,7 +4647,7 @@ static void
 ViewToolsDirectoryHandler(
    Tt_message msg)
 {
-   register int i;
+   int i;
    char * tmp_path = NULL;
    char * tool_dir = NULL;
    char * msgFile = NULL;
@@ -5433,8 +5433,8 @@ static unsigned char
         unsigned char **ppchNext)
 {
     unsigned char *pchR = pchIn;
-    register int   i;
-    register int   chlen;
+    int   i;
+    int   chlen;
 
     for (i = 0; ((chlen = mblen ((char *)pchIn, MB_CUR_MAX)) > 0); i++)
     /* find end of word: requires singlebyte whitespace terminator */
@@ -5995,9 +5995,9 @@ ForceMyIconClosed (
    char * host_name,
    char * directory_name)
 {
-   register int i;
-   register int j;
-   register int k;
+   int i;
+   int j;
+   int k;
    Arg args[1];
    FileViewData * file_view_data = NULL;
    DialogData *dialog_data;

diff --git a/cde/programs/dtfile/Main.h b/cde/programs/dtfile/Main.h
index 08b4ffc33be287370533dd66d2ad4cf5a0a1ac9f..e19429d781c92b4d98c45abae15bc89072d1594e 100644 (file)
--- a/cde/programs/dtfile/Main.h
+++ b/cde/programs/dtfile/Main.h
@@ -624,10 +624,10 @@ extern void AddString(
 /* prototype from MakeDir.c */
 
 extern int RunFileCommand(
-                        register char *command_path,
-                        register char *argument1,
-                        register char *argument2,
-                        register char *argument3) ;
+                        char *command_path,
+                        char *argument1,
+                        char *argument2,
+                        char *argument3) ;
 
 /* prototypes from Directory.h */
 
@@ -960,8 +960,8 @@ extern void FileOperationError(
 extern Boolean FileManip(
                         Widget w,
                         int mode,
-                        register char *from,
-                        register char *to,
+                        char *from,
+                        char *to,
                         Boolean isContainer,
                         void (*errorHandler)(),
                         Boolean checkForBusyDir,
@@ -971,7 +971,7 @@ extern int CheckAccess(
                         int what);
 
 extern char * DName(
-                        register char *name) ;
+                        char *name) ;
 
 /* prototypes from FileMgr.h */
 

diff --git a/cde/programs/dtfile/Menu.c b/cde/programs/dtfile/Menu.c
index 47fba56f25b3954f7d8f3eaf8104a70e1a621089..e5a91d880f5820d6bf49c7f51120aa0bcfe75306 100644 (file)
--- a/cde/programs/dtfile/Menu.c
+++ b/cde/programs/dtfile/Menu.c
@@ -770,7 +770,7 @@ static void
 UnmanageAllActionItems(
         FileMgrRec *file_mgr_rec )
 {
-  register int i, children;
+  int i, children;
   XmManagerWidget action_pane;
 
   action_pane = (XmManagerWidget) file_mgr_rec->action_pane;
@@ -987,7 +987,7 @@ TrashFiles(
    Widget mbar;
    DtActionArg * action_args;
    int arg_count;
-   register int i;
+   int i;
 
    if (!TrashIsInitialized())
    {

diff --git a/cde/programs/dtfile/MkDir.c b/cde/programs/dtfile/MkDir.c
index 2c9c51541c6665e9889cf91108323947a9c21ea3..124b20ff4e2c5e862fb0c13e3ad44c842b2d8f32 100644 (file)
--- a/cde/programs/dtfile/MkDir.c
+++ b/cde/programs/dtfile/MkDir.c
@@ -93,17 +93,17 @@
 
 int
 RunFileCommand(
-        register char *command_path,
-        register char *argument1,
-        register char *argument2,
-        register char *argument3)
+        char *command_path,
+        char *argument1,
+        char *argument2,
+        char *argument3)
 {
    static char *pname = "RunFileCommand";
-   register int child;           /* process id of command process */
-   register int wait_return;     /* return value from wait */
+   int child;           /* process id of command process */
+   int wait_return;     /* return value from wait */
             int exit_value;      /* command exit value */
-   register char *command_name;  /* pointer to the command name */
-   register int i;
+   char *command_name;  /* pointer to the command name */
+   int i;
    void (*oldSig)();
   
    /* prepare to catch the command termination */

diff --git a/cde/programs/dtfile/SharedProcs.c b/cde/programs/dtfile/SharedProcs.c
index 1a4366634250c09175556cb4f36ab59fff538975..9dc65694ed019aa9e34c0496cd279c92dc22046c 100644 (file)
--- a/cde/programs/dtfile/SharedProcs.c
+++ b/cde/programs/dtfile/SharedProcs.c
@@ -179,10 +179,10 @@ static void RenameCollisions(
 
 char *
 _DtPName(
-        register char *name )
+        char *name )
 
 {
-   register char * q;
+   char * q;
    static char pnam[MAXPATHLEN];
    static char dot[] = ".";
 
@@ -293,16 +293,16 @@ _DtFollowLink (
 
 Boolean
 _DtStringsAreEquivalent(
-        register char *in_str,
-        register char *test_str )
+        char *in_str,
+        char *test_str )
 {
 #ifdef NLS16
    wchar_t c1;
    wchar_t c2;
    int c1size, c2size;
 #endif
-   register int i;
-   register int j;
+   int i;
+   int j;
 
 #ifdef NLS16
    if (is_multibyte)
@@ -1391,7 +1391,7 @@ RetrieveAndUseNameTemplateInfo(
 static void
 RenameCollisions( char ** list, int count )
 {
-  register int i, j, k, l;
+  int i, j, k, l;
   char flg = 0, flg2 = 0;
 
   for( i = 0; i < count; ++i )

diff --git a/cde/programs/dtfile/SharedProcs.h b/cde/programs/dtfile/SharedProcs.h
index 2ca22338ef46f0b6b3a90c0fe560828127c5adc6..e5a744caa89f40f6ca9cd28768686cd02d982cb6 100644 (file)
--- a/cde/programs/dtfile/SharedProcs.h
+++ b/cde/programs/dtfile/SharedProcs.h
@@ -54,12 +54,12 @@ extern String _DtStripSpaces(
                         String string) ;
 
 extern char * _DtPName(
-                        register char *name) ;
+                        char *name) ;
 extern char * _DtFollowLink(
                         char * path) ;
 extern Boolean _DtStringsAreEquivalent(
-                        register char *in_str,
-                        register char *test_str) ;
+                        char *in_str,
+                        char *test_str) ;
 extern void _DtDuplicateDialogNameList (
                         char ** nameList,
                         char ** newNameList,

diff --git a/cde/programs/dtfile/Trash.c b/cde/programs/dtfile/Trash.c
index ad792753770d597bfc47152eeb64f618bcb92aa9..d391cccdb0e5ffdbcc9e2806b017dd34619b3228 100644 (file)
--- a/cde/programs/dtfile/Trash.c
+++ b/cde/programs/dtfile/Trash.c
@@ -395,8 +395,8 @@ static void RestoreVerifyCancel(
 static int RestoreObject(
                         Widget w,
                         int mode,
-                        register char *source,
-                        register char *target,
+                        char *source,
+                        char *target,
                         Boolean  isContainer,
                         void (*errorHandler)(),
                         Boolean checkForBusyDir,
@@ -4280,8 +4280,8 @@ static int
 RestoreObject(
         Widget w,
         int mode,
-        register char *source,
-        register char *target,
+        char *source,
+        char *target,
         Boolean  isContainer,
         void (*errorHandler)(),
         Boolean checkForBusyDir,

diff --git a/cde/programs/dtfile/dtcopy/copydialog.c b/cde/programs/dtfile/dtcopy/copydialog.c
index 660cf2b198f0008a100136c50c56498a89c55e35..8214d4036b7130427b2d83361b45b2d8f2e01ec8 100644 (file)
--- a/cde/programs/dtfile/dtcopy/copydialog.c
+++ b/cde/programs/dtfile/dtcopy/copydialog.c
@@ -84,8 +84,8 @@
 
 /* Cannot put into sharedFuncs.h due to conflict with FileManip.c */
 extern int       Check(
-                                    register char *spth,
-                                    register char *dpth,
+                                    char *spth,
+                                    char *dpth,
                                     int mode);
 
 /*--------------------------------------------------------------------