libdpkg: Make badusage use ohshit instead of its own error handling

diff --git a/ChangeLog b/ChangeLog
index 7f7d077e75e1e4502856e6b47922d0b0b7c942bb..a850820d2e934bc9bf71a5f56826b40d47ce6cc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-28  Guillem Jover  <guillem@debian.org>
+
+       * lib/ehandle.c (badusage): Use ohshit instead of its own error
+       handling.
+
 2008-06-28  Guillem Jover  <guillem@debian.org>
 
        * src/query.c (printforhelp): Remove trailing newlines.

diff --git a/lib/ehandle.c b/lib/ehandle.c
index 5d857ede202f1fa3a2eb35b5fd8af2fa02ec2651..46a28bff7c25c53ceab747e1fb3fa846a6fb61f6 100644 (file)
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -275,9 +275,8 @@ void badusage(const char *fmt, ...) {
   va_start(al,fmt);
   vsnprintf(buf,sizeof(buf), fmt,al);
   va_end(al);
-  snprintf(errmsgbuf,sizeof(errmsgbuf),"%s\n\n%s", buf, gettext(printforhelp));
-  errmsg= errmsgbuf; 
-  longjmp(*econtext->jbufp,1);
+
+  ohshit("%s\n\n%s", buf, gettext(printforhelp));
 }
 
 void werr(const char *fn) {