summaryrefslogtreecommitdiff
path: root/debian/patches/try-fence0003-pflocal-avoid-nested-function.patch
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2015-09-08 15:18:49 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-09-08 15:18:49 +0200
commit83bc9a5b46dd9ac41e06f439f87cbd415222625d (patch)
tree051e7d96f46b93203ca9e62c9e74c23f637459ab /debian/patches/try-fence0003-pflocal-avoid-nested-function.patch
parent4f3c1ae3425d60e55c85109292554cbdceef5f22 (diff)
add patch series
Diffstat (limited to 'debian/patches/try-fence0003-pflocal-avoid-nested-function.patch')
-rw-r--r--debian/patches/try-fence0003-pflocal-avoid-nested-function.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/debian/patches/try-fence0003-pflocal-avoid-nested-function.patch b/debian/patches/try-fence0003-pflocal-avoid-nested-function.patch
new file mode 100644
index 00000000..6cdc01cd
--- /dev/null
+++ b/debian/patches/try-fence0003-pflocal-avoid-nested-function.patch
@@ -0,0 +1,45 @@
+From a009c940372d3b4fc6c46fb36077945dccb7d3b1 Mon Sep 17 00:00:00 2001
+From: Justus Winter <4winter@informatik.uni-hamburg.de>
+Date: Tue, 8 Sep 2015 14:41:39 +0200
+Subject: [PATCH hurd 3/5] pflocal: avoid nested function
+
+* pflocal/io.c (copy_time): Move function out of `S_io_stat', turning
+it into a static inline function.
+---
+ pflocal/io.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/pflocal/io.c b/pflocal/io.c
+index ee6fb84..38d6c1d 100644
+--- a/pflocal/io.c
++++ b/pflocal/io.c
+@@ -298,6 +298,13 @@ S_io_select_timeout (struct sock_user *user,
+ return io_select_common (user, reply, reply_type, &ts, select_type);
+ }
+
++static inline void
++copy_time (time_value_t *from, time_t *to_sec, long *to_nsec)
++{
++ *to_sec = from->seconds;
++ *to_nsec = from->microseconds * 1000;
++}
++
+ /* Return the current status of the object. Not all the fields of the
+ io_statuf_t are meaningful for all objects; however, the access and
+ modify times, the optimal IO size, and the fs type are meaningful
+@@ -308,12 +315,6 @@ S_io_stat (struct sock_user *user, struct stat *st)
+ struct sock *sock;
+ struct pipe *rpipe, *wpipe;
+
+- void copy_time (time_value_t *from, time_t *to_sec, long *to_nsec)
+- {
+- *to_sec = from->seconds;
+- *to_nsec = from->microseconds * 1000;
+- }
+-
+ if (!user)
+ return EOPNOTSUPP;
+
+--
+2.1.4
+