libdpkg: Make warning() not implicitly print the errno string

The callers who want the errno string should call strerror().

2 files changed, 3 insertions, 4 deletions

diff --git a/lib/ehandle.c b/lib/ehandle.c
index 55ceb77f9..ec963b318 100644
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -292,16 +292,14 @@ void ohshite(const char *fmt, ...) {
 void
 warning(const char *fmt, ...)
 {
-  int e;
   va_list al;
   char buf[1024];
 
-  e=errno;
   va_start(al,fmt);
   vsnprintf(buf,sizeof(buf),fmt,al);
   va_end(al);
 
-  fprintf(stderr,"%s: %s\n",buf,strerror(e));
+  fprintf(stderr, "%s\n", buf);
 }
 
 void badusage(const char *fmt, ...) {
diff --git a/lib/myopt.c b/lib/myopt.c
index a47da4eee..d119ad5ee 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -40,7 +40,8 @@ void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
   if (!file) {
     if (errno==ENOENT)
       return;
-    warning(_("failed to open configuration file `%.255s' for reading"), fn);
+    warning(_("failed to open configuration file '%.255s' for reading: %s"),
+            fn, strerror(errno));
     return;
   }