The following commit has been merged in the master branch:
commit 6ad315a1eeb8f3a597dee9a5d602013dd2d2b9d2
Author: Guillem Jover <[email protected]>
Date: Sat Oct 23 05:19:43 2010 +0200
libdpkg: Use push_error_context_jump() instead of push_error_handler()
Remove obsolete and now unused push_error_handler compatibility macro.
diff --git a/lib/dpkg/ehandle.h b/lib/dpkg/ehandle.h
index 7fd1689..650a816 100644
--- a/lib/dpkg/ehandle.h
+++ b/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,
diff --git a/src/archives.c b/src/archives.c
index 4691908..0877782 100644
--- a/src/archives.c
+++ b/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>"));
diff --git a/src/packages.c b/src/packages.c
index 10c8ed1..5bcf421 100644
--- a/src/packages.c
+++ b/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)
diff --git a/src/trigproc.c b/src/trigproc.c
index 5d3c9be..acf8d08 100644
--- a/src/trigproc.c
+++ b/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);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
