Changeset 8fe46a0 in mainline

Timestamp:

2017-04-04T20:35:43Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

59f388a

Parents:

a6fc88a

Message:

Remove mode_t from libc

Location:

uspace/lib

Files:

• c/include/sys/types.h (modified) (1 diff)
• posix/include/posix/sys/stat.h (modified) (2 diffs)
• posix/include/posix/sys/types.h (modified) (1 diff)
• posix/source/fcntl.c (modified) (1 diff)
• posix/source/sys/stat.c (modified) (3 diffs)

uspace/lib/c/include/sys/types.h

@@ -38 +38 @@
 #include <libarch/types.h>
 
-typedef unsigned int mode_t;
-
 /** Relative offset */
 typedef int64_t off64_t;

uspace/lib/posix/include/posix/sys/stat.h

@@ -115 +115 @@
         __POSIX_DEF__(dev_t)     st_dev;     /* ID of device containing file */
         __POSIX_DEF__(ino_t)     st_ino;     /* inode number */
-        mode_t          st_mode;    /* protection */
+        __POSIX_DEF__(mode_t)    st_mode;    /* protection */
         __POSIX_DEF__(nlink_t)   st_nlink;   /* number of hard links */
         __POSIX_DEF__(uid_t)     st_uid;     /* user ID of owner */
@@ -131 +131 @@
 extern int __POSIX_DEF__(lstat)(const char *restrict path, struct __POSIX_DEF__(stat) *restrict st);
 extern int __POSIX_DEF__(stat)(const char *restrict path, struct __POSIX_DEF__(stat) *restrict st);
-extern int __POSIX_DEF__(chmod)(const char *path, mode_t mode);
-extern mode_t __POSIX_DEF__(umask)(mode_t mask);
-extern int __POSIX_DEF__(mkdir)(const char *path, mode_t mode);
+extern int __POSIX_DEF__(chmod)(const char *path, __POSIX_DEF__(mode_t) mode);
+extern __POSIX_DEF__(mode_t) __POSIX_DEF__(umask)(__POSIX_DEF__(mode_t) mask);
+extern int __POSIX_DEF__(mkdir)(const char *path, __POSIX_DEF__(mode_t) mode);
 
 

uspace/lib/posix/include/posix/sys/types.h

@@ -53 +53 @@
 typedef int64_t __POSIX_DEF__(pid_t);
 typedef sysarg_t __POSIX_DEF__(dev_t);
+typedef unsigned int __POSIX_DEF__(mode_t);
 
 /* PThread Types */

uspace/lib/posix/source/fcntl.c

@@ -105 +105 @@
 {
         int rc;
-        mode_t posix_mode = 0;
+        posix_mode_t posix_mode = 0;
         if (posix_flags & O_CREAT) {
                 va_list args;
                 va_start(args, posix_flags);
-                posix_mode = va_arg(args, mode_t);
+                posix_mode = va_arg(args, posix_mode_t);
                 va_end(args);
                 (void) posix_mode;

uspace/lib/posix/source/sys/stat.c

@@ -124 +124 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_chmod(const char *path, mode_t mode)
+int posix_chmod(const char *path, posix_mode_t mode)
 {
         /* HelenOS doesn't support permissions, return success. */
@@ -137 +137 @@
  * @return Previous file mode creation mask.
  */
-mode_t posix_umask(mode_t mask)
+posix_mode_t posix_umask(posix_mode_t mask)
 {
         /* HelenOS doesn't support permissions, return empty mask. */
@@ -150 +150 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_mkdir(const char *path, mode_t mode)
+int posix_mkdir(const char *path, posix_mode_t mode)
 {
         int rc = rcerrno(vfs_link_path, path, KIND_DIRECTORY, NULL);