[PATCH 07/25] Remove superfluous pipe_create()

Sebastian Huber sebastian.huber at embedded-brains.de
Fri Sep 14 13:18:35 UTC 2018


---
 cpukit/include/rtems/pipe.h    |  9 ---------
 cpukit/libcsupport/Makefile.am |  2 +-
 cpukit/libcsupport/src/pipe.c  | 39 ---------------------------------------
 cpukit/libfs/src/pipe/pipe.c   |  5 ++++-
 4 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 cpukit/libcsupport/src/pipe.c

diff --git a/cpukit/include/rtems/pipe.h b/cpukit/include/rtems/pipe.h
index a2df29c2c3..083e1343e9 100644
--- a/cpukit/include/rtems/pipe.h
+++ b/cpukit/include/rtems/pipe.h
@@ -55,15 +55,6 @@ typedef struct pipe_control {
 } pipe_control_t;
 
 /**
- * @brief Create an anonymous pipe.
- *
- * Called by pipe() to create an anonymous pipe.
- */
-extern int pipe_create(
-  int filsdes[2]
-);
-
-/**
  * @brief Release a pipe.
  *
  * Interface to file system close.
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index aaf3f5bd2b..e59dfd586b 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -40,7 +40,7 @@ SYSTEM_CALL_C_FILES = src/open.c src/close.c src/read.c src/write.c \
     src/chdir.c src/chmod.c src/fchdir.c src/fchmod.c src/fchown.c src/chown.c \
     src/link.c src/unlink.c src/umask.c src/ftruncate.c src/utime.c src/fstat.c \
     src/fcntl.c src/fpathconf.c src/getdents.c src/fsync.c src/fdatasync.c \
-    src/pipe.c src/dup.c src/dup2.c src/symlink.c src/readlink.c \
+    src/dup.c src/dup2.c src/symlink.c src/readlink.c \
     src/chroot.c src/sync.c src/_rename_r.c src/statvfs.c src/utimes.c src/lchown.c
 SYSTEM_CALL_C_FILES += src/clock.c
 
diff --git a/cpukit/libcsupport/src/pipe.c b/cpukit/libcsupport/src/pipe.c
deleted file mode 100644
index ea0771afa6..0000000000
--- a/cpukit/libcsupport/src/pipe.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- *  @file
- *
- *  @brief Create an Inter-Process Channel
- *  @ingroup libcsupport
- */
-
-/*
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <unistd.h>
-
-#include <errno.h>
-#include <sys/types.h>
-#include <rtems/seterr.h>
-#include <rtems/pipe.h>
-
-/**
- *  POSIX 1003.1b 6.1.1 Create an Inter-Process Channel
- */
-int pipe(
-  int filsdes[2]
-)
-{
-  if (filsdes == NULL)
-    rtems_set_errno_and_return_minus_one( EFAULT );
-
-  return pipe_create(filsdes);
-}
diff --git a/cpukit/libfs/src/pipe/pipe.c b/cpukit/libfs/src/pipe/pipe.c
index 8693bd489e..d8c1c2d551 100644
--- a/cpukit/libfs/src/pipe/pipe.c
+++ b/cpukit/libfs/src/pipe/pipe.c
@@ -28,13 +28,16 @@
 /* FIXME: This approach is questionable */
 static uint16_t rtems_pipe_no = 0;
 
-int pipe_create(
+int pipe(
   int filsdes[2]
 )
 {
   rtems_libio_t *iop;
   int err = 0;
 
+  if (filsdes == NULL)
+    rtems_set_errno_and_return_minus_one( EFAULT );
+
   if (rtems_mkdir("/tmp", S_IRWXU | S_IRWXG | S_IRWXO) != 0)
     return -1;
 
-- 
2.13.7



More information about the devel mailing list