Skip to content

Commit dc307b7

Browse files
committed
Add prototypes for vwarn/vwarnx
Fixes this warning: common.c:406:1: warning: no previous prototype for 'vwarn' [-Wmissing-prototypes] 406 | vwarn(const char *fmt, va_list list) | ^~~~~ common.c:429:1: warning: no previous prototype for 'vwarnx' [-Wmissing-prototypes] 429 | vwarnx(const char *fmt, va_list list) | ^~~~~~ Also move err() to have non-x versions first.
1 parent 6a7763c commit dc307b7

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

src/common.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,17 @@ warn(const char *fmt, ...)
425425
va_end(list);
426426
}
427427

428+
void
429+
err(int eval, const char *fmt, ...)
430+
{
431+
va_list list;
432+
433+
va_start(list, fmt);
434+
vwarn(fmt, list);
435+
va_end(list);
436+
exit(eval);
437+
}
438+
428439
void
429440
vwarnx(const char *fmt, va_list list)
430441
{
@@ -442,17 +453,6 @@ warnx(const char *fmt, ...)
442453
va_end(list);
443454
}
444455

445-
void
446-
err(int eval, const char *fmt, ...)
447-
{
448-
va_list list;
449-
450-
va_start(list, fmt);
451-
vwarn(fmt, list);
452-
va_end(list);
453-
exit(eval);
454-
}
455-
456456
void
457457
errx(int eval, const char *fmt, ...)
458458
{

src/common.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,12 @@ int check_topdomain(char *, char **);
132132
int inet_aton(const char *cp, struct in_addr *inp);
133133
#endif
134134

135-
void err(int eval, const char *fmt, ...);
135+
void vwarn(const char *fmt, va_list list);
136136
void warn(const char *fmt, ...);
137-
void errx(int eval, const char *fmt, ...);
137+
void err(int eval, const char *fmt, ...);
138+
void vwarnx(const char *fmt, va_list list);
138139
void warnx(const char *fmt, ...);
140+
void errx(int eval, const char *fmt, ...);
139141
#endif
140142

141143
int recent_seqno(int , int);

0 commit comments

Comments
 (0)