From 27298575358ecda4c2887d17aae5c25809f3c4e0 Mon Sep 17 00:00:00 2001
From: Paul Osborne <osbpau@gmail.com>
Date: Fri, 14 Aug 2015 02:34:01 -0500
Subject: ioctl: do not make macro generated functions public

if code incorporating these macros wants to publicly export the
functions they may do so by doing the following:

    pub ioctl!(...);

Since the functions are unsafe, in many cases exposing the functions
publicly will not be desirable.
---
 src/sys/ioctl/platform/linux.rs | 50 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'src/sys/ioctl')

diff --git a/src/sys/ioctl/platform/linux.rs b/src/sys/ioctl/platform/linux.rs
index 15066b75..1971e8fe 100644
--- a/src/sys/ioctl/platform/linux.rs
+++ b/src/sys/ioctl/platform/linux.rs
@@ -108,59 +108,59 @@ macro_rules! convert_ioctl_res {
 #[macro_export]
 macro_rules! ioctl {
     (bad $name:ident with $nr:expr) => (
-        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                            data: *mut u8)
-                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                        data: *mut u8)
+                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, $nr as $crate::sys::ioctl::libc::c_ulong, data))
         }
         );
     (none $name:ident with $ioty:expr, $nr:expr) => (
-        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int)
-                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int)
+                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, io!($ioty, $nr) as $crate::sys::ioctl::libc::c_ulong))
         }
         );
     (read $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                            val: *mut $ty)
-                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                        val: *mut $ty)
+                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, ior!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (write $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                            val: *const $ty)
-                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                        val: *const $ty)
+                         -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, ior!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (readwrite $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                            val: *mut $ty)
-                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                        val: *mut $ty)
+                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, iorw!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (read buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                            val: *mut $ty,
-                            len: usize)
-                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                        val: *mut $ty,
+                        len: usize)
+                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, ior!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (write buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                            val: *const $ty,
-                            len: usize) -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                        val: *const $ty,
+                        len: usize) -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, ior!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
     (readwrite buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
-        pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
-                            val: *const $ty,
-                            len: usize)
-                            -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
+        unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
+                        val: *const $ty,
+                        len: usize)
+                        -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
             convert_ioctl_res!($crate::sys::ioctl::ioctl(fd, iorw!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val))
         }
         );
-- 
cgit v1.2.3