1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
From fb08495170d43a9382e508c9f65f884576c4aa7c Mon Sep 17 00:00:00 2001
From: Flavio Cruz <flaviocruz@gmail.com>
Date: Sun, 7 Feb 2016 02:04:34 -0500
Subject: [PATCH hurd 2/2] Remove libfshelp/trans.h and libfshelp/locks.h.
* libfshelp/locks.h: Remove.
* libfshelp/trans.h: Remove. struct transboot is not used anywhere.
* libfshelp/fetch-root.c: Adjust includes.
* libfshelp/lock-acquire.c: Likewise.
* libfshelp/lock-init.c: Likewise.
---
libfshelp/fetch-root.c | 9 ++++++---
libfshelp/lock-acquire.c | 5 ++++-
libfshelp/lock-init.c | 4 +++-
libfshelp/locks.h | 28 ----------------------------
libfshelp/trans.h | 32 --------------------------------
5 files changed, 13 insertions(+), 65 deletions(-)
delete mode 100644 libfshelp/locks.h
delete mode 100644 libfshelp/trans.h
diff --git a/libfshelp/fetch-root.c b/libfshelp/fetch-root.c
index 712c11f..1b6739e 100644
--- a/libfshelp/fetch-root.c
+++ b/libfshelp/fetch-root.c
@@ -18,11 +18,14 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include "trans.h"
-#include <unistd.h>
#include <assert.h>
-#include <string.h>
#include <hurd/fsys.h>
+#include <hurd/ports.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "fshelp.h"
error_t
fshelp_fetch_root (struct transbox *box, void *cookie,
diff --git a/libfshelp/lock-acquire.c b/libfshelp/lock-acquire.c
index f68c30a..07df428 100644
--- a/libfshelp/lock-acquire.c
+++ b/libfshelp/lock-acquire.c
@@ -19,7 +19,10 @@
/* Written by Michael I. Bushnell. */
-#include "locks.h"
+#include <assert.h>
+#include <sys/file.h>
+
+#include "fshelp.h"
#define EWOULDBLOCK EAGAIN /* XXX */
diff --git a/libfshelp/lock-init.c b/libfshelp/lock-init.c
index 21fb0d7..bb1f1f8 100644
--- a/libfshelp/lock-init.c
+++ b/libfshelp/lock-init.c
@@ -19,7 +19,9 @@
/* Written by Michael I. Bushnell. */
-#include "locks.h"
+#include <sys/file.h>
+
+#include "fshelp.h"
/* Initialize a lock box. */
void
diff --git a/libfshelp/locks.h b/libfshelp/locks.h
deleted file mode 100644
index a950f61..0000000
--- a/libfshelp/locks.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- Copyright (C) 1994 Free Software Foundation
-
-This file is part of the GNU Hurd.
-
-The GNU Hurd is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The GNU Hurd is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with the GNU Hurd; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-/* Written by Michael I. Bushnell. */
-
-#include <mach.h>
-#include <hurd.h>
-#include <pthread.h>
-#include <hurd/ports.h>
-#include "fshelp.h"
-#include <sys/file.h>
-#include <assert.h>
diff --git a/libfshelp/trans.h b/libfshelp/trans.h
deleted file mode 100644
index a9ea648..0000000
--- a/libfshelp/trans.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright (C) 1994 Free Software Foundation
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-#include <mach.h>
-#include <hurd.h>
-#include <pthread.h>
-#include <hurd/ports.h>
-#include "fshelp.h"
-
-struct transboot
-{
- struct port_info pi;
- file_t node;
- struct trans_link *link;
-};
-
-pthread_spinlock_t _fshelp_translistlock;
-struct trans_link *_fshelp_translist;
--
2.1.4
|
