Skip to content

Commit 7137509

Browse files
robnlundman
robn
authored and
lundman
committed
Remove unnecessary CSTYLED escapes on top-level macro invocations
cstyle can handle these cases now, so we don't need to disable it. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rob Norris <[email protected]> Closes openzfs#16840
1 parent beca766 commit 7137509

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+5
-196
lines changed

‎include/os/freebsd/spl/sys/sdt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131

3232
#include_next <sys/sdt.h>
3333
#ifdef KDTRACE_HOOKS
34-
/* BEGIN CSTYLED */
3534
SDT_PROBE_DECLARE(sdt, , , set__error);
3635

36+
/* BEGIN CSTYLED */
3737
#define SET_ERROR(err) ({ \
3838
SDT_PROBE1(sdt, , , set__error, (uintptr_t)err); \
3939
err; \

‎lib/libspl/atomic.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
(void) __atomic_add_fetch(target, 1, __ATOMIC_SEQ_CST); \
3636
}
3737

38-
/* BEGIN CSTYLED */
3938
ATOMIC_INC(8, uint8_t)
4039
ATOMIC_INC(16, uint16_t)
4140
ATOMIC_INC(32, uint32_t)
@@ -44,7 +43,6 @@ ATOMIC_INC(uchar, uchar_t)
4443
ATOMIC_INC(ushort, ushort_t)
4544
ATOMIC_INC(uint, uint_t)
4645
ATOMIC_INC(ulong, ulong_t)
47-
/* END CSTYLED */
4846

4947

5048
#define ATOMIC_DEC(name, type) \
@@ -53,7 +51,6 @@ ATOMIC_INC(ulong, ulong_t)
5351
(void) __atomic_sub_fetch(target, 1, __ATOMIC_SEQ_CST); \
5452
}
5553

56-
/* BEGIN CSTYLED */
5754
ATOMIC_DEC(8, uint8_t)
5855
ATOMIC_DEC(16, uint16_t)
5956
ATOMIC_DEC(32, uint32_t)
@@ -62,7 +59,6 @@ ATOMIC_DEC(uchar, uchar_t)
6259
ATOMIC_DEC(ushort, ushort_t)
6360
ATOMIC_DEC(uint, uint_t)
6461
ATOMIC_DEC(ulong, ulong_t)
65-
/* END CSTYLED */
6662

6763

6864
#define ATOMIC_ADD(name, type1, type2) \
@@ -77,7 +73,6 @@ atomic_add_ptr(volatile void *target, ssize_t bits)
7773
(void) __atomic_add_fetch((void **)target, bits, __ATOMIC_SEQ_CST);
7874
}
7975

80-
/* BEGIN CSTYLED */
8176
ATOMIC_ADD(8, uint8_t, int8_t)
8277
ATOMIC_ADD(16, uint16_t, int16_t)
8378
ATOMIC_ADD(32, uint32_t, int32_t)
@@ -86,7 +81,6 @@ ATOMIC_ADD(char, uchar_t, signed char)
8681
ATOMIC_ADD(short, ushort_t, short)
8782
ATOMIC_ADD(int, uint_t, int)
8883
ATOMIC_ADD(long, ulong_t, long)
89-
/* END CSTYLED */
9084

9185

9286
#define ATOMIC_SUB(name, type1, type2) \
@@ -101,7 +95,6 @@ atomic_sub_ptr(volatile void *target, ssize_t bits)
10195
(void) __atomic_sub_fetch((void **)target, bits, __ATOMIC_SEQ_CST);
10296
}
10397

104-
/* BEGIN CSTYLED */
10598
ATOMIC_SUB(8, uint8_t, int8_t)
10699
ATOMIC_SUB(16, uint16_t, int16_t)
107100
ATOMIC_SUB(32, uint32_t, int32_t)
@@ -110,7 +103,6 @@ ATOMIC_SUB(char, uchar_t, signed char)
110103
ATOMIC_SUB(short, ushort_t, short)
111104
ATOMIC_SUB(int, uint_t, int)
112105
ATOMIC_SUB(long, ulong_t, long)
113-
/* END CSTYLED */
114106

115107

116108
#define ATOMIC_OR(name, type) \
@@ -119,7 +111,6 @@ ATOMIC_SUB(long, ulong_t, long)
119111
(void) __atomic_or_fetch(target, bits, __ATOMIC_SEQ_CST); \
120112
}
121113

122-
/* BEGIN CSTYLED */
123114
ATOMIC_OR(8, uint8_t)
124115
ATOMIC_OR(16, uint16_t)
125116
ATOMIC_OR(32, uint32_t)
@@ -128,7 +119,6 @@ ATOMIC_OR(uchar, uchar_t)
128119
ATOMIC_OR(ushort, ushort_t)
129120
ATOMIC_OR(uint, uint_t)
130121
ATOMIC_OR(ulong, ulong_t)
131-
/* END CSTYLED */
132122

133123

134124
#define ATOMIC_AND(name, type) \
@@ -137,7 +127,6 @@ ATOMIC_OR(ulong, ulong_t)
137127
(void) __atomic_and_fetch(target, bits, __ATOMIC_SEQ_CST); \
138128
}
139129

140-
/* BEGIN CSTYLED */
141130
ATOMIC_AND(8, uint8_t)
142131
ATOMIC_AND(16, uint16_t)
143132
ATOMIC_AND(32, uint32_t)
@@ -146,7 +135,6 @@ ATOMIC_AND(uchar, uchar_t)
146135
ATOMIC_AND(ushort, ushort_t)
147136
ATOMIC_AND(uint, uint_t)
148137
ATOMIC_AND(ulong, ulong_t)
149-
/* END CSTYLED */
150138

151139

152140
/*
@@ -159,7 +147,6 @@ ATOMIC_AND(ulong, ulong_t)
159147
return (__atomic_add_fetch(target, 1, __ATOMIC_SEQ_CST)); \
160148
}
161149

162-
/* BEGIN CSTYLED */
163150
ATOMIC_INC_NV(8, uint8_t)
164151
ATOMIC_INC_NV(16, uint16_t)
165152
ATOMIC_INC_NV(32, uint32_t)
@@ -168,7 +155,6 @@ ATOMIC_INC_NV(uchar, uchar_t)
168155
ATOMIC_INC_NV(ushort, ushort_t)
169156
ATOMIC_INC_NV(uint, uint_t)
170157
ATOMIC_INC_NV(ulong, ulong_t)
171-
/* END CSTYLED */
172158

173159

174160
#define ATOMIC_DEC_NV(name, type) \
@@ -177,7 +163,6 @@ ATOMIC_INC_NV(ulong, ulong_t)
177163
return (__atomic_sub_fetch(target, 1, __ATOMIC_SEQ_CST)); \
178164
}
179165

180-
/* BEGIN CSTYLED */
181166
ATOMIC_DEC_NV(8, uint8_t)
182167
ATOMIC_DEC_NV(16, uint16_t)
183168
ATOMIC_DEC_NV(32, uint32_t)
@@ -186,7 +171,6 @@ ATOMIC_DEC_NV(uchar, uchar_t)
186171
ATOMIC_DEC_NV(ushort, ushort_t)
187172
ATOMIC_DEC_NV(uint, uint_t)
188173
ATOMIC_DEC_NV(ulong, ulong_t)
189-
/* END CSTYLED */
190174

191175

192176
#define ATOMIC_ADD_NV(name, type1, type2) \
@@ -201,7 +185,6 @@ atomic_add_ptr_nv(volatile void *target, ssize_t bits)
201185
return (__atomic_add_fetch((void **)target, bits, __ATOMIC_SEQ_CST));
202186
}
203187

204-
/* BEGIN CSTYLED */
205188
ATOMIC_ADD_NV(8, uint8_t, int8_t)
206189
ATOMIC_ADD_NV(16, uint16_t, int16_t)
207190
ATOMIC_ADD_NV(32, uint32_t, int32_t)
@@ -210,7 +193,6 @@ ATOMIC_ADD_NV(char, uchar_t, signed char)
210193
ATOMIC_ADD_NV(short, ushort_t, short)
211194
ATOMIC_ADD_NV(int, uint_t, int)
212195
ATOMIC_ADD_NV(long, ulong_t, long)
213-
/* END CSTYLED */
214196

215197

216198
#define ATOMIC_SUB_NV(name, type1, type2) \
@@ -225,7 +207,6 @@ atomic_sub_ptr_nv(volatile void *target, ssize_t bits)
225207
return (__atomic_sub_fetch((void **)target, bits, __ATOMIC_SEQ_CST));
226208
}
227209

228-
/* BEGIN CSTYLED */
229210
ATOMIC_SUB_NV(8, uint8_t, int8_t)
230211
ATOMIC_SUB_NV(char, uchar_t, signed char)
231212
ATOMIC_SUB_NV(16, uint16_t, int16_t)
@@ -234,7 +215,6 @@ ATOMIC_SUB_NV(32, uint32_t, int32_t)
234215
ATOMIC_SUB_NV(int, uint_t, int)
235216
ATOMIC_SUB_NV(long, ulong_t, long)
236217
ATOMIC_SUB_NV(64, uint64_t, int64_t)
237-
/* END CSTYLED */
238218

239219

240220
#define ATOMIC_OR_NV(name, type) \
@@ -243,7 +223,6 @@ ATOMIC_SUB_NV(64, uint64_t, int64_t)
243223
return (__atomic_or_fetch(target, bits, __ATOMIC_SEQ_CST)); \
244224
}
245225

246-
/* BEGIN CSTYLED */
247226
ATOMIC_OR_NV(8, uint8_t)
248227
ATOMIC_OR_NV(16, uint16_t)
249228
ATOMIC_OR_NV(32, uint32_t)
@@ -252,7 +231,6 @@ ATOMIC_OR_NV(uchar, uchar_t)
252231
ATOMIC_OR_NV(ushort, ushort_t)
253232
ATOMIC_OR_NV(uint, uint_t)
254233
ATOMIC_OR_NV(ulong, ulong_t)
255-
/* END CSTYLED */
256234

257235

258236
#define ATOMIC_AND_NV(name, type) \
@@ -261,7 +239,6 @@ ATOMIC_OR_NV(ulong, ulong_t)
261239
return (__atomic_and_fetch(target, bits, __ATOMIC_SEQ_CST)); \
262240
}
263241

264-
/* BEGIN CSTYLED */
265242
ATOMIC_AND_NV(8, uint8_t)
266243
ATOMIC_AND_NV(16, uint16_t)
267244
ATOMIC_AND_NV(32, uint32_t)
@@ -270,7 +247,6 @@ ATOMIC_AND_NV(uchar, uchar_t)
270247
ATOMIC_AND_NV(ushort, ushort_t)
271248
ATOMIC_AND_NV(uint, uint_t)
272249
ATOMIC_AND_NV(ulong, ulong_t)
273-
/* END CSTYLED */
274250

275251

276252
/*
@@ -300,7 +276,6 @@ atomic_cas_ptr(volatile void *target, void *exp, void *des)
300276
return (exp);
301277
}
302278

303-
/* BEGIN CSTYLED */
304279
ATOMIC_CAS(8, uint8_t)
305280
ATOMIC_CAS(16, uint16_t)
306281
ATOMIC_CAS(32, uint32_t)
@@ -309,7 +284,6 @@ ATOMIC_CAS(uchar, uchar_t)
309284
ATOMIC_CAS(ushort, ushort_t)
310285
ATOMIC_CAS(uint, uint_t)
311286
ATOMIC_CAS(ulong, ulong_t)
312-
/* END CSTYLED */
313287

314288

315289
/*
@@ -322,7 +296,6 @@ ATOMIC_CAS(ulong, ulong_t)
322296
return (__atomic_exchange_n(target, bits, __ATOMIC_SEQ_CST)); \
323297
}
324298

325-
/* BEGIN CSTYLED */
326299
ATOMIC_SWAP(8, uint8_t)
327300
ATOMIC_SWAP(16, uint16_t)
328301
ATOMIC_SWAP(32, uint32_t)
@@ -331,7 +304,6 @@ ATOMIC_SWAP(uchar, uchar_t)
331304
ATOMIC_SWAP(ushort, ushort_t)
332305
ATOMIC_SWAP(uint, uint_t)
333306
ATOMIC_SWAP(ulong, ulong_t)
334-
/* END CSTYLED */
335307

336308
void *
337309
atomic_swap_ptr(volatile void *target, void *bits)

‎module/nvpair/nvpair.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3309,15 +3309,13 @@ nvs_xdr_nvp_##type(XDR *xdrs, void *ptr, ...) \
33093309

33103310
#endif
33113311

3312-
/* BEGIN CSTYLED */
33133312
NVS_BUILD_XDRPROC_T(char);
33143313
NVS_BUILD_XDRPROC_T(short);
33153314
NVS_BUILD_XDRPROC_T(u_short);
33163315
NVS_BUILD_XDRPROC_T(int);
33173316
NVS_BUILD_XDRPROC_T(u_int);
33183317
NVS_BUILD_XDRPROC_T(longlong_t);
33193318
NVS_BUILD_XDRPROC_T(u_longlong_t);
3320-
/* END CSTYLED */
33213319

33223320
/*
33233321
* The format of xdr encoded nvpair is:

‎module/os/freebsd/spl/spl_dtrace.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@
3131
#include <sys/queue.h>
3232
#include <sys/sdt.h>
3333

34-
/* CSTYLED */
3534
SDT_PROBE_DEFINE1(sdt, , , set__error, "int");

0 commit comments

Comments
 (0)