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
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
From bfce99aacc99d962a9855fbbae61c309728122fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler@web.de>
Date: Sun, 8 Feb 2015 19:10:51 +0000
Subject: [PATCH 22/29] [bitset] unused -> remove
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Stefan Bühler <stbuehler@web.de>
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2982 152afb58-edef-0310-8abb-c4023f1b3aa9
---
src/CMakeLists.txt | 2 +-
src/Makefile.am | 4 ++--
src/SConscript | 2 +-
src/bitset.c | 67 ------------------------------------------------------
src/bitset.h | 19 ----------------
src/fdevent.h | 1 -
6 files changed, 4 insertions(+), 91 deletions(-)
delete mode 100644 src/bitset.c
delete mode 100644 src/bitset.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a5471ff..a4ada19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,7 +66,7 @@ common_src=buffer.c log.c \
fdevent_poll.c fdevent_linux_sysepoll.c \
fdevent_solaris_devpoll.c fdevent_solaris_port.c \
fdevent_freebsd_kqueue.c \
- data_config.c bitset.c \
+ data_config.c \
inet_ntop_cache.c crc32.c \
connections-glue.c \
configfile-glue.c \
@@ -273,7 +273,7 @@ hdr = server.h buffer.h network.h log.h keyvalue.h \
fdevent.h connections.h base.h stat_cache.h \
plugin.h mod_auth.h \
etag.h joblist.h array.h crc32.h \
- network_backends.h configfile.h bitset.h \
+ network_backends.h configfile.h \
mod_ssi.h mod_ssi_expr.h inet_ntop_cache.h \
configparser.h mod_ssi_exprparser.h \
sys-mmap.h sys-socket.h mod_cml.h mod_cml_funcs.h \
diff --git a/src/SConscript b/src/SConscript
index 7565094..bb507a5 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -14,7 +14,7 @@ common_src = Split("buffer.c log.c \
fdevent_poll.c fdevent_linux_sysepoll.c \
fdevent_solaris_devpoll.c fdevent_solaris_port.c \
fdevent_freebsd_kqueue.c \
- data_config.c bitset.c \
+ data_config.c \
inet_ntop_cache.c crc32.c \
connections-glue.c \
configfile-glue.c \
diff --git a/src/bitset.c b/src/bitset.c
deleted file mode 100644
index 27c93a8..0000000
--- a/src/bitset.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "buffer.h"
-#include "bitset.h"
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-
-#define BITSET_BITS \
- ( CHAR_BIT * sizeof(size_t) )
-
-#define BITSET_MASK(pos) \
- ( ((size_t)1) << ((pos) % BITSET_BITS) )
-
-#define BITSET_WORD(set, pos) \
- ( (set)->bits[(pos) / BITSET_BITS] )
-
-#define BITSET_USED(nbits) \
- ( ((nbits) + (BITSET_BITS - 1)) / BITSET_BITS )
-
-bitset *bitset_init(size_t nbits) {
- bitset *set;
-
- set = malloc(sizeof(*set));
- force_assert(set);
-
- set->bits = calloc(BITSET_USED(nbits), sizeof(*set->bits));
- set->nbits = nbits;
-
- force_assert(set->bits);
-
- return set;
-}
-
-void bitset_reset(bitset *set) {
- memset(set->bits, 0, BITSET_USED(set->nbits) * sizeof(*set->bits));
-}
-
-void bitset_free(bitset *set) {
- free(set->bits);
- free(set);
-}
-
-void bitset_clear_bit(bitset *set, size_t pos) {
- if (pos >= set->nbits) {
- SEGFAULT();
- }
-
- BITSET_WORD(set, pos) &= ~BITSET_MASK(pos);
-}
-
-void bitset_set_bit(bitset *set, size_t pos) {
- if (pos >= set->nbits) {
- SEGFAULT();
- }
-
- BITSET_WORD(set, pos) |= BITSET_MASK(pos);
-}
-
-int bitset_test_bit(bitset *set, size_t pos) {
- if (pos >= set->nbits) {
- SEGFAULT();
- }
-
- return (BITSET_WORD(set, pos) & BITSET_MASK(pos)) != 0;
-}
diff --git a/src/bitset.h b/src/bitset.h
deleted file mode 100644
index 467e13f..0000000
--- a/src/bitset.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _BITSET_H_
-#define _BITSET_H_
-
-#include <stddef.h>
-
-typedef struct {
- size_t *bits;
- size_t nbits;
-} bitset;
-
-bitset *bitset_init(size_t nbits);
-void bitset_reset(bitset *set);
-void bitset_free(bitset *set);
-
-void bitset_clear_bit(bitset *set, size_t pos);
-void bitset_set_bit(bitset *set, size_t pos);
-int bitset_test_bit(bitset *set, size_t pos);
-
-#endif
diff --git a/src/fdevent.h b/src/fdevent.h
index 5147baa..235d68b 100644
--- a/src/fdevent.h
+++ b/src/fdevent.h
@@ -6,7 +6,6 @@
#endif
#include "settings.h"
-#include "bitset.h"
#if defined HAVE_STDINT_H
# include <stdint.h>
--
2.4.5
|
