Skip to content

Commit cf15984

Browse files
arndbhdeller
arndb
authored and
hdeller
committed
parisc: avoid c23 'nullptr' idenitifier
Starting in c23, this is a reserved keyword, so in the future, using it will start causing build failures: arch/parisc/math-emu/frnd.c:36:23: error: expected ';', ',' or ')' before 'nullptr' Since I can't think of a good replacement name, add a leading underscore to the function argument to avoid this namespace conflict. Apparently all of these arguments are unused. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent 94a1b19 commit cf15984

File tree

10 files changed

+60
-60
lines changed

10 files changed

+60
-60
lines changed

‎arch/parisc/math-emu/dfsqrt.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Double Floating-point Square Root
1616
*
1717
* External Interfaces:
18-
* dbl_fsqrt(srcptr,nullptr,dstptr,status)
18+
* dbl_fsqrt(srcptr,_nullptr,dstptr,status)
1919
*
2020
* Internal Interfaces:
2121
*
@@ -37,7 +37,7 @@
3737
unsigned int
3838
dbl_fsqrt(
3939
dbl_floating_point *srcptr,
40-
unsigned int *nullptr,
40+
unsigned int *_nullptr,
4141
dbl_floating_point *dstptr,
4242
unsigned int *status)
4343
{

‎arch/parisc/math-emu/fcnvff.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* Double Floating-point to Single Floating-point
1717
*
1818
* External Interfaces:
19-
* dbl_to_sgl_fcnvff(srcptr,nullptr,dstptr,status)
20-
* sgl_to_dbl_fcnvff(srcptr,nullptr,dstptr,status)
19+
* dbl_to_sgl_fcnvff(srcptr,_nullptr,dstptr,status)
20+
* sgl_to_dbl_fcnvff(srcptr,_nullptr,dstptr,status)
2121
*
2222
* Internal Interfaces:
2323
*
@@ -40,7 +40,7 @@
4040
int
4141
sgl_to_dbl_fcnvff(
4242
sgl_floating_point *srcptr,
43-
unsigned int *nullptr,
43+
unsigned int *_nullptr,
4444
dbl_floating_point *dstptr,
4545
unsigned int *status)
4646
{
@@ -127,7 +127,7 @@ sgl_to_dbl_fcnvff(
127127
int
128128
dbl_to_sgl_fcnvff(
129129
dbl_floating_point *srcptr,
130-
unsigned int *nullptr,
130+
unsigned int *_nullptr,
131131
sgl_floating_point *dstptr,
132132
unsigned int *status)
133133
{

‎arch/parisc/math-emu/fcnvfu.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* Floating-point to Unsigned Fixed-point Converts
1616
*
1717
* External Interfaces:
18-
* dbl_to_dbl_fcnvfu(srcptr,nullptr,dstptr,status)
19-
* dbl_to_sgl_fcnvfu(srcptr,nullptr,dstptr,status)
20-
* sgl_to_dbl_fcnvfu(srcptr,nullptr,dstptr,status)
21-
* sgl_to_sgl_fcnvfu(srcptr,nullptr,dstptr,status)
18+
* dbl_to_dbl_fcnvfu(srcptr,_nullptr,dstptr,status)
19+
* dbl_to_sgl_fcnvfu(srcptr,_nullptr,dstptr,status)
20+
* sgl_to_dbl_fcnvfu(srcptr,_nullptr,dstptr,status)
21+
* sgl_to_sgl_fcnvfu(srcptr,_nullptr,dstptr,status)
2222
*
2323
* Internal Interfaces:
2424
*
@@ -45,7 +45,7 @@
4545
int
4646
sgl_to_sgl_fcnvfu(
4747
sgl_floating_point *srcptr,
48-
unsigned int *nullptr,
48+
unsigned int *_nullptr,
4949
unsigned int *dstptr,
5050
unsigned int *status)
5151
{
@@ -166,7 +166,7 @@ sgl_to_sgl_fcnvfu(
166166
int
167167
sgl_to_dbl_fcnvfu(
168168
sgl_floating_point *srcptr,
169-
unsigned int *nullptr,
169+
unsigned int *_nullptr,
170170
dbl_unsigned *dstptr,
171171
unsigned int *status)
172172
{
@@ -285,7 +285,7 @@ sgl_to_dbl_fcnvfu(
285285
*/
286286
/*ARGSUSED*/
287287
int
288-
dbl_to_sgl_fcnvfu (dbl_floating_point * srcptr, unsigned int *nullptr,
288+
dbl_to_sgl_fcnvfu (dbl_floating_point * srcptr, unsigned int *_nullptr,
289289
unsigned int *dstptr, unsigned int *status)
290290
{
291291
register unsigned int srcp1, srcp2, result;
@@ -408,7 +408,7 @@ dbl_to_sgl_fcnvfu (dbl_floating_point * srcptr, unsigned int *nullptr,
408408
*/
409409
/*ARGSUSED*/
410410
int
411-
dbl_to_dbl_fcnvfu (dbl_floating_point * srcptr, unsigned int *nullptr,
411+
dbl_to_dbl_fcnvfu (dbl_floating_point * srcptr, unsigned int *_nullptr,
412412
dbl_unsigned * dstptr, unsigned int *status)
413413
{
414414
register int src_exponent;

‎arch/parisc/math-emu/fcnvfut.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* Floating-point to Unsigned Fixed-point Converts with Truncation
1616
*
1717
* External Interfaces:
18-
* dbl_to_dbl_fcnvfut(srcptr,nullptr,dstptr,status)
19-
* dbl_to_sgl_fcnvfut(srcptr,nullptr,dstptr,status)
20-
* sgl_to_dbl_fcnvfut(srcptr,nullptr,dstptr,status)
21-
* sgl_to_sgl_fcnvfut(srcptr,nullptr,dstptr,status)
18+
* dbl_to_dbl_fcnvfut(srcptr,_nullptr,dstptr,status)
19+
* dbl_to_sgl_fcnvfut(srcptr,_nullptr,dstptr,status)
20+
* sgl_to_dbl_fcnvfut(srcptr,_nullptr,dstptr,status)
21+
* sgl_to_sgl_fcnvfut(srcptr,_nullptr,dstptr,status)
2222
*
2323
* Internal Interfaces:
2424
*
@@ -44,7 +44,7 @@
4444
*/
4545
/*ARGSUSED*/
4646
int
47-
sgl_to_sgl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr,
47+
sgl_to_sgl_fcnvfut (sgl_floating_point * srcptr, unsigned int *_nullptr,
4848
unsigned int *dstptr, unsigned int *status)
4949
{
5050
register unsigned int src, result;
@@ -113,7 +113,7 @@ sgl_to_sgl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr,
113113
*/
114114
/*ARGSUSED*/
115115
int
116-
sgl_to_dbl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr,
116+
sgl_to_dbl_fcnvfut (sgl_floating_point * srcptr, unsigned int *_nullptr,
117117
dbl_unsigned * dstptr, unsigned int *status)
118118
{
119119
register int src_exponent;
@@ -183,7 +183,7 @@ sgl_to_dbl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr,
183183
*/
184184
/*ARGSUSED*/
185185
int
186-
dbl_to_sgl_fcnvfut (dbl_floating_point * srcptr, unsigned int *nullptr,
186+
dbl_to_sgl_fcnvfut (dbl_floating_point * srcptr, unsigned int *_nullptr,
187187
unsigned int *dstptr, unsigned int *status)
188188
{
189189
register unsigned int srcp1, srcp2, result;
@@ -252,7 +252,7 @@ dbl_to_sgl_fcnvfut (dbl_floating_point * srcptr, unsigned int *nullptr,
252252
*/
253253
/*ARGSUSED*/
254254
int
255-
dbl_to_dbl_fcnvfut (dbl_floating_point * srcptr, unsigned int *nullptr,
255+
dbl_to_dbl_fcnvfut (dbl_floating_point * srcptr, unsigned int *_nullptr,
256256
dbl_unsigned * dstptr, unsigned int *status)
257257
{
258258
register int src_exponent;

‎arch/parisc/math-emu/fcnvfx.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
* Double Floating-point to Double Fixed-point
1919
*
2020
* External Interfaces:
21-
* dbl_to_dbl_fcnvfx(srcptr,nullptr,dstptr,status)
22-
* dbl_to_sgl_fcnvfx(srcptr,nullptr,dstptr,status)
23-
* sgl_to_dbl_fcnvfx(srcptr,nullptr,dstptr,status)
24-
* sgl_to_sgl_fcnvfx(srcptr,nullptr,dstptr,status)
21+
* dbl_to_dbl_fcnvfx(srcptr,_nullptr,dstptr,status)
22+
* dbl_to_sgl_fcnvfx(srcptr,_nullptr,dstptr,status)
23+
* sgl_to_dbl_fcnvfx(srcptr,_nullptr,dstptr,status)
24+
* sgl_to_sgl_fcnvfx(srcptr,_nullptr,dstptr,status)
2525
*
2626
* Internal Interfaces:
2727
*
@@ -44,7 +44,7 @@
4444
int
4545
sgl_to_sgl_fcnvfx(
4646
sgl_floating_point *srcptr,
47-
sgl_floating_point *nullptr,
47+
sgl_floating_point *_nullptr,
4848
int *dstptr,
4949
sgl_floating_point *status)
5050
{
@@ -141,7 +141,7 @@ sgl_to_sgl_fcnvfx(
141141
int
142142
sgl_to_dbl_fcnvfx(
143143
sgl_floating_point *srcptr,
144-
unsigned int *nullptr,
144+
unsigned int *_nullptr,
145145
dbl_integer *dstptr,
146146
unsigned int *status)
147147
{
@@ -262,7 +262,7 @@ sgl_to_dbl_fcnvfx(
262262
int
263263
dbl_to_sgl_fcnvfx(
264264
dbl_floating_point *srcptr,
265-
unsigned int *nullptr,
265+
unsigned int *_nullptr,
266266
int *dstptr,
267267
unsigned int *status)
268268
{
@@ -373,7 +373,7 @@ dbl_to_sgl_fcnvfx(
373373
int
374374
dbl_to_dbl_fcnvfx(
375375
dbl_floating_point *srcptr,
376-
unsigned int *nullptr,
376+
unsigned int *_nullptr,
377377
dbl_integer *dstptr,
378378
unsigned int *status)
379379
{

‎arch/parisc/math-emu/fcnvfxt.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
* Double Floating-point to Double Fixed-point /w truncated result
1919
*
2020
* External Interfaces:
21-
* dbl_to_dbl_fcnvfxt(srcptr,nullptr,dstptr,status)
22-
* dbl_to_sgl_fcnvfxt(srcptr,nullptr,dstptr,status)
23-
* sgl_to_dbl_fcnvfxt(srcptr,nullptr,dstptr,status)
24-
* sgl_to_sgl_fcnvfxt(srcptr,nullptr,dstptr,status)
21+
* dbl_to_dbl_fcnvfxt(srcptr,_nullptr,dstptr,status)
22+
* dbl_to_sgl_fcnvfxt(srcptr,_nullptr,dstptr,status)
23+
* sgl_to_dbl_fcnvfxt(srcptr,_nullptr,dstptr,status)
24+
* sgl_to_sgl_fcnvfxt(srcptr,_nullptr,dstptr,status)
2525
*
2626
* Internal Interfaces:
2727
*
@@ -45,7 +45,7 @@
4545
int
4646
sgl_to_sgl_fcnvfxt(
4747
sgl_floating_point *srcptr,
48-
unsigned int *nullptr,
48+
unsigned int *_nullptr,
4949
int *dstptr,
5050
unsigned int *status)
5151
{
@@ -109,7 +109,7 @@ sgl_to_sgl_fcnvfxt(
109109
int
110110
sgl_to_dbl_fcnvfxt(
111111
sgl_floating_point *srcptr,
112-
unsigned int *nullptr,
112+
unsigned int *_nullptr,
113113
dbl_integer *dstptr,
114114
unsigned int *status)
115115
{
@@ -183,7 +183,7 @@ sgl_to_dbl_fcnvfxt(
183183
int
184184
dbl_to_sgl_fcnvfxt(
185185
dbl_floating_point *srcptr,
186-
unsigned int *nullptr,
186+
unsigned int *_nullptr,
187187
int *dstptr,
188188
unsigned int *status)
189189
{
@@ -248,7 +248,7 @@ dbl_to_sgl_fcnvfxt(
248248
int
249249
dbl_to_dbl_fcnvfxt(
250250
dbl_floating_point *srcptr,
251-
unsigned int *nullptr,
251+
unsigned int *_nullptr,
252252
dbl_integer *dstptr,
253253
unsigned int *status)
254254
{

‎arch/parisc/math-emu/fcnvuf.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* Fixed point to Floating-point Converts
1616
*
1717
* External Interfaces:
18-
* dbl_to_dbl_fcnvuf(srcptr,nullptr,dstptr,status)
19-
* dbl_to_sgl_fcnvuf(srcptr,nullptr,dstptr,status)
20-
* sgl_to_dbl_fcnvuf(srcptr,nullptr,dstptr,status)
21-
* sgl_to_sgl_fcnvuf(srcptr,nullptr,dstptr,status)
18+
* dbl_to_dbl_fcnvuf(srcptr,_nullptr,dstptr,status)
19+
* dbl_to_sgl_fcnvuf(srcptr,_nullptr,dstptr,status)
20+
* sgl_to_dbl_fcnvuf(srcptr,_nullptr,dstptr,status)
21+
* sgl_to_sgl_fcnvuf(srcptr,_nullptr,dstptr,status)
2222
*
2323
* Internal Interfaces:
2424
*
@@ -45,7 +45,7 @@
4545
int
4646
sgl_to_sgl_fcnvuf(
4747
unsigned int *srcptr,
48-
unsigned int *nullptr,
48+
unsigned int *_nullptr,
4949
sgl_floating_point *dstptr,
5050
unsigned int *status)
5151
{
@@ -104,7 +104,7 @@ sgl_to_sgl_fcnvuf(
104104
int
105105
sgl_to_dbl_fcnvuf(
106106
unsigned int *srcptr,
107-
unsigned int *nullptr,
107+
unsigned int *_nullptr,
108108
dbl_floating_point *dstptr,
109109
unsigned int *status)
110110
{
@@ -145,7 +145,7 @@ sgl_to_dbl_fcnvuf(
145145
int
146146
dbl_to_sgl_fcnvuf(
147147
dbl_unsigned *srcptr,
148-
unsigned int *nullptr,
148+
unsigned int *_nullptr,
149149
sgl_floating_point *dstptr,
150150
unsigned int *status)
151151
{
@@ -227,7 +227,7 @@ dbl_to_sgl_fcnvuf(
227227
int
228228
dbl_to_dbl_fcnvuf(
229229
dbl_unsigned *srcptr,
230-
unsigned int *nullptr,
230+
unsigned int *_nullptr,
231231
dbl_floating_point *dstptr,
232232
unsigned int *status)
233233
{

‎arch/parisc/math-emu/fcnvxf.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
* Double Fixed-point to Double Floating-point
1919
*
2020
* External Interfaces:
21-
* dbl_to_dbl_fcnvxf(srcptr,nullptr,dstptr,status)
22-
* dbl_to_sgl_fcnvxf(srcptr,nullptr,dstptr,status)
23-
* sgl_to_dbl_fcnvxf(srcptr,nullptr,dstptr,status)
24-
* sgl_to_sgl_fcnvxf(srcptr,nullptr,dstptr,status)
21+
* dbl_to_dbl_fcnvxf(srcptr,_nullptr,dstptr,status)
22+
* dbl_to_sgl_fcnvxf(srcptr,_nullptr,dstptr,status)
23+
* sgl_to_dbl_fcnvxf(srcptr,_nullptr,dstptr,status)
24+
* sgl_to_sgl_fcnvxf(srcptr,_nullptr,dstptr,status)
2525
*
2626
* Internal Interfaces:
2727
*
@@ -44,7 +44,7 @@
4444
int
4545
sgl_to_sgl_fcnvxf(
4646
int *srcptr,
47-
unsigned int *nullptr,
47+
unsigned int *_nullptr,
4848
sgl_floating_point *dstptr,
4949
unsigned int *status)
5050
{
@@ -115,7 +115,7 @@ sgl_to_sgl_fcnvxf(
115115
int
116116
sgl_to_dbl_fcnvxf(
117117
int *srcptr,
118-
unsigned int *nullptr,
118+
unsigned int *_nullptr,
119119
dbl_floating_point *dstptr,
120120
unsigned int *status)
121121
{
@@ -166,7 +166,7 @@ sgl_to_dbl_fcnvxf(
166166
int
167167
dbl_to_sgl_fcnvxf(
168168
dbl_integer *srcptr,
169-
unsigned int *nullptr,
169+
unsigned int *_nullptr,
170170
sgl_floating_point *dstptr,
171171
unsigned int *status)
172172
{
@@ -271,7 +271,7 @@ dbl_to_sgl_fcnvxf(
271271
int
272272
dbl_to_dbl_fcnvxf(
273273
dbl_integer *srcptr,
274-
unsigned int *nullptr,
274+
unsigned int *_nullptr,
275275
dbl_floating_point *dstptr,
276276
unsigned int *status)
277277
{

‎arch/parisc/math-emu/frnd.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* Quad Floating-point Round to Integer (returns unimplemented)
1515
*
1616
* External Interfaces:
17-
* dbl_frnd(srcptr,nullptr,dstptr,status)
18-
* sgl_frnd(srcptr,nullptr,dstptr,status)
17+
* dbl_frnd(srcptr,_nullptr,dstptr,status)
18+
* sgl_frnd(srcptr,_nullptr,dstptr,status)
1919
*
2020
* END_DESC
2121
*/
@@ -33,7 +33,7 @@
3333
/*ARGSUSED*/
3434
int
3535
sgl_frnd(sgl_floating_point *srcptr,
36-
unsigned int *nullptr,
36+
unsigned int *_nullptr,
3737
sgl_floating_point *dstptr,
3838
unsigned int *status)
3939
{
@@ -138,7 +138,7 @@ sgl_frnd(sgl_floating_point *srcptr,
138138
int
139139
dbl_frnd(
140140
dbl_floating_point *srcptr,
141-
unsigned int *nullptr,
141+
unsigned int *_nullptr,
142142
dbl_floating_point *dstptr,
143143
unsigned int *status)
144144
{

‎arch/parisc/math-emu/sfsqrt.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Single Floating-point Square Root
1616
*
1717
* External Interfaces:
18-
* sgl_fsqrt(srcptr,nullptr,dstptr,status)
18+
* sgl_fsqrt(srcptr,_nullptr,dstptr,status)
1919
*
2020
* Internal Interfaces:
2121
*
@@ -37,7 +37,7 @@
3737
unsigned int
3838
sgl_fsqrt(
3939
sgl_floating_point *srcptr,
40-
unsigned int *nullptr,
40+
unsigned int *_nullptr,
4141
sgl_floating_point *dstptr,
4242
unsigned int *status)
4343
{

0 commit comments

Comments
 (0)