Changeset 531cbf9 in rtems

Timestamp:

06/12/00 14:09:52 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

f18d2e74

Parents:

f981326

Message:

Changed st_atime, st_ctime, and st_mtime for IMFS nodes to be
stat_ to avoid conflicts with macros on Solaris.

Location:

c/src/lib/libc

Files:

• imfs.h (modified) (5 diffs)
• imfs_creat.c (modified) (1 diff)
• imfs_directory.c (modified) (2 diffs)
• imfs_stat.c (modified) (1 diff)
• imfs_utime.c (modified) (1 diff)

c/src/lib/libc/imfs.h

@@ -158 +158 @@
   gid_t               st_gid;                /* Group ID of owner */
 
-  time_t              st_atime;              /* Time of last access */
-  time_t              st_mtime;              /* Time of last modification */
-  time_t              st_ctime;              /* Time of last status change */
+  time_t              stat_atime;            /* Time of last access */
+  time_t              stat_mtime;            /* Time of last modification */
+  time_t              stat_ctime;            /* Time of last status change */
   IMFS_jnode_types_t  type;                  /* Type of this entry */
   IMFS_types_union    info;
@@ -169 +169 @@
     struct timeval tv;                      \
     gettimeofday( &tv, 0 );                 \
-    _jnode->st_atime  = (time_t) tv.tv_sec; \
+    _jnode->stat_atime  = (time_t) tv.tv_sec; \
   } while (0)
                 
@@ -176 +176 @@
     struct timeval tv;                      \
     gettimeofday( &tv, 0 );                 \
-    _jnode->st_mtime  = (time_t) tv.tv_sec; \
+    _jnode->stat_mtime  = (time_t) tv.tv_sec; \
   } while (0)
                 
@@ -183 +183 @@
     struct timeval tv;                      \
     gettimeofday( &tv, 0 );                 \
-    _jnode->st_ctime  = (time_t) tv.tv_sec; \
+    _jnode->stat_ctime  = (time_t) tv.tv_sec; \
   } while (0)
 
@@ -190 +190 @@
     struct timeval tv;                      \
     gettimeofday( &tv, 0 );                 \
-    _jnode->st_mtime  = (time_t) tv.tv_sec; \
-    _jnode->st_atime  = (time_t) tv.tv_sec; \
+    _jnode->stat_mtime  = (time_t) tv.tv_sec; \
+    _jnode->stat_atime  = (time_t) tv.tv_sec; \
   } while (0)
 

c/src/lib/libc/imfs_creat.c

@@ -73 +73 @@
   gettimeofday( &tv, 0 );
 
-  node->st_atime  = (time_t) tv.tv_sec;
-  node->st_mtime  = (time_t) tv.tv_sec;
-  node->st_ctime  = (time_t) tv.tv_sec;
+  node->stat_atime  = (time_t) tv.tv_sec;
+  node->stat_mtime  = (time_t) tv.tv_sec;
+  node->stat_ctime  = (time_t) tv.tv_sec;
 
   /*

c/src/lib/libc/imfs_directory.c

@@ -220 +220 @@
  *      st_blksize      0
  *      st_blocks       0
- *      st_atime        time of last access
- *      st_mtime        time of last modification
- *      st_ctime        time of the last change
+ *      stat_atime      time of last access
+ *      stat_mtime      time of last modification
+ *      stat_ctime      time of the last change
  *
  * This information will be returned to the calling function in a -stat- struct
@@ -249 +249 @@
    buf->st_blksize = 0;
    buf->st_blocks = 0;
-   buf->st_atime = the_jnode->st_atime;
-   buf->st_mtime = the_jnode->st_mtime;
-   buf->st_ctime = the_jnode->st_ctime;
+   buf->st_atime = the_jnode->stat_atime;
+   buf->st_mtime = the_jnode->stat_mtime;
+   buf->st_ctime = the_jnode->stat_ctime;
 
    buf->st_size = 0;

c/src/lib/libc/imfs_stat.c

@@ -51 +51 @@
   buf->st_gid   = the_jnode->st_gid;
 
-  buf->st_atime = the_jnode->st_atime;
-  buf->st_mtime = the_jnode->st_mtime;
-  buf->st_ctime = the_jnode->st_ctime;
+  buf->st_atime = the_jnode->stat_atime;
+  buf->st_mtime = the_jnode->stat_mtime;
+  buf->st_ctime = the_jnode->stat_ctime;
 
   return 0;

c/src/lib/libc/imfs_utime.c

@@ -31 +31 @@
   the_jnode = (IMFS_jnode_t *) pathloc->node_access;
 
-  the_jnode->st_atime = actime;
-  the_jnode->st_mtime = modtime;
+  the_jnode->stat_atime = actime;
+  the_jnode->stat_mtime = modtime;
 
   return 0;