[rtems commit] libio: Avoid direct use of rtems_libio_iops

Sebastian Huber sebh at rtems.org
Fri Sep 15 08:58:50 UTC 2017


Module:    rtems
Branch:    master
Commit:    4b759b189206de94207196ba937ba7b2137aa0bf
Changeset: http://git.rtems.org/rtems/commit/?id=4b759b189206de94207196ba937ba7b2137aa0bf

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Sep 13 08:49:18 2017 +0200

libio: Avoid direct use of rtems_libio_iops

Update #3132.

---

 cpukit/libmisc/serdbg/serdbgio.c           | 2 +-
 cpukit/libmisc/serdbg/termios_printk.c     | 2 +-
 cpukit/libnetworking/rtems/rtems_syscall.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpukit/libmisc/serdbg/serdbgio.c b/cpukit/libmisc/serdbg/serdbgio.c
index 9175457..5de2005 100644
--- a/cpukit/libmisc/serdbg/serdbgio.c
+++ b/cpukit/libmisc/serdbg/serdbgio.c
@@ -137,7 +137,7 @@ int serdbg_open
    * capture tty structure
    */
   if (!err_occurred) {
-    iop = &rtems_libio_iops[serdbg_fd];
+    iop = rtems_libio_iop(serdbg_fd);
     serdbg_tty = iop->data1;
   }
   /*
diff --git a/cpukit/libmisc/serdbg/termios_printk.c b/cpukit/libmisc/serdbg/termios_printk.c
index 920d1fa..3da216f 100644
--- a/cpukit/libmisc/serdbg/termios_printk.c
+++ b/cpukit/libmisc/serdbg/termios_printk.c
@@ -200,7 +200,7 @@ int termios_printk_open
    * capture tty structure
    */
   if (!err_occurred) {
-    iop = &rtems_libio_iops[termios_printk_fd];
+    iop = rtems_libio_iop(termios_printk_fd);
     termios_printk_tty = iop->data1;
   }
   /*
diff --git a/cpukit/libnetworking/rtems/rtems_syscall.c b/cpukit/libnetworking/rtems/rtems_syscall.c
index bf59cd8..9d9b64c 100644
--- a/cpukit/libnetworking/rtems/rtems_syscall.c
+++ b/cpukit/libnetworking/rtems/rtems_syscall.c
@@ -49,7 +49,7 @@ rtems_bsdnet_fdToSocket (int fd)
     errno = EBADF;
     return NULL;
   }
-  iop = &rtems_libio_iops[fd];
+  iop = rtems_libio_iop(fd);
 
   /* same as rtems_libio_check_is_open(iop) but different return */
   if ((iop->flags & LIBIO_FLAGS_OPEN) == 0) {




More information about the vc mailing list