oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix warnings by moving exit from warnerr to verr, verrx.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3958 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-11-12 00:10:32 +00:00
parent 5848e789ab
commit 406f9b76ff
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/roken/err.h
View File

@@ -53,8 +53,8 @@ extern const char *__progname;
#define __attribute__(x) #define __attribute__(x)
#endif #endif
void warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap) void warnerr(int doerrno, const char *fmt, va_list ap)
__attribute__ ((format (printf, 4, 0))); __attribute__ ((format (printf, 2, 0)));
void verr(int eval, const char *fmt, va_list ap) void verr(int eval, const char *fmt, va_list ap)
__attribute__ ((noreturn, format (printf, 2, 0))); __attribute__ ((noreturn, format (printf, 2, 0)));

4
lib/roken/err.hin
View File

@@ -53,8 +53,8 @@ extern const char *__progname;
#define __attribute__(x) #define __attribute__(x)
#endif #endif
void warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap) void warnerr(int doerrno, const char *fmt, va_list ap)
__attribute__ ((format (printf, 4, 0))); __attribute__ ((format (printf, 2, 0)));
void verr(int eval, const char *fmt, va_list ap) void verr(int eval, const char *fmt, va_list ap)
__attribute__ ((noreturn, format (printf, 2, 0))); __attribute__ ((noreturn, format (printf, 2, 0)));

3
lib/roken/verr.c
View File

@@ -46,5 +46,6 @@ RCSID("$Id$");
void void
verr(int eval, const char *fmt, va_list ap) verr(int eval, const char *fmt, va_list ap)
{ {
warnerr(1, eval, 1, fmt, ap); warnerr(1, fmt, ap);
exit(eval);
} }

3
lib/roken/verrx.c
View File

@@ -46,5 +46,6 @@ RCSID("$Id$");
void void
verrx(int eval, const char *fmt, va_list ap) verrx(int eval, const char *fmt, va_list ap)
{ {
warnerr(1, eval, 0, fmt, ap); warnerr(0, fmt, ap);
exit(eval);
} }

2
lib/roken/vwarn.c
View File

@@ -46,5 +46,5 @@ RCSID("$Id$");
void void
vwarn(const char *fmt, va_list ap) vwarn(const char *fmt, va_list ap)
{ {
warnerr(0, 0, 1, fmt, ap); warnerr(1, fmt, ap);
} }

2
lib/roken/vwarnx.c
View File

@@ -46,6 +46,6 @@ RCSID("$Id$");
void void
vwarnx(const char *fmt, va_list ap) vwarnx(const char *fmt, va_list ap)
{ {
warnerr(0, 0, 0, fmt, ap); warnerr(0, fmt, ap);
} }

4
lib/roken/warnerr.c
View File

@@ -65,7 +65,7 @@ set_progname(char *argv0)
} }
void void
warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap) warnerr(int doerrno, const char *fmt, va_list ap)
{ {
int sverrno = errno; int sverrno = errno;
if(__progname != NULL){ if(__progname != NULL){
@@ -81,6 +81,4 @@ warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap)
if(doerrno) if(doerrno)
fprintf(stderr, "%s", strerror(sverrno)); fprintf(stderr, "%s", strerror(sverrno));
fprintf(stderr, "\n"); fprintf(stderr, "\n");
if(doexit)
exit(eval);
} }