Changeset 7f9df7b9 in mainline for uspace/lib/posix/src/sys

Timestamp:

2018-01-22T22:42:57Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

7a08c70

Parents:

e0f47f5

Message:

Remove unnecessary symbol renaming from libposix.

Location:

uspace/lib/posix/src/sys

Files:

• mman.c (modified) (3 diffs)
• stat.c (modified) (8 diffs)
• wait.c (modified) (4 diffs)

uspace/lib/posix/src/sys/mman.c

@@ -33 +33 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "../internal/common.h"
 #include <posix/sys/mman.h>
@@ -42 +39 @@
 #include <posix/unistd.h>
 
-void *posix_mmap(void *start, size_t length, int prot, int flags, int fd,
-    __POSIX_DEF__(off_t) offset)
+void *mmap(void *start, size_t length, int prot, int flags, int fd,
+    off_t offset)
 {
         if (!start)
@@ -57 +54 @@
 }
 
-int posix_munmap(void *start, size_t length)
+int munmap(void *start, size_t length)
 {
         int rc = as_area_destroy(start);

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

@@ -34 +34 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "../internal/common.h"
 #include "posix/sys/stat.h"
@@ -52 +49 @@
  * @return 0 on success, -1 on error.
  */
-static int stat_to_posix(struct posix_stat *dest, vfs_stat_t *src)
+static int stat_to_posix(struct stat *dest, vfs_stat_t *src)
 {
-        memset(dest, 0, sizeof(struct posix_stat));
+        memset(dest, 0, sizeof(struct stat));
         
         dest->st_dev = src->service;
@@ -86 +83 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_fstat(int fd, struct posix_stat *st)
+int fstat(int fd, struct stat *st)
 {
         vfs_stat_t hst;
@@ -101 +98 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_lstat(const char *restrict path, struct posix_stat *restrict st)
+int lstat(const char *restrict path, struct stat *restrict st)
 {
         /* There are currently no symbolic links in HelenOS. */
-        return posix_stat(path, st);
+        return stat(path, st);
 }
 
@@ -114 +111 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_stat(const char *restrict path, struct posix_stat *restrict st)
+int stat(const char *restrict path, struct stat *restrict st)
 {
         vfs_stat_t hst;
@@ -129 +126 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_chmod(const char *path, posix_mode_t mode)
+int chmod(const char *path, mode_t mode)
 {
         /* HelenOS doesn't support permissions, return success. */
@@ -142 +139 @@
  * @return Previous file mode creation mask.
  */
-posix_mode_t posix_umask(posix_mode_t mask)
+mode_t umask(mode_t mask)
 {
         /* HelenOS doesn't support permissions, return empty mask. */
@@ -155 +152 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_mkdir(const char *path, posix_mode_t mode)
+int mkdir(const char *path, mode_t mode)
 {
         if (failed(vfs_link_path(path, KIND_DIRECTORY, NULL)))

uspace/lib/posix/src/sys/wait.c

@@ -33 +33 @@
 /** @file Support for waiting.
  */
-
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
 
 #include "../internal/common.h"
@@ -76 +73 @@
  *     -1 on signal interrupt, (pid_t)-1 otherwise.
  */
-posix_pid_t posix_wait(int *stat_ptr)
+pid_t wait(int *stat_ptr)
 {
         /* HelenOS does not support this. */
         errno = ENOSYS;
-        return (posix_pid_t) -1;
+        return (pid_t) -1;
 }
 
@@ -94 +91 @@
  *     no child process whose status can be reported, (pid_t)-1 otherwise.
  */
-posix_pid_t posix_waitpid(posix_pid_t pid, int *stat_ptr, int options)
+pid_t waitpid(pid_t pid, int *stat_ptr, int options)
 {
         assert(stat_ptr != NULL);
@@ -104 +101 @@
         if (failed(task_wait_task_id((task_id_t) pid, &texit, &retval))) {
                 /* Unable to retrieve status. */
-                return (posix_pid_t) -1;
+                return (pid_t) -1;
         }