Skip to content

Commit dfd90c2

Browse files
hahnjohahnjo
committed
rmkdepend: Remove K&R function definitions
Soon-to-be-released Clang 15 complains: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype]
1 parent 0cd36a9 commit dfd90c2

File tree

7 files changed

+58
-237
lines changed

7 files changed

+58
-237
lines changed

‎build/rmkdepend/cppsetup.c‎

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ extern char slotab[];
6060
struct filepointer *currentfile;
6161
struct inclist *currentinc;
6262

63-
int
64-
cppsetup(line, filep, inc)
65-
register char *line;
66-
register struct filepointer *filep;
67-
register struct inclist *inc;
63+
int cppsetup(register char *line, register struct filepointer *filep, register struct inclist *inc)
6864
{
6965
register char *p, savec;
7066
static boolean setupdone = FALSE;
@@ -97,8 +93,7 @@ register struct inclist *inc;
9793
return(value);
9894
}
9995

100-
struct symtab **lookup(symbol)
101-
char *symbol;
96+
struct symtab **lookup(char *symbol)
10297
{
10398
static struct symtab *undefined;
10499
struct symtab **sp;
@@ -111,16 +106,13 @@ struct symtab **lookup(symbol)
111106
return (sp);
112107
}
113108

114-
pperror(tag, x0, x1, x2, x3, x4)
115-
int tag, x0, x1, x2, x3, x4;
109+
void pperror(int tag, int x0, int x1, int x2, int x3, int x4)
116110
{
117111
warning("\"%s\", line %d: ", currentinc->i_file, currentfile->f_line);
118112
warning(x0, x1, x2, x3, x4);
119113
}
120114

121-
122-
yyerror(s)
123-
register char *s;
115+
void yyerror(register char *s)
124116
{
125117
fatalerr("Fatal error: %s\n", s);
126118
}
@@ -133,11 +125,7 @@ struct _parse_data {
133125
const char *line;
134126
};
135127

136-
static const char *
137-
my_if_errors(ip, cp, expecting)
138-
IfParser *ip;
139-
const char *cp;
140-
const char *expecting;
128+
static const char *my_if_errors(IfParser *ip, const char *cp, const char *expecting)
141129
{
142130
struct _parse_data *pd = (struct _parse_data *) ip->data;
143131
int lineno = pd->filep->f_line;
@@ -165,11 +153,7 @@ const char *expecting;
165153

166154
#define MAXNAMELEN 256
167155

168-
static struct symtab **
169-
lookup_variable(ip, var, len)
170-
IfParser *ip;
171-
const char *var;
172-
int len;
156+
static struct symtab **lookup_variable(IfParser *ip, const char *var, int len)
173157
{
174158
char tmpbuf[MAXNAMELEN + 1];
175159
struct _parse_data *pd = (struct _parse_data *) ip->data;
@@ -182,12 +166,7 @@ int len;
182166
return isdefined(tmpbuf, pd->inc, NULL);
183167
}
184168

185-
186-
static int
187-
my_eval_defined(ip, var, len)
188-
IfParser *ip;
189-
const char *var;
190-
int len;
169+
static int my_eval_defined(IfParser *ip, const char *var, int len)
191170
{
192171
if (lookup_variable(ip, var, len))
193172
return 1;
@@ -197,11 +176,7 @@ int len;
197176

198177
#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
199178

200-
static long
201-
my_eval_variable(ip, var, len)
202-
IfParser *ip;
203-
const char *var;
204-
int len;
179+
static long my_eval_variable(IfParser *ip, const char *var, int len)
205180
{
206181
struct symtab **s;
207182

@@ -218,11 +193,7 @@ int len;
218193
return strtol(var, NULL, 0);
219194
}
220195

221-
222-
int cppsetup(line, filep, inc)
223-
register char *line;
224-
register struct filepointer *filep;
225-
register struct inclist *inc;
196+
int cppsetup(register char *line, register struct filepointer *filep, register struct inclist *inc)
226197
{
227198
IfParser ip;
228199
struct _parse_data pd;

‎build/rmkdepend/def.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ char *base_name(char*);
137137
char *rgetline(struct filepointer*);
138138
struct symtab **slookup(char*, struct inclist*);
139139
struct symtab **isdefined(char*,struct inclist*, struct inclist**);
140-
struct symtab **fdefined();
140+
struct symtab **fdefined(char *, struct inclist *, struct inclist **);
141141
struct filepointer *getfile(char*);
142142
struct inclist *newinclude(char*,char*);
143143
struct inclist *inc_path(char*, char*, boolean);

‎build/rmkdepend/ifparser.c‎

Lines changed: 16 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,7 @@
7474
#define SKIPSPACE(ccc) while (isspace(*ccc)) ccc++
7575
#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
7676

77-
78-
static const char *
79-
parse_variable(g, cp, varp)
80-
IfParser *g;
81-
const char *cp;
82-
const char **varp;
77+
static const char *parse_variable(IfParser *g, const char *cp, const char **varp)
8378
{
8479
SKIPSPACE(cp);
8580

@@ -92,12 +87,7 @@ const char **varp;
9287
return cp;
9388
}
9489

95-
96-
static const char *
97-
parse_number(g, cp, valp)
98-
IfParser *g;
99-
const char *cp;
100-
long *valp;
90+
static const char *parse_number(IfParser *g, const char *cp, long *valp)
10191
{
10292
SKIPSPACE(cp);
10393

@@ -115,11 +105,7 @@ long *valp;
115105
return cp;
116106
}
117107

118-
static const char *
119-
parse_character(g, cp, valp)
120-
IfParser *g;
121-
const char *cp;
122-
long *valp;
108+
static const char *parse_character(IfParser *g, const char *cp, long *valp)
123109
{
124110
char val;
125111
if (g) { } /* use argument */
@@ -174,11 +160,7 @@ long *valp;
174160
return cp;
175161
}
176162

177-
static const char *
178-
parse_value(g, cp, valp)
179-
IfParser *g;
180-
const char *cp;
181-
long *valp;
163+
static const char *parse_value(IfParser *g, const char *cp, long *valp)
182164
{
183165
const char *var;
184166

@@ -294,13 +276,7 @@ long *valp;
294276
return cp;
295277
}
296278

297-
298-
299-
static const char *
300-
parse_product(g, cp, valp)
301-
IfParser *g;
302-
const char *cp;
303-
long *valp;
279+
static const char *parse_product(IfParser *g, const char *cp, long *valp)
304280
{
305281
long rightval;
306282

@@ -328,12 +304,7 @@ long *valp;
328304
return cp;
329305
}
330306

331-
332-
static const char *
333-
parse_sum(g, cp, valp)
334-
IfParser *g;
335-
const char *cp;
336-
long *valp;
307+
static const char *parse_sum(IfParser *g, const char *cp, long *valp)
337308
{
338309
long rightval;
339310

@@ -354,12 +325,7 @@ long *valp;
354325
return cp;
355326
}
356327

357-
358-
static const char *
359-
parse_shift(g, cp, valp)
360-
IfParser *g;
361-
const char *cp;
362-
long *valp;
328+
static const char *parse_shift(IfParser *g, const char *cp, long *valp)
363329
{
364330
long rightval;
365331

@@ -384,12 +350,7 @@ long *valp;
384350
return cp;
385351
}
386352

387-
388-
static const char *
389-
parse_inequality(g, cp, valp)
390-
IfParser *g;
391-
const char *cp;
392-
long *valp;
353+
static const char *parse_inequality(IfParser *g, const char *cp, long *valp)
393354
{
394355
long rightval;
395356

@@ -420,12 +381,7 @@ long *valp;
420381
return cp;
421382
}
422383

423-
424-
static const char *
425-
parse_equality(g, cp, valp)
426-
IfParser *g;
427-
const char *cp;
428-
long *valp;
384+
static const char *parse_equality(IfParser *g, const char *cp, long *valp)
429385
{
430386
long rightval;
431387

@@ -450,12 +406,7 @@ long *valp;
450406
return cp;
451407
}
452408

453-
454-
static const char *
455-
parse_band(g, cp, valp)
456-
IfParser *g;
457-
const char *cp;
458-
long *valp;
409+
static const char *parse_band(IfParser *g, const char *cp, long *valp)
459410
{
460411
long rightval;
461412

@@ -473,12 +424,7 @@ long *valp;
473424
return cp;
474425
}
475426

476-
477-
static const char *
478-
parse_bxor(g, cp, valp)
479-
IfParser *g;
480-
const char *cp;
481-
long *valp;
427+
static const char *parse_bxor(IfParser *g, const char *cp, long *valp)
482428
{
483429
long rightval;
484430

@@ -494,12 +440,7 @@ long *valp;
494440
return cp;
495441
}
496442

497-
498-
static const char *
499-
parse_bor(g, cp, valp)
500-
IfParser *g;
501-
const char *cp;
502-
long *valp;
443+
static const char *parse_bor(IfParser *g, const char *cp, long *valp)
503444
{
504445
long rightval;
505446

@@ -517,12 +458,7 @@ long *valp;
517458
return cp;
518459
}
519460

520-
521-
static const char *
522-
parse_land(g, cp, valp)
523-
IfParser *g;
524-
const char *cp;
525-
long *valp;
461+
static const char *parse_land(IfParser *g, const char *cp, long *valp)
526462
{
527463
long rightval;
528464

@@ -540,12 +476,7 @@ long *valp;
540476
return cp;
541477
}
542478

543-
544-
static const char *
545-
parse_lor(g, cp, valp)
546-
IfParser *g;
547-
const char *cp;
548-
long *valp;
479+
static const char *parse_lor(IfParser *g, const char *cp, long *valp)
549480
{
550481
long rightval;
551482

@@ -563,12 +494,7 @@ long *valp;
563494
return cp;
564495
}
565496

566-
567-
static const char *
568-
parse_cond(g, cp, valp)
569-
IfParser *g;
570-
const char *cp;
571-
long *valp;
497+
static const char *parse_cond(IfParser *g, const char *cp, long *valp)
572498
{
573499
long trueval, falseval;
574500

@@ -593,11 +519,7 @@ long *valp;
593519
External Entry Points
594520
****************************************************************************/
595521

596-
const char *
597-
ParseIfExpression(g, cp, valp)
598-
IfParser *g;
599-
const char *cp;
600-
long *valp;
522+
const char *ParseIfExpression(IfParser *g, const char *cp, long *valp)
601523
{
602524
return parse_cond(g, cp, valp);
603525
}

0 commit comments

Comments
 (0)