final batch of code, this should be complete!

1 files changed, 14 insertions, 19 deletions

diff --git a/src/qmail-remote/qmailr_error.c b/src/qmail-remote/qmailr_error.c
index fcdce54..0f500e2 100644
--- a/src/qmail-remote/qmailr_error.c
+++ b/src/qmail-remote/qmailr_error.c
@@ -8,31 +8,26 @@
 
 #include <smtpd-starttls-proxy/config.h>
 
-void qmailr_diev (int permanent, char const *const *v, unsigned int n)
+void qmailr_warnv (char code, char const *const *v, unsigned int n)
 {
-  buffer_put(buffer_1small, permanent ? "D" : "Z", 1) ;
-  while (n--) buffer_puts(buffer_1small, *v++) ;
-  buffer_putflush(buffer_1small, "\n", 2) ;
-  _exit(0) ;
+  buffer_put(buffer_1, &code, 1) ;
+  while (n--) buffer_puts(buffer_1, *v++) ;
+  buffer_putflush(buffer_1, "\n", 2) ;
 }
 
-void qmailr_dievsys (char const *const *v, unsigned int n)
+void qmailr_diev (char code, char const *const *v, unsigned int n)
 {
-  char const *se = strerror(errno) ;
-  buffer_put(buffer_1small, "Z", 1) ;
-  while (n--) buffer_puts(buffer_1small, *v++) ;
-  buffer_put(buffer_1small, ": ", 2) ;
-  buffer_puts(buffer_1small, se) ;
-  buffer_putflush(buffer_1small, "\n", 2) ;
+  qmailr_warnv(code, v, n) ;
   _exit(0) ;
 }
 
-void qmailr_die (int permanent, char const *msg)
-{
-  qmailr_diev(permanent, &msg, 1) ;
-}
-
-void qmailr_diesys (char const *msg)
+void qmailr_dievsys (char const *const *v, unsigned int n)
 {
-  qmailr_dievsys(&msg, 1) ;
+  char const *se = strerror(errno) ;
+  buffer_put(buffer_1, "Z", 1) ;
+  while (n--) buffer_puts(buffer_1, *v++) ;
+  buffer_put(buffer_1, ": ", 2) ;
+  buffer_puts(buffer_1, se) ;
+  buffer_putflush(buffer_1, "\n", 2) ;
+  _exit(0) ;
 }