From 406f9b76ff9c236c0f959060f88813b61ad62923 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Wed, 12 Nov 1997 00:10:32 +0000
Subject: [PATCH] Fix warnings by moving exit from warnerr to verr, verrx.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3958 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/roken/err.h     | 4 ++--
 lib/roken/err.hin   | 4 ++--
 lib/roken/verr.c    | 3 ++-
 lib/roken/verrx.c   | 3 ++-
 lib/roken/vwarn.c   | 2 +-
 lib/roken/vwarnx.c  | 2 +-
 lib/roken/warnerr.c | 4 +---
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/roken/err.h b/lib/roken/err.h
index 0d71f61e0..882835def 100644
--- a/lib/roken/err.h
+++ b/lib/roken/err.h
@@ -53,8 +53,8 @@ extern const char *__progname;
 #define __attribute__(x)
 #endif
 
-void warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap)
-     __attribute__ ((format (printf, 4, 0)));
+void warnerr(int doerrno, const char *fmt, va_list ap)
+     __attribute__ ((format (printf, 2, 0)));
 
 void verr(int eval, const char *fmt, va_list ap)
      __attribute__ ((noreturn, format (printf, 2, 0)));
diff --git a/lib/roken/err.hin b/lib/roken/err.hin
index 0d71f61e0..882835def 100644
--- a/lib/roken/err.hin
+++ b/lib/roken/err.hin
@@ -53,8 +53,8 @@ extern const char *__progname;
 #define __attribute__(x)
 #endif
 
-void warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap)
-     __attribute__ ((format (printf, 4, 0)));
+void warnerr(int doerrno, const char *fmt, va_list ap)
+     __attribute__ ((format (printf, 2, 0)));
 
 void verr(int eval, const char *fmt, va_list ap)
      __attribute__ ((noreturn, format (printf, 2, 0)));
diff --git a/lib/roken/verr.c b/lib/roken/verr.c
index a4a65a28d..eda0a6524 100644
--- a/lib/roken/verr.c
+++ b/lib/roken/verr.c
@@ -46,5 +46,6 @@ RCSID("$Id$");
 void
 verr(int eval, const char *fmt, va_list ap)
 {
-    warnerr(1, eval, 1, fmt, ap);
+    warnerr(1, fmt, ap);
+    exit(eval);
 }
diff --git a/lib/roken/verrx.c b/lib/roken/verrx.c
index b3b1ed243..238e322cb 100644
--- a/lib/roken/verrx.c
+++ b/lib/roken/verrx.c
@@ -46,5 +46,6 @@ RCSID("$Id$");
 void
 verrx(int eval, const char *fmt, va_list ap)
 {
-    warnerr(1, eval, 0, fmt, ap);
+    warnerr(0, fmt, ap);
+    exit(eval);
 }
diff --git a/lib/roken/vwarn.c b/lib/roken/vwarn.c
index dfe75c2dd..71e824a3a 100644
--- a/lib/roken/vwarn.c
+++ b/lib/roken/vwarn.c
@@ -46,5 +46,5 @@ RCSID("$Id$");
 void
 vwarn(const char *fmt, va_list ap)
 {
-    warnerr(0, 0, 1, fmt, ap);
+    warnerr(1, fmt, ap);
 }
diff --git a/lib/roken/vwarnx.c b/lib/roken/vwarnx.c
index 85f0e5b1a..5b16aea4d 100644
--- a/lib/roken/vwarnx.c
+++ b/lib/roken/vwarnx.c
@@ -46,6 +46,6 @@ RCSID("$Id$");
 void
 vwarnx(const char *fmt, va_list ap)
 {
-    warnerr(0, 0, 0, fmt, ap);
+    warnerr(0, fmt, ap);
 }
 
diff --git a/lib/roken/warnerr.c b/lib/roken/warnerr.c
index af6f0c3eb..fc718d05e 100644
--- a/lib/roken/warnerr.c
+++ b/lib/roken/warnerr.c
@@ -65,7 +65,7 @@ set_progname(char *argv0)
 }
 
 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;
     if(__progname != NULL){
@@ -81,6 +81,4 @@ warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap)
     if(doerrno)
 	fprintf(stderr, "%s", strerror(sverrno));
     fprintf(stderr, "\n");
-    if(doexit)
-	exit(eval);
 }