Move error context display handler reset to error_unwind()

Never print an error message when doing normal cleanup, as this is
something we always want to do.

lib/dpkg/dpkg.h

@@ -115,7 +115,6 @@ DPKG_BEGIN_DECLS
 } while (0)
 
 #define standard_shutdown() do { \
-  set_error_display(NULL, NULL); \
   error_unwind(ehflag_normaltidy);\
 } while (0)
 

lib/dpkg/ehandle.c

@@ -242,6 +242,10 @@ void error_unwind(int flagset) {
 
   tecp= econtext;
   econtext= tecp->next;
+
+  /* If we are cleaning up normally, do not print anything. */
+  if (flagset & ehflag_normaltidy)
+    set_error_printer(tecp, NULL, NULL);
   run_cleanups(tecp,flagset);
   free(tecp);
 }

lib/dpkg/test.h

@@ -54,7 +54,6 @@ main(int argc, char **argv)
 	test();
 
 	/* Shutdown. */
-	set_error_display(NULL, NULL);
 	error_unwind(ehflag_normaltidy);
 
 	return 0;

src/archives.c

@@ -1258,7 +1258,7 @@ void archivefiles(const char *const *argv) {
     m_output(stdout, _("<standard output>"));
     m_output(stderr, _("<standard error>"));
     onerr_abort--;
-    set_error_display(NULL, NULL);
+
     error_unwind(ehflag_normaltidy);
   }
 

src/main.c

@@ -658,7 +658,7 @@ void commandfd(const char *const *argv) {
 
     actionfunction= (void (*)(const char* const*))cipaction->farg;
     actionfunction(newargs);
-    set_error_display(NULL, NULL);
+
     error_unwind(ehflag_normaltidy);
   }
 }

src/packages.c

@@ -248,7 +248,7 @@ void process_queue(void) {
     }
     m_output(stdout, _("<standard output>"));
     m_output(stderr, _("<standard error>"));
-    set_error_display(NULL, NULL);
+
     error_unwind(ehflag_normaltidy);
   }
   assert(!queue.length);

src/trigproc.c

@@ -122,7 +122,6 @@ trigproc_run_deferred(void)
 		pkg->clientdata->trigprocdeferred = NULL;
 		trigproc(pkg);
 
-		set_error_display(NULL, NULL);
 		error_unwind(ehflag_normaltidy);
 	}
 }