Sfoglia il codice sorgente

libdpkg: Use push_error_context_jump() instead of push_error_handler()

Remove obsolete and now unused push_error_handler compatibility macro.
Guillem Jover 15 anni fa
parent
commit
6ad315a1ee
4 ha cambiato i file con 6 aggiunte e 5 eliminazioni
  1. 0 2
      lib/dpkg/ehandle.h
  2. 2 1
      src/archives.c
  3. 2 1
      src/packages.c
  4. 2 1
      src/trigproc.c

+ 0 - 2
lib/dpkg/ehandle.h

@@ -46,8 +46,6 @@ typedef void error_printer(const char *emsg, const char *contextstring);
 void print_fatal_error(const char *emsg, const char *contextstring);
 void catch_fatal_error(void);
 
-#define push_error_handler push_error_context_jump
-
 void push_error_context_jump(jmp_buf *jbufp, error_printer *printerror,
                              const char *contextstring);
 void push_error_context_func(error_handler *func, error_printer *printerror,

+ 2 - 1
src/archives.c

@@ -1252,7 +1252,8 @@ void archivefiles(const char *const *argv) {
         break;
       continue;
     }
-    push_error_handler(&ejbuf,print_error_perpackage,thisarg);
+    push_error_context_jump(&ejbuf, print_error_perpackage, thisarg);
+
     process_archive(thisarg);
     onerr_abort++;
     m_output(stdout, _("<standard output>"));

+ 2 - 1
src/packages.c

@@ -221,7 +221,8 @@ void process_queue(void) {
         return;
       continue;
     }
-    push_error_handler(&ejbuf,print_error_perpackage,pkg->name);
+    push_error_context_jump(&ejbuf, print_error_perpackage, pkg->name);
+
     switch (action_todo) {
     case act_triggers:
       if (!pkg->trigpend_head)

+ 2 - 1
src/trigproc.c

@@ -117,7 +117,8 @@ trigproc_run_deferred(void)
 			pop_error_context(ehflag_bombout);
 			continue;
 		}
-		push_error_handler(&ejbuf, print_error_perpackage, pkg->name);
+		push_error_context_jump(&ejbuf, print_error_perpackage,
+		                        pkg->name);
 
 		pkg->clientdata->trigprocdeferred = NULL;
 		trigproc(pkg);