Changeset 44be50c in rtems

Timestamp:

12/28/09 16:36:08 (13 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 5, master

Children:

aea66e87

Parents:

e1ddc14b

Message:

2009-12-28 Shrikant Gaikwad <n3oo3n@…>

• cpukit/libfs/src/pipe/pipe.c Restructured code to remove the goto statements.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• libcsupport/include/rtems/framebuffer.h (modified) (1 diff)
• libfs/src/pipe/pipe.c (modified) (3 diffs)

cpukit/ChangeLog

@@ +1 @@
+2009-12-28      Shrikant Gaikwad <n3oo3n@gmail.com>
+
+        * cpukit/libfs/src/pipe/pipe.c Restructured code to remove the
+        goto statements.
+
 2009-12-21      Joel Sherrill <joel.sherrill@oarcorp.com>
 

cpukit/libcsupport/include/rtems/framebuffer.h

@@ -33 +33 @@
  *  a frame buffer device driver.
  */
-#define FRAMEBUFFER_DRIVER_TABLE_ENTRY \
+#define FRAME_BUFFER_DRIVER_TABLE_ENTRY \
   { frame_buffer_initialize, frame_buffer_open, frame_buffer_close, \
     frame_buffer_read, frame_buffer_write, frame_buffer_control }

cpukit/libfs/src/pipe/pipe.c

@@ -29 +29 @@
   rtems_libio_t *iop;
   int err = 0;
-
   /* Create /tmp if not exists */
   if (rtems_filesystem_evaluate_path("/tmp", 3, RTEMS_LIBIO_PERMS_RWX, &loc, TRUE)
@@ -48 +47 @@
   /* Try creating FIFO file until find an available file name */
   while (mkfifo(fifopath, S_IRUSR|S_IWUSR) != 0) {
-    if (errno != EEXIST)
+    if (errno != EEXIST){
       return -1;
+    }
     /* Just try once... */
     return -1;
@@ -59 +59 @@
   if (filsdes[0] < 0) {
     err = errno;
-    goto out;
+    /* Delete file at errors, or else if pipe is successfully created
+     the file node will be deleted after it is closed by all. */
+    unlink(fifopath);
+  }
+  else {
+  /* Reset open file to blocking mode */
+    iop = rtems_libio_iop(filsdes[0]);
+    iop->flags &= ~LIBIO_FLAGS_NO_DELAY;
+
+    filsdes[1] = open(fifopath, O_WRONLY);
+
+    if (filsdes[1] < 0) {
+    err = errno;
+    close(filsdes[0]);
+    }
+  unlink(fifopath);
   }
 
-  /* Reset open file to blocking mode */
-  iop = rtems_libio_iop(filsdes[0]);
-  iop->flags &= ~LIBIO_FLAGS_NO_DELAY;
-
-  filsdes[1] = open(fifopath, O_WRONLY);
-
-  if (filsdes[1] < 0) {
-    err = errno;
-    close(filsdes[0]);
-  }
-
-out:
-  /* Delete file at errors, or else if pipe is successfully created
-     the file node will be deleted after it is closed by all. */
-  unlink(fifopath);
-
-  if (! err)
-    return 0;
   rtems_set_errno_and_return_minus_one(err);
 }
+